Skip to content

Commit 4fe0b19

Browse files
author
Rakesh Venkatesh
committed
code feedback
1 parent f5d2789 commit 4fe0b19

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

agent/conf/agent.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,5 @@ iscsi.session.cleanup.enabled=false
280280
# This parameter specifies the timeout in seconds to retrieve the target's domain id when migrating a VM with KVM.
281281
# vm.migrate.domain.retrieve.timeout=10
282282

283-
# This parameter specifies if the host must be rebooted when something goes wrong with the heartbeat.
284-
# reboot.host.and.alert.management.on.heartbeat.timeout=true
285-
286283
# Enable manually setting CPU's topology on KVM's VM.
287284
# enable.manually.setting.cpu.topology.on.kvm.vm=true

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -468,13 +468,13 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
468468
true, ConfigKey.Scope.Global);
469469

470470
public static final ConfigKey<Long> KVM_HEARTBEAT_UPDATE_RETRY_SLEEP_CK = new ConfigKey<>("Advanced", Long.class, KVM_HEARTBEAT_UPDATE_RETRY_SLEEP, "10000",
471-
"The sleep time, in milliseconds, between two kvm heartbeats to write to storage",
471+
"The sleep time, in milliseconds, between two KVM heartbeats to write to storage",
472472
true, ConfigKey.Scope.Global);
473473
public static final ConfigKey<Long> KVM_HEARTBEAT_UPDATE_TIMEOUT_CK = new ConfigKey<>("Advanced", Long.class, KVM_HEARTBEAT_UPDATE_TIMEOUT, "60000",
474-
"Timeout(in milliseconds) that kvm heartbeat to write to storage",
474+
"Timeout, in milliseconds to KVM heartbeat writes to storage",
475475
true, ConfigKey.Scope.Global);
476476
public static final ConfigKey<String> KVM_HEARTBEAT_FAILURE_ACTION_CK = new ConfigKey<>("Advanced", String.class, KVM_HEARTBEAT_FAILURE_ACTION, "hardreset",
477-
"The action for heartbeat write failures on KVM host. The valid value are 'hardreset' (default), 'stopagent', 'destroyvms'",
477+
"The action for heartbeat write failures on KVM host. The valid value are 'hardreset' (default), 'stopagent', 'destroyvms', 'noaction'",
478478
true, ConfigKey.Scope.Global);
479479

480480
private static final String IOPS_READ_RATE = "IOPS Read";

0 commit comments

Comments
 (0)