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

…nto-master merge percona xtrabackup plugin into master
bareos · Jan 15, 2020 · 7c426c4 · 7c426c4
2 parents 6e54535 + ddc168f
commit 7c426c4
Show file tree

Hide file tree

Showing 47 changed files with 1,275 additions and 161 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -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

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -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}")

diff --git a/core/cmake/BareosFindPrograms.cmake b/core/cmake/BareosFindPrograms.cmake
@@ -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)
+
diff --git a/core/debian/bareos-filedaemon-percona-xtrabackup-python-plugin.install.in b/core/debian/bareos-filedaemon-percona-xtrabackup-python-plugin.install.in
@@ -0,0 +1,2 @@
+@plugindir@/bareos-fd-percona-xtrabackup.py*
+@plugindir@/BareosFdPluginPerconaXtraBackup.py*
diff --git a/core/debian/control.bareos-filedaemon-python-plugin b/core/debian/control.bareos-filedaemon-python-plugin
@@ -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.
diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec
@@ -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