From 4eb0662ea7f0eef78ce324d82ac845969176c7cf Mon Sep 17 00:00:00 2001 From: Daniel Clavijo Coca Date: Mon, 25 May 2020 10:29:02 -0500 Subject: [PATCH 1/3] F #3859: Update onehost forceupdate internals --- src/cli/one_helper/onehost_helper.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/cli/one_helper/onehost_helper.rb b/src/cli/one_helper/onehost_helper.rb index f6abad08e2..95f39bcfaf 100644 --- a/src/cli/one_helper/onehost_helper.rb +++ b/src/cli/one_helper/onehost_helper.rb @@ -474,15 +474,19 @@ class OneHostHelper < OpenNebulaHelper::OneHelper break unless host - cmd = 'cat /tmp/one-monitord-client.pid | xargs kill -HUP' - system("ssh #{host['NAME']} \"#{cmd}\" 2>/dev/null") + hostname = host['NAME'] + + cmd = "onehost offline #{hostname}" + cmd << " && onehost enable #{hostname}" + + system("ssh #{hostname} \"#{cmd}\" 2>/dev/null") if !$CHILD_STATUS.success? error_lock.synchronize do - host_errors << host['NAME'] + host_errors << hostname end else - puts "#{host['NAME']} monitoring forced" + puts "#{hostname} monitoring forced" end end end From 5f2612acf4c8ad06fb01af340f5cda284fc93df8 Mon Sep 17 00:00:00 2001 From: Daniel Clavijo Coca Date: Mon, 25 May 2020 10:33:28 -0500 Subject: [PATCH 2/3] F #3859: Fix previous commit --- src/cli/one_helper/onehost_helper.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/cli/one_helper/onehost_helper.rb b/src/cli/one_helper/onehost_helper.rb index 95f39bcfaf..f418afb1ec 100644 --- a/src/cli/one_helper/onehost_helper.rb +++ b/src/cli/one_helper/onehost_helper.rb @@ -479,8 +479,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper cmd = "onehost offline #{hostname}" cmd << " && onehost enable #{hostname}" - system("ssh #{hostname} \"#{cmd}\" 2>/dev/null") - + system(cmd) if !$CHILD_STATUS.success? error_lock.synchronize do host_errors << hostname From 5938927b8976f58f4ced3310cd750defa3ce5a34 Mon Sep 17 00:00:00 2001 From: Daniel Clavijo Coca Date: Mon, 25 May 2020 10:39:00 -0500 Subject: [PATCH 3/3] F #3859: compact strings --- src/cli/one_helper/onehost_helper.rb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/cli/one_helper/onehost_helper.rb b/src/cli/one_helper/onehost_helper.rb index f418afb1ec..0331b89b08 100644 --- a/src/cli/one_helper/onehost_helper.rb +++ b/src/cli/one_helper/onehost_helper.rb @@ -474,18 +474,15 @@ class OneHostHelper < OpenNebulaHelper::OneHelper break unless host - hostname = host['NAME'] + hn = host['NAME'] - cmd = "onehost offline #{hostname}" - cmd << " && onehost enable #{hostname}" - - system(cmd) + system("onehost offline #{hn} && onehost enable #{hn}") if !$CHILD_STATUS.success? error_lock.synchronize do - host_errors << hostname + host_errors << hn end else - puts "#{hostname} monitoring forced" + puts "#{hn} monitoring forced" end end end