From 6b9f3fb5015c29bbfaee0b08220174541ce40ab0 Mon Sep 17 00:00:00 2001
From: Daniel Augusto Veronezi Salvador
 <38945620+GutoVeronezi@users.noreply.github.com>
Date: Tue, 11 May 2021 04:12:59 -0300
Subject: [PATCH] Improve logs on KVMHAVMActivityChecker (#4705)

Co-authored-by: Daniel Augusto Veronezi Salvador <daniel@scclouds.com.br>
---
 .../cloud/hypervisor/kvm/resource/KVMHABase.java  |  2 +-
 .../hypervisor/kvm/resource/KVMHAChecker.java     |  4 ++--
 .../kvm/resource/KVMHAVMActivityChecker.java      | 15 +++++++++------
 3 files changed, 12 insertions(+), 9 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 9aa55f89dc8..fd1122f07ad 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 @@ public class KVMHABase {
         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 3905b1ede30..723335b97f7 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 class KVMHAChecker extends KVMHABase implements Callable<Boolean> {
      * means heartbeating is stopped definitely
      */
     @Override
-    public Boolean checkingHB() {
+    public Boolean checkingHeartBeat() {
         List<Boolean> results = new ArrayList<Boolean>();
         for (NfsStoragePool pool : _pools) {
             Script cmd = new Script(s_heartBeatPath, _heartBeatCheckerTimeout, s_logger);
@@ -77,6 +77,6 @@ public class KVMHAChecker extends KVMHABase implements Callable<Boolean> {
     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 f14d0a25b7f..758edd2a24b 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 class KVMHAVMActivityChecker extends KVMHABase implements Callable<Boolea
     }
 
     @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);
@@ -52,11 +52,14 @@ public class KVMHAVMActivityChecker extends KVMHABase implements Callable<Boolea
         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 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 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;
@@ -65,6 +68,6 @@ public class KVMHAVMActivityChecker extends KVMHABase implements Callable<Boolea
 
     @Override
     public Boolean call() throws Exception {
-        return checkingHB();
+        return checkingHeartBeat();
     }
 }