Visitar URL original
KVM: Enable HA heartbeat on ShareMountPoint by weizhouapache · Pull Request #12773 · apache/cloudstack · GitHub
Skip to content

KVM: Enable HA heartbeat on ShareMountPoint #12773

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sureshanaparti merged 17 commits into from
Apr 10, 2026
Merged

KVM: Enable HA heartbeat on ShareMountPoint #12773

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
93b95aa
KVM: Enable HA heartbeat on ShareMountPoint
weizhouapache Mar 5, 2026
f6c6a17
Update plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm…
weizhouapache Mar 10, 2026
a803c2f
Update scripts/vm/hypervisor/kvm/kvmsmpheartbeat.sh
weizhouapache Mar 10, 2026
eacece1
Update scripts/vm/hypervisor/kvm/kvmsmpheartbeat.sh
weizhouapache Mar 10, 2026
4e4da44
move STORAGE_POOL_TYPES_WITH_HA_SUPPORT to HighAvailabilityManager an…
weizhouapache Mar 12, 2026
5443527
Update scripts/vm/hypervisor/kvm/kvmsmpheartbeat.sh
weizhouapache Mar 12, 2026
bca0221
Update scripts/vm/hypervisor/kvm/kvmsmpheartbeat.sh
weizhouapache Mar 12, 2026
c9b0f97
Update scripts/vm/hypervisor/kvm/kvmsmpheartbeat.sh
weizhouapache Mar 12, 2026
1268f5d
minor changes
weizhouapache Mar 12, 2026
8670f25
Update plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm…
weizhouapache Mar 12, 2026
b543690
Update scripts/vm/hypervisor/kvm/kvmsmpheartbeat.sh
weizhouapache Mar 12, 2026
67d9c8f
fix wrong logic
weizhouapache Mar 12, 2026
6bcb459
KVM: remove KVMHABase.s_heartBeatPath
weizhouapache Mar 12, 2026
d30ca6e
small refactoring
weizhouapache Mar 12, 2026
ab4557d
Update scripts/vm/hypervisor/kvm/kvmsmpheartbeat.sh
weizhouapache Mar 12, 2026
a361b28
ensure mountPoint ends with a single trailing slash when delete vms o…
weizhouapache Mar 12, 2026
9cebe72
Merge branch '4.22' into 4.22-kvm-ha-on-shared-mount-point
weizhouapache Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
move STORAGE_POOL_TYPES_WITH_HA_SUPPORT to HighAvailabilityManager an… 
…d rename it
  • Loading branch information
@weizhouapache
weizhouapache committed Mar 12, 2026
commit 4e4da44a1fb62df557ccacfe6165acc0371f855d
3 changes: 3 additions & 0 deletions engine/components-api/src/main/java/com/cloud/ha/HighAvailabilityManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import com.cloud.deploy.DeploymentPlanner;
import com.cloud.host.HostVO;
import com.cloud.host.Status;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.utils.component.Manager;
import com.cloud.vm.VMInstanceVO;
import org.apache.cloudstack.framework.config.ConfigKey;
Expand All @@ -32,6 +33,8 @@
*/
public interface HighAvailabilityManager extends Manager {

List<StoragePoolType> LIBVIRT_STORAGE_POOL_TYPES_WITH_HA_SUPPORT = List.of(StoragePoolType.NetworkFilesystem, StoragePoolType.SharedMountPoint);
Comment thread
weizhouapache marked this conversation as resolved.

ConfigKey<Boolean> ForceHA = new ConfigKey<>("Advanced", Boolean.class, "force.ha", "false",
"Force High-Availability to happen even if the VM says no.", true, Cluster);

Expand Down
10 changes: 4 additions & 6 deletions plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import com.cloud.agent.properties.AgentProperties;
import com.cloud.agent.properties.AgentPropertiesFileHandler;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.ha.HighAvailabilityManager;
import com.cloud.utils.script.Script;
import org.libvirt.Connect;
import org.libvirt.LibvirtException;
Expand All @@ -34,8 +34,6 @@

public class KVMHAMonitor extends KVMHABase implements Runnable {

public static final List<StoragePoolType> STORAGE_POOL_TYPES_WITH_HA_SUPPORT = List.of(StoragePoolType.NetworkFilesystem, StoragePoolType.SharedMountPoint);

private final Map<String, HAStoragePool> storagePool = new ConcurrentHashMap<>();
private final boolean rebootHostAndAlertManagementOnHeartbeatTimeout;

Expand Down Expand Up @@ -88,8 +86,8 @@ protected void runHeartBeat() {
Set<String> removedPools = new HashSet<>();
for (String uuid : storagePool.keySet()) {
HAStoragePool primaryStoragePool = storagePool.get(uuid);
if (STORAGE_POOL_TYPES_WITH_HA_SUPPORT.contains(primaryStoragePool.getPool().getType())) {
checkForNotExistingPools(removedPools, uuid);
if (HighAvailabilityManager.LIBVIRT_STORAGE_POOL_TYPES_WITH_HA_SUPPORT.contains(primaryStoragePool.getPool().getType())) {
checkForNotExistingLibvirtStoragePools(removedPools, uuid);
if (removedPools.contains(uuid)) {
continue;
}
Expand Down Expand Up @@ -129,7 +127,7 @@ private String executePoolHeartBeatCommand(String uuid, HAStoragePool primarySto
return result;
}

private void checkForNotExistingPools(Set<String> removedPools, String uuid) {
private void checkForNotExistingLibvirtStoragePools(Set<String> removedPools, String uuid) {
try {
Connect conn = LibvirtConnection.getConnection();
StoragePool storage = conn.storagePoolLookupByUUIDString(uuid);
Expand Down
4 changes: 2 additions & 2 deletions ...ns/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
import com.cloud.agent.api.to.HostTO;
import com.cloud.agent.properties.AgentProperties;
import com.cloud.agent.properties.AgentPropertiesFileHandler;
import com.cloud.ha.HighAvailabilityManager;
import com.cloud.hypervisor.kvm.resource.KVMHABase.HAStoragePool;
import com.cloud.hypervisor.kvm.resource.KVMHAMonitor;
import com.cloud.storage.Storage;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.utils.exception.CloudRuntimeException;
Expand Down Expand Up @@ -321,7 +321,7 @@ public void setDetails(Map<String, String> details) {

@Override
public boolean isPoolSupportHA() {
return KVMHAMonitor.STORAGE_POOL_TYPES_WITH_HA_SUPPORT.contains(type);
return HighAvailabilityManager.LIBVIRT_STORAGE_POOL_TYPES_WITH_HA_SUPPORT.contains(type);
}

public String getHearthBeatPath() {
Expand Down
6 changes: 2 additions & 4 deletions .../org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
import static com.cloud.utils.NumbersUtil.toHumanReadableSize;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;

import javax.inject.Inject;

import com.cloud.agent.api.to.DiskTO;
import com.cloud.ha.HighAvailabilityManager;
import com.cloud.storage.VolumeVO;
import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
Expand Down Expand Up @@ -101,8 +101,6 @@ public Map<String, String> getCapabilities() {
protected Logger logger = LogManager.getLogger(getClass());
private static final String NO_REMOTE_ENDPOINT_WITH_ENCRYPTION = "No remote endpoint to send command, unable to find a valid endpoint. Requires encryption support: %s";

private static final List<StoragePoolType> STORAGE_POOL_TYPES_WITH_HA_SUPPORT = List.of(StoragePoolType.NetworkFilesystem, StoragePoolType.SharedMountPoint);

@Inject
DiskOfferingDao diskOfferingDao;
@Inject
Expand Down Expand Up @@ -590,7 +588,7 @@ private boolean anyVolumeRequiresEncryption(DataObject ... objects) {

@Override
public boolean isStorageSupportHA(StoragePoolType type) {
return type != null && STORAGE_POOL_TYPES_WITH_HA_SUPPORT.contains(type);
return type != null && HighAvailabilityManager.LIBVIRT_STORAGE_POOL_TYPES_WITH_HA_SUPPORT.contains(type);
}

@Override
Expand Down
Loading