Skip to content

Commit ce93705

Browse files
CSTACKEX-18_2: reverting memory snapshot workflow and eroring out for now
1 parent 2340400 commit ce93705

File tree

8 files changed

+57
-608
lines changed

8 files changed

+57
-608
lines changed

core/src/main/java/com/cloud/agent/api/RestoreVMFromMemoryFileAnswer.java

Lines changed: 0 additions & 55 deletions
This file was deleted.

core/src/main/java/com/cloud/agent/api/RestoreVMFromMemoryFileCommand.java

Lines changed: 0 additions & 100 deletions
This file was deleted.

core/src/main/java/com/cloud/agent/api/SaveVMMemoryToFileAnswer.java

Lines changed: 0 additions & 63 deletions
This file was deleted.

core/src/main/java/com/cloud/agent/api/SaveVMMemoryToFileCommand.java

Lines changed: 0 additions & 104 deletions
This file was deleted.

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,23 @@ public Answer execute(RestoreVMFromMemoryFileCommand cmd, LibvirtComputingResour
9898
}
9999

100100
// Restore VM from memory file using virsh restore
101-
String virshPath = Script.getExecutableAbsolutePath("virsh");
102-
String restoreResult = Script.runSimpleBashScript(
103-
virshPath + " restore " + memoryFilePath + " --bypass-cache");
104-
105-
if (restoreResult != null && !restoreResult.isEmpty()) {
101+
// Use Script class for better error handling - it returns null on success
102+
Script restoreScript = new Script(Script.getExecutableAbsolutePath("virsh"),
103+
serverResource.getCmdsTimeout(), logger);
104+
restoreScript.add("restore");
105+
restoreScript.add(memoryFilePath);
106+
restoreScript.add("--bypass-cache");
107+
108+
String restoreResult = restoreScript.execute();
109+
// Script.execute() returns null on success, error message on failure
110+
if (restoreResult != null) {
106111
logger.error("virsh restore failed for VM " + vmName + ": " + restoreResult);
107112
return new RestoreVMFromMemoryFileAnswer(cmd, false,
108113
"Failed to restore VM from memory file: " + restoreResult);
109114
}
110115

116+
logger.info("RestoreVMFromMemoryFileCommandWrapper: virsh restore completed successfully for VM " + vmName);
117+
111118
// Verify VM is now running
112119
Domain restoredDomain = null;
113120
VirtualMachine.PowerState vmState = VirtualMachine.PowerState.PowerUnknown;

0 commit comments

Comments
 (0)