[Pkg-ganeti-devel] [ganeti] 01/02: Do not backup exported instance data on upgrade

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit f2284b31458edfe2e5fffdc0947ee80ba560c2b2
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Fri Jul 11 12:41:34 2014 +0300

    Do not backup exported instance data on upgrade
---
 debian/patches/do-not-backup-export-dir.patch | 28 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 29 insertions(+)

diff --git a/debian/patches/do-not-backup-export-dir.patch b/debian/patches/do-not-backup-export-dir.patch
new file mode 100644
index 0000000..0e0f39e
--- /dev/null
+++ b/debian/patches/do-not-backup-export-dir.patch
@@ -0,0 +1,28 @@
+commit 20e606cedfe51bf89ceade0ea3497c0099bf8240
+Author: Apollon Oikonomopoulos <apoikos at gmail.com>
+Date:   Fri Jul 11 12:37:12 2014 +0300
+
+    Do not backup exported instance data on upgrade
+
+    gnt-cluster upgrade creates a configuration backup by tar'ing
+    /var/lib/ganeti. Unfortunately, this means that exported instance data
+    is also backed up during upgrade, which is clearly unwanted.
+
+    We have been using /var/lib/ganeti/export for exported instance data
+    since 2.0.1-1 and changing the location now will break imports in
+    existing setups, so it's best to just skip backing up DATADIR/export.
+
+diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
+index 3e63d3a..04045d8 100644
+--- a/lib/client/gnt_cluster.py
++++ b/lib/client/gnt_cluster.py
+@@ -1880,7 +1880,8 @@ def _UpgradeBeforeConfigurationChange(versionstring):
+   backuptar = os.path.join(pathutils.LOCALSTATEDIR,
+                            "lib/ganeti%d.tar" % time.time())
+   ToStdout("Backing up configuration as %s" % backuptar)
+-  if not _RunCommandAndReport(["tar", "cf", backuptar,
++  if not _RunCommandAndReport(["tar", "-cf", backuptar,
++                               "--exclude=export",
+                                pathutils.DATA_DIR]):
+     return (False, rollback)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 7011cb7..71e520b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
 0003-Disable-local-checks-during-build.patch
+do-not-backup-export-dir.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git