Skip to content

Commit 449ef01

Browse files
author
gitlab
committed
Merge branch 'zsv-ldap-3' into 'feature-zsv-5.0.0-vm-support-vtpm-and-secuceboot'
<fix>[kvm]: disable host status check when syncing VM host files See merge request zstackio/zstack!9591
2 parents 78c679d + b13926a commit 449ef01

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

plugin/kvm/src/main/java/org/zstack/kvm/KvmCommandSender.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ public KvmCommandSender(String hostUuid, boolean noStatusCheck) {
6969
DebugUtils.Assert(hostUuid != null, "hostUuid cannot be null");
7070
}
7171

72+
public KvmCommandSender disableHostStatusCheck() {
73+
this.noStatusCheck = true;
74+
return this;
75+
}
76+
7277
public void send(final Object cmd, final String path, final KvmCommandFailureChecker checker, final SteppingSendCallback<KvmResponseWrapper> completion) {
7378
List<KVMHostAsyncHttpCallMsg> msgs = hostUuids.stream().map(huuid -> {
7479
KVMHostAsyncHttpCallMsg msg = new KVMHostAsyncHttpCallMsg();

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ static class CloneVmHostFileContext {
204204
}
205205

206206
private void handle(SyncVmHostFilesFromHostMsg msg) {
207-
KvmCommandSender sender = new KvmCommandSender(msg.getHostUuid());
207+
KvmCommandSender sender = new KvmCommandSender(msg.getHostUuid())
208+
.disableHostStatusCheck();
208209

209210
KVMAgentCommands.ReadVmHostFileContentCmd cmd = new KVMAgentCommands.ReadVmHostFileContentCmd();
210211
cmd.setHostFiles(new ArrayList<>());

0 commit comments

Comments
 (0)