Skip to content

Commit 6b9f3fb

Browse files
GutoVeroneziDaniel Augusto Veronezi Salvador
andauthored
Improve logs on KVMHAVMActivityChecker (#4705)
Co-authored-by: Daniel Augusto Veronezi Salvador <daniel@scclouds.com.br>
1 parent 99f2919 commit 6b9f3fb

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHABase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ protected String runScriptRetry(String cmdString, OutputInterpreter interpreter)
181181
return result;
182182
}
183183

184-
public Boolean checkingHB() {
184+
public Boolean checkingHeartBeat() {
185185
// TODO Auto-generated method stub
186186
return null;
187187
}

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public KVMHAChecker(List<NfsStoragePool> pools, String host) {
4141
* means heartbeating is stopped definitely
4242
*/
4343
@Override
44-
public Boolean checkingHB() {
44+
public Boolean checkingHeartBeat() {
4545
List<Boolean> results = new ArrayList<Boolean>();
4646
for (NfsStoragePool pool : _pools) {
4747
Script cmd = new Script(s_heartBeatPath, _heartBeatCheckerTimeout, s_logger);
@@ -77,6 +77,6 @@ public Boolean checkingHB() {
7777
public Boolean call() throws Exception {
7878
// s_logger.addAppender(new org.apache.log4j.ConsoleAppender(new
7979
// org.apache.log4j.PatternLayout(), "System.out"));
80-
return checkingHB();
80+
return checkingHeartBeat();
8181
}
8282
}

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public KVMHAVMActivityChecker(final NfsStoragePool pool, final String host, fina
4242
}
4343

4444
@Override
45-
public Boolean checkingHB() {
45+
public Boolean checkingHeartBeat() {
4646
Script cmd = new Script(vmActivityCheckPath, activityScriptTimeout.getStandardSeconds(), LOG);
4747
cmd.add("-i", nfsStoragePool._poolIp);
4848
cmd.add("-p", nfsStoragePool._poolMountSourcePath);
@@ -52,11 +52,14 @@ public Boolean checkingHB() {
5252
cmd.add("-t", String.valueOf(String.valueOf(System.currentTimeMillis() / 1000)));
5353
cmd.add("-d", String.valueOf(suspectTimeInSeconds));
5454
OutputInterpreter.OneLineParser parser = new OutputInterpreter.OneLineParser();
55+
5556
String result = cmd.execute(parser);
56-
LOG.debug("KVMHAVMActivityChecker pool: " + nfsStoragePool._poolIp);
57-
LOG.debug("KVMHAVMActivityChecker result: " + result);
58-
LOG.debug("KVMHAVMActivityChecker parser: " + parser.getLine());
59-
if (result == null && parser.getLine().contains("DEAD")) {
57+
String parsedLine = parser.getLine();
58+
59+
LOG.debug(String.format("Checking heart beat with KVMHAVMActivityChecker [{command=\"%s\", result: \"%s\", log: \"%s\", pool: \"%s\"}].", cmd.toString(), result, parsedLine, nfsStoragePool._poolIp));
60+
61+
if (result == null && parsedLine.contains("DEAD")) {
62+
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));
6063
return false;
6164
} else {
6265
return true;
@@ -65,6 +68,6 @@ public Boolean checkingHB() {
6568

6669
@Override
6770
public Boolean call() throws Exception {
68-
return checkingHB();
71+
return checkingHeartBeat();
6972
}
7073
}

0 commit comments

Comments
 (0)