Skip to content

Commit fdcff04

Browse files
author
Zhang Wenhao
committed
<refactor>[kvm]: use enum for vm host file sync reasons
Replace hardcoded strings with VmHostFileSyncReason enum for vm host file synchronization operations. Add new enum values for snapshot group online backup, revert snapshot and volume backup scenarios. Update KvmSecureBootExtensions and VolumeSnapshotGroupBase to use enum values instead of hardcoded strings. Resolves: ZSV-11560 Related: ZSV-11310 Change-Id: I6f7867777a616777636c64666a6b646d6d6e7a70
1 parent 7619fd7 commit fdcff04

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

header/src/main/java/org/zstack/header/vm/additions/VmHostFileSyncReason.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ public enum VmHostFileSyncReason {
88
VmShutdown("on libvirt shutdown event"),
99
PostClone("on post-clone (from dest host)"),
1010
Restore("restore"),
11+
SnapshotGroupOnlineBackup("snapshot group online backup"),
12+
RevertSnapshot("revert snapshot"),
13+
VolumeBackup("volume backup"),
1114
;
1215

1316
public final String detail;

plugin/kvm/src/main/java/org/zstack/kvm/efi/KvmSecureBootExtensions.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@
8585
import static org.zstack.header.vm.additions.VmHostFileSyncReason.PrepareReRead;
8686
import static org.zstack.header.vm.additions.VmHostFileSyncReason.PrepareRead;
8787
import static org.zstack.header.vm.additions.VmHostFileSyncReason.ResourceRelease;
88+
import static org.zstack.header.vm.additions.VmHostFileSyncReason.SnapshotGroupOnlineBackup;
8889
import static org.zstack.kvm.KVMConstant.*;
8990
import static org.zstack.utils.CollectionDSL.list;
9091

@@ -699,7 +700,7 @@ public void afterVolumeLiveSnapshotGroupCreatedOnBackend(CreateVolumesSnapshotOv
699700
}
700701
}
701702

702-
syncMsg.setSyncReason("snapshot-group-online-backup");
703+
syncMsg.setSyncReason(SnapshotGroupOnlineBackup.reason());
703704
syncMsg.setSyncToBackup(true);
704705
syncMsg.setBackupResourceUuid(tempResourceUuid);
705706
bus.makeLocalServiceId(syncMsg, VmInstanceConstant.SECURE_BOOT_SERVICE_ID);

storage/src/main/java/org/zstack/storage/snapshot/group/VolumeSnapshotGroupBase.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.zstack.header.vm.VmInstanceConstant;
3535
import org.zstack.header.vm.additions.VmHostBackupFileVO;
3636
import org.zstack.header.vm.additions.VmHostBackupFileVO_;
37+
import org.zstack.header.vm.additions.VmHostFileSyncReason;
3738
import org.zstack.header.vm.devices.VmInstanceResourceMetadataManager;
3839
import org.zstack.header.volume.VolumeType;
3940
import org.zstack.header.volume.VolumeVO;
@@ -405,7 +406,7 @@ class Context {
405406
RestoreVmHostFileMsg restoreMsg = new RestoreVmHostFileMsg();
406407
restoreMsg.setVmInstanceUuid(vmUuid);
407408
restoreMsg.setSnapshotGroupUuid(self.getUuid());
408-
restoreMsg.setSyncReason("revert snapshot");
409+
restoreMsg.setSyncReason(VmHostFileSyncReason.RevertSnapshot.reason());
409410
bus.makeLocalServiceId(restoreMsg, VmInstanceConstant.SECURE_BOOT_SERVICE_ID);
410411
bus.send(restoreMsg, new CloudBusCallBack(trigger) {
411412
@Override

0 commit comments

Comments
 (0)