[Debian-ha-commits] [pcs] 02/03: Add patch to fix file cleanup by cluster destroy

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository pcs.

commit 36f67a5866e14ce88a0caa771c2b915cc527ceb3
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Sun Dec 11 18:56:43 2016 +0100

    Add patch to fix file cleanup by cluster destroy
---
 .../patches/0008-Fix-cluster-destroy-cleanup.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 24 insertions(+)

diff --git a/debian/patches/0008-Fix-cluster-destroy-cleanup.patch b/debian/patches/0008-Fix-cluster-destroy-cleanup.patch
new file mode 100644
index 0000000..5ab6af1
--- /dev/null
+++ b/debian/patches/0008-Fix-cluster-destroy-cleanup.patch
@@ -0,0 +1,23 @@
+Description:  Fix: "find" should run only in specific directories
+ Some users reported that running find over "/var/lib" for cleanup
+ purposes can take too long depending on what you have installed.
+ A particular example was having "lxcfs" fuse mounted in /var/lib.
+ That can make the search for cluster leftovers to take quite some
+ time, making user to believe the process has hang.
+Author: Rafael David Tinoco <rafael.tinoco at canonical.com>
+Applied-Upstream: https://github.com/ClusterLabs/pcs/commit/8a2b8b337bcb0f26da593973e7b1f27bdef86449
+Reviewed-by: Valentin Vidic <Valentin.Vidic at CARNet.hr>
+Last-Update: 2016-12-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/pcs/cluster.py
++++ b/pcs/cluster.py
+@@ -1893,7 +1893,7 @@
+         state_files = ["cib.xml*", "cib-*", "core.*", "hostcache", "cts.*",
+                 "pe*.bz2","cib.*"]
+         for name in state_files:
+-            os.system("find /var/lib -name '"+name+"' -exec rm -f \{\} \;")
++            os.system("find /var/lib/pacemaker -name '"+name+"' -exec rm -f \{\} \;")
+         try:
+             qdevice_net.client_destroy()
+         except:
diff --git a/debian/patches/series b/debian/patches/series
index e043f13..4791a47 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,5 +5,6 @@
 0005-settings.py
 0006-Replace-orderedhash.patch
 0007-Fix-corosync-log.patch
+0008-Fix-cluster-destroy-cleanup.patch
 0009-Fix-testsuite.patch
 0010-Replace-chkconfig.patch

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