diff options
| author | Milind Changire <mchangir@redhat.com> | 2015-07-16 15:36:17 +0530 |
|---|---|---|
| committer | Venky Shankar <vshankar@redhat.com> | 2015-08-04 23:26:37 -0700 |
| commit | 9361e2bf05dc511bcc6b49a67b69dfa231a2cab3 (patch) | |
| tree | 5cd62f268c07e719c1e8a393179a929a9e4ce3a4 /tools | |
| parent | ed9959b0e2c7f401394fa6359641857180baf1c8 (diff) | |
tools/glusterfind: password prompts for peer nodes on delete
SSH keys getting deleted on local node caused password prompts for peer
nodes on a delete operation.
This race for session directory cleanup on local node is now addressed
by avoiding the delete path for local node in node_cmd()
The session directory tree is deleted anyway in mode_delete()
Change-Id: I51c4baf4f9c1ed3caa319d4163bef343bd621429
BUG: 1243785
Signed-off-by: Milind Changire <mchangir@redhat.com>
Reviewed-on: http://review.gluster.org/11693
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Aravinda VK <avishwan@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/glusterfind/src/main.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/glusterfind/src/main.py b/tools/glusterfind/src/main.py index 8b3d3fe9edd..f265a4a1085 100644 --- a/tools/glusterfind/src/main.py +++ b/tools/glusterfind/src/main.py @@ -55,6 +55,12 @@ def node_cmd(host, host_uuid, task, cmd, args, opts): """ localdir = is_host_local(host_uuid) + # this is so to avoid deleting the ssh keys on local node which otherwise + # cause ssh password prompts on the console (race conditions) + # mode_delete() should be cleaning up the session tree + if localdir and task == "delete": + return + pem_key_path = get_pem_key_path(args.session, args.volume) if not localdir: |