|
 |
cb8e9e |
From 38a5a035ccba395dde991ab849a26b6f65257a16 Mon Sep 17 00:00:00 2001
|
|
|
cb8e9e |
From: Milind Changire <mchangir@redhat.com>
|
|
|
cb8e9e |
Date: Wed, 5 Aug 2015 16:21:51 +0530
|
|
|
cb8e9e |
Subject: [PATCH 307/320] tools/glusterfind: password prompts for peer nodes on delete
|
|
|
cb8e9e |
|
|
|
cb8e9e |
SSH keys getting deleted on local node caused password prompts for peer
|
|
|
cb8e9e |
nodes on a delete operation.
|
|
|
cb8e9e |
|
|
|
cb8e9e |
This race for session directory cleanup on local node is now addressed
|
|
|
cb8e9e |
by avoiding the delete path for local node in node_cmd()
|
|
|
cb8e9e |
The session directory tree is deleted anyway in mode_delete()
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Change-Id: I8d000b01f523fffc0336bbec51b55099c0d4430f
|
|
|
cb8e9e |
BUG: 1234213
|
|
|
cb8e9e |
Reviewed-on: http://review.gluster.org/#/c/11832/
|
|
|
cb8e9e |
Reviewed-on: http://review.gluster.org/#/c/11693/
|
|
|
cb8e9e |
Signed-off-by: Milind Changire <mchangir@redhat.com>
|
|
|
cb8e9e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/54471
|
|
|
cb8e9e |
Reviewed-by: Saravanakumar Arumugam <sarumuga@redhat.com>
|
|
|
cb8e9e |
Reviewed-by: Kotresh Hiremath Ravishankar <khiremat@redhat.com>
|
|
|
cb8e9e |
Reviewed-by: Aravinda Vishwanathapura Krishna Murthy <avishwan@redhat.com>
|
|
|
cb8e9e |
Tested-by: Aravinda Vishwanathapura Krishna Murthy <avishwan@redhat.com>
|
|
|
cb8e9e |
---
|
|
|
cb8e9e |
tools/glusterfind/src/main.py | 6 ++++++
|
|
|
cb8e9e |
1 files changed, 6 insertions(+), 0 deletions(-)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/tools/glusterfind/src/main.py b/tools/glusterfind/src/main.py
|
|
|
cb8e9e |
index b4d2c7e..6c2568e 100644
|
|
|
cb8e9e |
--- a/tools/glusterfind/src/main.py
|
|
|
cb8e9e |
+++ b/tools/glusterfind/src/main.py
|
|
|
cb8e9e |
@@ -55,6 +55,12 @@ def node_cmd(host, host_uuid, task, cmd, args, opts):
|
|
|
cb8e9e |
"""
|
|
|
cb8e9e |
localdir = is_host_local(host_uuid)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
+ # this is so to avoid deleting the ssh keys on local node which otherwise
|
|
|
cb8e9e |
+ # cause ssh password prompts on the console (race conditions)
|
|
|
cb8e9e |
+ # mode_delete() should be cleaning up the session tree
|
|
|
cb8e9e |
+ if localdir and task == "delete":
|
|
|
cb8e9e |
+ return
|
|
|
cb8e9e |
+
|
|
|
cb8e9e |
pem_key_path = get_pem_key_path(args.session, args.volume)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
if not localdir:
|
|
|
cb8e9e |
--
|
|
|
cb8e9e |
1.7.1
|
|
|
cb8e9e |
|