diff options
| author | Milind Changire <mchangir@redhat.com> | 2016-12-07 17:27:02 +0530 |
|---|---|---|
| committer | Aravinda VK <avishwan@redhat.com> | 2016-12-09 03:07:07 -0800 |
| commit | 1ebc8455641b82b8527b011de4a16f66b9a451e1 (patch) | |
| tree | 9645e67838c47a4a3d30f70d25324f9684283c9b | |
| parent | beace6aed3ef27e1e55a420d606ecdfbd56b32b2 (diff) | |
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 <avishwan@redhat.com>
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
(cherry picked from commit 2b4b928ed350286192b63b10b18f85c669b741f8)
Change-Id: Ia595c8bf3f423c1ad5d6faa183a29598c07a11f9
BUG: 1402672
Signed-off-by: Milind Changire <mchangir@redhat.com>
Reviewed-on: http://review.gluster.org/16063
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Aravinda VK <avishwan@redhat.com>
| -rwxr-xr-x | tools/glusterfind/S57glusterfind-delete-post.py | 4 |
1 files changed, 4 insertions, 0 deletions
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, |