From ecba6d5eee45874460ed622ffc8203940edd01e9 Mon Sep 17 00:00:00 2001 From: Daniel Augusto Veronezi Salvador Date: Thu, 18 Feb 2021 11:09:22 -0300 Subject: [PATCH 1/3] Improve logs on KVMHAVMActivityChecker --- .../kvm/resource/KVMHAVMActivityChecker.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java index f14d0a25b7fb..54ce21d97f23 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java @@ -52,11 +52,14 @@ public Boolean checkingHB() { cmd.add("-t", String.valueOf(String.valueOf(System.currentTimeMillis() / 1000))); cmd.add("-d", String.valueOf(suspectTimeInSeconds)); OutputInterpreter.OneLineParser parser = new OutputInterpreter.OneLineParser(); + String result = cmd.execute(parser); - LOG.debug("KVMHAVMActivityChecker pool: " + nfsStoragePool._poolIp); - LOG.debug("KVMHAVMActivityChecker result: " + result); - LOG.debug("KVMHAVMActivityChecker parser: " + parser.getLine()); - if (result == null && parser.getLine().contains("DEAD")) { + String parsedLine = parser.getLine(); + + LOG.debug(String.format("Checking HB with KVMHAVMActivityChecker [{command=\"%s\", result: \"%s\", log: \"%s\", pool: \"%s\"}].", cmd.toString(), result, parsedLine, nfsStoragePool._poolIp)); + + if (result == null && parsedLine.contains("DEAD")) { + LOG.warn(String.format("Checking HB with KVMHAVMActivityChecker command [%s] returned [%s]. It is [%s]. It may cause a shutdown of host IP [%s].", cmd.toString(), result, parsedLine, hostIP)); return false; } else { return true; From e43f7e5ca38352af2b859d040dbd596166293abd Mon Sep 17 00:00:00 2001 From: Daniel Augusto Veronezi Salvador Date: Fri, 23 Apr 2021 17:10:55 -0300 Subject: [PATCH 2/3] Adjust logs --- .../cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java index 54ce21d97f23..8a1e342d658b 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java @@ -56,10 +56,10 @@ public Boolean checkingHB() { String result = cmd.execute(parser); String parsedLine = parser.getLine(); - LOG.debug(String.format("Checking HB with KVMHAVMActivityChecker [{command=\"%s\", result: \"%s\", log: \"%s\", pool: \"%s\"}].", cmd.toString(), result, parsedLine, nfsStoragePool._poolIp)); + LOG.debug(String.format("Checking heart beat with KVMHAVMActivityChecker [{command=\"%s\", result: \"%s\", log: \"%s\", pool: \"%s\"}].", cmd.toString(), result, parsedLine, nfsStoragePool._poolIp)); if (result == null && parsedLine.contains("DEAD")) { - LOG.warn(String.format("Checking HB with KVMHAVMActivityChecker command [%s] returned [%s]. It is [%s]. It may cause a shutdown of host IP [%s].", cmd.toString(), result, parsedLine, hostIP)); + LOG.warn(String.format("Checking heart beat with KVMHAVMActivityChecker command [%s] returned [%s]. It is [%s]. It may cause a shutdown of host IP [%s].", cmd.toString(), result, parsedLine, hostIP)); return false; } else { return true; From efe0d3032b5a8948ea65eb585f13ff930a8dfbf3 Mon Sep 17 00:00:00 2001 From: Daniel Augusto Veronezi Salvador Date: Fri, 30 Apr 2021 17:04:20 -0300 Subject: [PATCH 3/3] Rename method to checkingHeartBeat --- .../java/com/cloud/hypervisor/kvm/resource/KVMHABase.java | 2 +- .../java/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java | 4 ++-- .../cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHABase.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHABase.java index 9aa55f89dc87..fd1122f07ad3 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHABase.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHABase.java @@ -181,7 +181,7 @@ protected String runScriptRetry(String cmdString, OutputInterpreter interpreter) return result; } - public Boolean checkingHB() { + public Boolean checkingHeartBeat() { // TODO Auto-generated method stub return null; } diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java index 3905b1ede304..723335b97f7b 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java @@ -41,7 +41,7 @@ public KVMHAChecker(List pools, String host) { * means heartbeating is stopped definitely */ @Override - public Boolean checkingHB() { + public Boolean checkingHeartBeat() { List results = new ArrayList(); for (NfsStoragePool pool : _pools) { Script cmd = new Script(s_heartBeatPath, _heartBeatCheckerTimeout, s_logger); @@ -77,6 +77,6 @@ public Boolean checkingHB() { public Boolean call() throws Exception { // s_logger.addAppender(new org.apache.log4j.ConsoleAppender(new // org.apache.log4j.PatternLayout(), "System.out")); - return checkingHB(); + return checkingHeartBeat(); } } diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java index 8a1e342d658b..758edd2a24b0 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java @@ -42,7 +42,7 @@ public KVMHAVMActivityChecker(final NfsStoragePool pool, final String host, fina } @Override - public Boolean checkingHB() { + public Boolean checkingHeartBeat() { Script cmd = new Script(vmActivityCheckPath, activityScriptTimeout.getStandardSeconds(), LOG); cmd.add("-i", nfsStoragePool._poolIp); cmd.add("-p", nfsStoragePool._poolMountSourcePath); @@ -68,6 +68,6 @@ public Boolean checkingHB() { @Override public Boolean call() throws Exception { - return checkingHB(); + return checkingHeartBeat(); } }