Skip to content
Permalink
Browse files

Merge pull request #386 from bareos/dev/pstorz/master/merge-percona-i…

…nto-master

merge percona xtrabackup plugin into master
  • Loading branch information
pstorz committed Jan 15, 2020
2 parents 6e54535 + ddc168f commit 7c426c47d1d1040dac1957ae7ee4acaffd483407
Showing with 1,275 additions and 161 deletions.
  1. +9 −0 AUTHORS
  2. +2 −0 core/CMakeLists.txt
  3. +3 −0 core/cmake/BareosFindPrograms.cmake
  4. +2 −0 core/debian/bareos-filedaemon-percona-xtrabackup-python-plugin.install.in
  5. +11 −0 core/debian/control.bareos-filedaemon-python-plugin
  6. +27 −1 core/platforms/packaging/bareos.spec
  7. +552 −0 core/src/plugins/filed/BareosFdPluginPerconaXtraBackup.py
  8. +6 −1 core/src/plugins/filed/CMakeLists.txt
  9. +43 −0 core/src/plugins/filed/bareos-fd-percona-xtrabackup.py
  10. +0 −99 docs/manuals/source/Appendix/Howtos.rst
  11. +2 −0 docs/manuals/source/Appendix/ReleaseNotes.rst
  12. +148 −25 docs/manuals/source/TasksAndConcepts/Plugins.rst
  13. +75 −35 systemtests/CMakeLists.txt
  14. +8 −0 .../tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/catalog/MyCatalog.conf.in
  15. +7 −0 ...s/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/client/bareos-fd.conf.in
  16. +7 −0 ...tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/console/bareos-mon.conf.in
  17. +27 −0 ...ests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/director/bareos-dir.conf.in
  18. +11 −0 ...ts/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/Catalog.conf.in
  19. +10 −0 ...n-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/PerconaXtraBackupTest.conf.in
  20. +11 −0 ...s/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/fileset/SelfTest.conf.in
  21. +20 −0 .../tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/job/BackupCatalog.conf.in
  22. +11 −0 ...s/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/job/RestoreFiles.conf.in
  23. +6 −0 ...sts/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/job/backup-bareos-fd.conf.in
  24. +15 −0 ...tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/jobdefs/DefaultJob.conf.in
  25. +7 −0 ...ts/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/messages/Daemon.conf.in
  26. +7 −0 .../tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/messages/Standard.conf.in
  27. +10 −0 ...sts/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Differential.conf
  28. +10 −0 systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Full.conf
  29. +10 −0 ...ests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Incremental.conf
  30. +4 −0 systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/pool/Scratch.conf
  31. +18 −0 ...ests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/profile/operator.conf
  32. +8 −0 ...tests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-dir.d/storage/File.conf.in
  33. +19 −0 ...tests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-fd.d/client/myself.conf.in
  34. +5 −0 ...tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-fd.d/director/bareos-dir.conf.in
  35. +6 −0 ...tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-fd.d/director/bareos-mon.conf.in
  36. +5 −0 ...ests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-fd.d/messages/Standard.conf
  37. +11 −0 .../tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-sd.d/device/FileStorage.conf.in
  38. +5 −0 ...tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-sd.d/director/bareos-dir.conf.in
  39. +6 −0 ...tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-sd.d/director/bareos-mon.conf.in
  40. +5 −0 ...ests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-sd.d/messages/Standard.conf
  41. +14 −0 ...s/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bareos-sd.d/storage/bareos-sd.conf.in
  42. +10 −0 systemtests/tests/python-fd-percona-xtrabackup-plugin-test/etc/bareos/bconsole.conf.in
  43. +5 −0 ...ython-fd-percona-xtrabackup-plugin-test/etc/bareos/tray-monitor.d/client/FileDaemon-local.conf.in
  44. +4 −0 ...ython-fd-percona-xtrabackup-plugin-test/etc/bareos/tray-monitor.d/director/Director-local.conf.in
  45. +7 −0 ...sts/python-fd-percona-xtrabackup-plugin-test/etc/bareos/tray-monitor.d/monitor/bareos-mon.conf.in
  46. +5 −0 ...n-fd-percona-xtrabackup-plugin-test/etc/bareos/tray-monitor.d/storage/StorageDaemon-local.conf.in
  47. +81 −0 systemtests/tests/python-fd-percona-xtrabackup-plugin-test/testrunner
@@ -7,12 +7,15 @@ Adrian Close
Aitor Matilla
Alan Brown
Aleksandar Milivojevic
Aleksandr Kozlov
Aleksey Volkov
Alessandro Rigopoulos
Alexander Bergolth
Alexander Kushnirenko
Alexandre Baron
Alexandre Simon
Allan Black
Andreas Thienemann
Andre Noll
Andreas Helmcke
Andreas Piesk
@@ -60,6 +63,7 @@ Enes Yalcin
Eric Bollengier
Erich Prinz
Eugene Sobolev
Evan J. Felix
Evgeni Golov
Felix Geyer
Felix Schwarz
@@ -73,8 +77,10 @@ Graham Keeling
Grzegorz Grabowski
Holger Weiss
Howard Thomson
I Smith
Jaime Ventura
Jakub Hradil
Jakub Kramarz
James Harper
Jan Görig
Jan Huisink
@@ -112,6 +118,7 @@ Maik Aussendorf
Marc Cousin
Marc Schiffbauer
Marcelo Medeiros
Marco Lertora
Marco van Wieringen
Martin Schmid
Martin Simmons
@@ -161,8 +168,10 @@ Sergey Svishchev
Simon Krahé
Simone Caronni
Stefan Reddig
Stefan Warten
Stephan Duehr
Sébastien Marchal
Thomas Duemesnil
Thomas Glatthor
Thomas Lohman
Thorsten Enge
@@ -922,6 +922,8 @@ message(" AWK: ${AWK}")
message(" GAWK: ${GAWK}")
message(" RPCGEN: ${RPCGEN}")
message(" MTX: ${MTX}")
message(" XTRABACKUP: ${XTRABACKUP}")
message(" MARIABACKUP: ${MARIABACKUP}")
message(" DEVELOPER: ${developer}")
message(" LocalBuildDefinitionsFile: ${BareosLocalBuildDefinitionsFile}")
message(" HAVE_IS_TRIVIALLY_COPYABLE: ${HAVE_IS_TRIVIALLY_COPYABLE}")
@@ -38,3 +38,6 @@ find_program(GCORE gcore)
find_program(GDB gdb)
find_program(DBX dbx)
find_program(MDB mdb)
find_program(XTRABACKUP xtrabackup)
find_program(MARIABACKUP mariabackup)

@@ -0,0 +1,2 @@
@plugindir@/bareos-fd-percona-xtrabackup.py*
@plugindir@/BareosFdPluginPerconaXtraBackup.py*
@@ -19,3 +19,14 @@ Description: Backup Archiving Recovery Open Sourced - file daemon LDAP plugin
data across a network of computers of different kinds.
.
This package provides the LDAP Python plugin for the filedaemon.

Package: bareos-filedaemon-percona-xtrabackup-python-plugin
Architecture: any
Section: python
Pre-Depends: debconf (>= 1.4.30) | debconf-2.0
Depends: bareos-common (= ${binary:Version}), bareos-filedaemon-python-plugin (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Description: Backup Archiving Recovery Open Sourced - file daemon LDAP plugin
Bareos is a set of programs to manage backup, recovery and verification of
data across a network of computers of different kinds.
.
This package provides the Percona XtraBackup Python plugin for the filedaemon.
@@ -577,6 +577,13 @@ Requires: python-pycurl
Requires: python-lxml
Requires: python-ovirt-engine-sdk4

%package filedaemon-percona-xtrabackup-python-plugin
Summary: LDAP Python plugin for Bareos File daemon
Group: Productivity/Archiving/Backup
Requires: bareos-filedaemon = %{version}
Requires: bareos-filedaemon-python-plugin = %{version}
#Requires: python-percona

%package storage-python-plugin
Summary: Python plugin for Bareos Storage daemon
Group: Productivity/Archiving/Backup
@@ -602,6 +609,11 @@ This package contains the LDAP python plugin for the file daemon

This package contains the Ovirt python plugin for the file daemon

%description filedaemon-percona-xtrabackup-python-plugin
%{dscr}

This package contains the Percona python plugin for the file daemon

%description storage-python-plugin
%{dscr}

@@ -1387,6 +1399,14 @@ echo "This is a meta package to install a full bareos system" > %{buildroot}%{_d
%attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/fileset/plugin-ovirt.conf.example
%attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/job/backup-ovirt.conf.example

%files filedaemon-percona-xtrabackup-python-plugin
%defattr(-, root, root)
%{plugin_dir}/bareos-fd-percona-xtrabackup.py*
%{plugin_dir}/BareosFdPluginPerconaXtraBackup.py*
#%attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/fileset/plugin-percona-xtrabackup.conf.example
#%attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/job/backup-percona-xtrabackup.conf.example
#%attr(0640, %{director_daemon_user}, %{daemon_group}) %{_sysconfdir}/%{name}/bareos-dir.d/job/restore-percona-xtrabackup.conf.example

%files director-python-plugin
%defattr(-, root, root)
%{plugin_dir}/python-dir.so
@@ -1644,11 +1664,17 @@ fi; \


%if 0%{?python_plugins}

%post filedaemon-ldap-python-plugin
%post_backup_file /etc/%{name}/bareos-dir.d/plugin-python-ldap.conf

%posttrans filedaemon-ldap-python-plugin
%posttrans_restore_file /etc/%{name}/bareos-dir.d/plugin-python-ldap.conf

#post filedaemon-percona-xtrabackup-python-plugin
#post_backup_file /etc/#{name}/bareos-dir.d/plugin-python-percona-xtrabackup.conf
#posttrans filedaemon-percona-xtrabackup-python-plugin
#posttrans_restore_file /etc/#{name}/bareos-dir.d/plugin-python-percona-xtrabackup.conf

%endif


0 comments on commit 7c426c4

Please sign in to comment.
You can’t perform that action at this time.