From 36b2bf08ac0e4bd59633cf7c76046c7e2ba702c2 Mon Sep 17 00:00:00 2001 From: Milind Changire Date: Wed, 7 Dec 2016 17:27:02 +0530 Subject: tools/glusterfind: avoid deleting keys directory Problem: gluster volume delete mistakenly deletes the .keys directory under /var/lib/glusterd/glusterfind. Solution: Check for ".keys" directory and avoid deleting it. > BUG: 1402369 > Reviewed-on: http://review.gluster.org/16052 > Reviewed-by: Aravinda VK > Smoke: Gluster Build System > NetBSD-regression: NetBSD Build System > CentOS-regression: Gluster Build System (cherry picked from commit 2b4b928ed350286192b63b10b18f85c669b741f8) Change-Id: Ia595c8bf3f423c1ad5d6faa183a29598c07a11f9 BUG: 1402671 Signed-off-by: Milind Changire Reviewed-on: http://review.gluster.org/16062 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Aravinda VK --- tools/glusterfind/S57glusterfind-delete-post.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/glusterfind/S57glusterfind-delete-post.py b/tools/glusterfind/S57glusterfind-delete-post.py index 9e7774a9828..fb6c222df03 100755 --- a/tools/glusterfind/S57glusterfind-delete-post.py +++ b/tools/glusterfind/S57glusterfind-delete-post.py @@ -46,6 +46,10 @@ def main(): ls_glusterfind_dir = [] for session in ls_glusterfind_dir: + # don't blow away the keys directory + if session == ".keys": + continue + # Possible session directory volume_session_path = os.path.join(glusterfind_dir, session, -- cgit