From 2810954798cebb20e87dcea592a55e20067c6d41 Mon Sep 17 00:00:00 2001 From: Milind Changire Date: Thu, 16 Jul 2015 15:36:17 +0530 Subject: 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: 1250410 Reviewed-on: http://review.gluster.org/11693 Signed-off-by: Milind Changire Reviewed-on: http://review.gluster.org/11832 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Aravinda VK --- tools/glusterfind/src/main.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/glusterfind/src/main.py b/tools/glusterfind/src/main.py index b4d2c7eff72..6c2568ebcf9 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: -- cgit