Skip to content

Commit 8e1d379

Browse files
mingjian2049mingjian2049
committed
use real imageUuid while createRootVolumeTempleteFromRootVolume
1 parent 2f36226 commit 8e1d379

File tree

9 files changed

+18
-19
lines changed

9 files changed

+18
-19
lines changed

‎plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageBackupStorageMediator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
public interface LocalStorageBackupStorageMediator extends PrimaryToBackupStorageMediator {
1313
void downloadBits(PrimaryStorageInventory pinv, BackupStorageInventory bsinv, String backupStorageInstallPath, String primaryStorageInstallPath, String hostUuid, Completion completion);
1414

15-
void uploadBits(PrimaryStorageInventory pinv, BackupStorageInventory bsinv, String backupStorageInstallPath, String primaryStorageInstallPath, String hostUuid, ReturnValueCompletion<String> completion);
15+
void uploadBits(String imageUuid, PrimaryStorageInventory pinv, BackupStorageInventory bsinv, String backupStorageInstallPath, String primaryStorageInstallPath, String hostUuid, ReturnValueCompletion<String> completion);
1616
}

‎plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageKvmBackend.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1471,7 +1471,7 @@ void handle(BackupVolumeSnapshotFromPrimaryStorageToBackupStorageMsg msg, String
14711471

14721472
final String installPath = ((BackupStorageAskInstallPathReply) br).getInstallPath();
14731473

1474-
m.uploadBits(getSelfInventory(), msg.getBackupStorage(), installPath, sp.getPrimaryStorageInstallPath(), hostUuid, new ReturnValueCompletion<String>(completion) {
1474+
m.uploadBits(null, getSelfInventory(), msg.getBackupStorage(), installPath, sp.getPrimaryStorageInstallPath(), hostUuid, new ReturnValueCompletion<String>(completion) {
14751475
@Override
14761476
public void success(String installPath) {
14771477
BackupVolumeSnapshotFromPrimaryStorageToBackupStorageReply reply = new BackupVolumeSnapshotFromPrimaryStorageToBackupStorageReply();
@@ -1659,7 +1659,7 @@ void handle(final UploadBitsFromLocalStorageToBackupStorageMsg msg, String hostU
16591659
BackupStorageInventory bsinv = BackupStorageInventory.valueOf(bs);
16601660

16611661
LocalStorageBackupStorageMediator m = localStorageFactory.getBackupStorageMediator(KVMConstant.KVM_HYPERVISOR_TYPE, bs.getType());
1662-
m.uploadBits(getSelfInventory(), bsinv, msg.getBackupStorageInstallPath(), msg.getPrimaryStorageInstallPath(),
1662+
m.uploadBits(null, getSelfInventory(), bsinv, msg.getBackupStorageInstallPath(), msg.getPrimaryStorageInstallPath(),
16631663
hostUuid, new ReturnValueCompletion<String>(completion) {
16641664
@Override
16651665
public void success(String installPath) {
@@ -2477,7 +2477,7 @@ public void run(final FlowTrigger trigger, Map data) {
24772477

24782478
BackupStorageVO bsvo = dbf.findByUuid(msg.getBackupStorageUuid(), BackupStorageVO.class);
24792479
LocalStorageBackupStorageMediator m = localStorageFactory.getBackupStorageMediator(KVMConstant.KVM_HYPERVISOR_TYPE, bsvo.getType());
2480-
m.uploadBits(getSelfInventory(), BackupStorageInventory.valueOf(bsvo), backupStorageInstallPath, temporaryTemplatePath, ref.getHostUuid(), new ReturnValueCompletion<String>(trigger) {
2480+
m.uploadBits(null, getSelfInventory(), BackupStorageInventory.valueOf(bsvo), backupStorageInstallPath, temporaryTemplatePath, ref.getHostUuid(), new ReturnValueCompletion<String>(trigger) {
24812481
@Override
24822482
public void success(String installPath) {
24832483
backupStorageInstallPath = installPath;

‎plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageKvmSftpBackupStorageMediatorImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ public void run(MessageReply reply) {
212212
}
213213

214214
@Override
215-
public void uploadBits(final PrimaryStorageInventory pinv, BackupStorageInventory bsinv, final String backupStorageInstallPath, final String primaryStorageInstallPath, final String hostUuid, final ReturnValueCompletion<String> completion) {
215+
public void uploadBits(final String imageUuid, final PrimaryStorageInventory pinv, BackupStorageInventory bsinv, final String backupStorageInstallPath, final String primaryStorageInstallPath, final String hostUuid, final ReturnValueCompletion<String> completion) {
216216
GetSftpBackupStorageDownloadCredentialMsg gmsg = new GetSftpBackupStorageDownloadCredentialMsg();
217217
gmsg.setBackupStorageUuid(bsinv.getUuid());
218218
bus.makeTargetServiceIdByResourceUuid(gmsg, BackupStorageConstant.SERVICE_ID, bsinv.getUuid());

‎plugin/nfsPrimaryStorage/src/main/java/org/zstack/storage/primary/nfs/NfsPrimaryStorage.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ private void handle(final BackupVolumeSnapshotFromPrimaryStorageToBackupStorageM
389389

390390
final BackupVolumeSnapshotFromPrimaryStorageToBackupStorageReply reply = new BackupVolumeSnapshotFromPrimaryStorageToBackupStorageReply();
391391
final String installPath = mediator.makeVolumeSnapshotInstallPath(bs.getUuid(), sinv.getUuid());
392-
mediator.uploadBits(getSelfInventory(), bs, installPath, sinv.getPrimaryStorageInstallPath(), new ReturnValueCompletion<String>(msg) {
392+
mediator.uploadBits(null, getSelfInventory(), bs, installPath, sinv.getPrimaryStorageInstallPath(), new ReturnValueCompletion<String>(msg) {
393393
@Override
394394
public void success(String installPath) {
395395
reply.setBackupStorageInstallPath(installPath);
@@ -882,7 +882,7 @@ public void run(final FlowTrigger trigger, Map data) {
882882
DebugUtils.Assert(!ImageMediaType.ISO.toString().equals(image.getMediaType()), String.format("how can this happen? creating an template from an ISO????"));
883883
templateBackupStorageInstallPath = ImageMediaType.RootVolumeTemplate.toString().equals(image.getMediaType()) ?
884884
mediator.makeRootVolumeTemplateInstallPath(bsinv.getUuid(), image.getUuid()) : mediator.makeDataVolumeTemplateInstallPath(bsinv.getUuid(), image.getUuid());
885-
mediator.uploadBits(pinv, bsinv, templateBackupStorageInstallPath, templatePrimaryStorageInstallPath, new ReturnValueCompletion<String>(trigger) {
885+
mediator.uploadBits(msg.getImageInventory().getUuid(), pinv, bsinv, templateBackupStorageInstallPath, templatePrimaryStorageInstallPath, new ReturnValueCompletion<String>(trigger) {
886886
@Override
887887
public void success(String installPath) {
888888
templateBackupStorageInstallPath = installPath;

‎plugin/nfsPrimaryStorage/src/main/java/org/zstack/storage/primary/nfs/NfsPrimaryStorageKVMBackend.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ public void handle(PrimaryStorageInventory inv, UploadBitsToBackupStorageMsg msg
358358
BackupStorageVO bs = dbf.findByUuid(msg.getBackupStorageUuid(), BackupStorageVO.class);
359359

360360
NfsPrimaryToBackupStorageMediator m = nfsFactory.getPrimaryToBackupStorageMediator(BackupStorageType.valueOf(bs.getType()), HypervisorType.valueOf(msg.getHypervisorType()));
361-
m.uploadBits(inv, BackupStorageInventory.valueOf(bs), msg.getBackupStorageInstallPath(), msg.getPrimaryStorageInstallPath(), new ReturnValueCompletion<String>(completion) {
361+
m.uploadBits(null, inv, BackupStorageInventory.valueOf(bs), msg.getBackupStorageInstallPath(), msg.getPrimaryStorageInstallPath(), new ReturnValueCompletion<String>(completion) {
362362
@Override
363363
public void success(String installPath) {
364364
UploadBitsToBackupStorageReply reply = new UploadBitsToBackupStorageReply();

‎plugin/nfsPrimaryStorage/src/main/java/org/zstack/storage/primary/nfs/NfsPrimaryToBackupStorageMediator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ void createVolumeFromImageCache(PrimaryStorageInventory primaryStorage, ImageCac
1414

1515
void downloadBits(PrimaryStorageInventory pinv, BackupStorageInventory bsinv, String backupStorageInstallPath, String primaryStorageInstallPath, Completion completion);
1616

17-
void uploadBits(PrimaryStorageInventory pinv, BackupStorageInventory bsinv, String backupStorageInstallPath, String primaryStorageInstallPath, ReturnValueCompletion<String> completion);
17+
void uploadBits(String imageUuid, PrimaryStorageInventory pinv, BackupStorageInventory bsinv, String backupStorageInstallPath, String primaryStorageInstallPath, ReturnValueCompletion<String> completion);
1818

1919
String makeRootVolumeTemplateInstallPath(String backupStorageUuid, String imageUuid);
2020

‎plugin/nfsPrimaryStorage/src/main/java/org/zstack/storage/primary/nfs/NfsPrimaryToSftpBackupKVMBackend.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,16 @@
1111
import org.zstack.header.core.ReturnValueCompletion;
1212
import org.zstack.header.host.HostConstant;
1313
import org.zstack.header.host.HostInventory;
14-
import org.zstack.header.host.HypervisorType;
1514
import org.zstack.header.message.MessageReply;
1615
import org.zstack.header.storage.backup.BackupStorageConstant;
1716
import org.zstack.header.storage.backup.BackupStorageInventory;
18-
import org.zstack.header.storage.backup.BackupStorageType;
1917
import org.zstack.header.storage.primary.ImageCacheInventory;
2018
import org.zstack.header.storage.primary.PrimaryStorageInventory;
21-
import org.zstack.header.storage.primary.PrimaryStorageType;
2219
import org.zstack.header.volume.VolumeInventory;
2320
import org.zstack.identity.AccountManager;
24-
import org.zstack.kvm.*;
21+
import org.zstack.kvm.KVMConstant;
22+
import org.zstack.kvm.KVMHostAsyncHttpCallMsg;
23+
import org.zstack.kvm.KVMHostAsyncHttpCallReply;
2524
import org.zstack.storage.backup.BackupStoragePathMaker;
2625
import org.zstack.storage.backup.sftp.*;
2726
import org.zstack.storage.primary.nfs.NfsPrimaryStorageKVMBackendCommands.*;
@@ -172,7 +171,7 @@ public void run(MessageReply reply) {
172171
}
173172

174173
@Override
175-
public void uploadBits(final PrimaryStorageInventory pinv, BackupStorageInventory bsinv, final String backupStorageInstallPath, final String primaryStorageInstallPath, final ReturnValueCompletion<String> completion) {
174+
public void uploadBits(final String imageUuid, final PrimaryStorageInventory pinv, BackupStorageInventory bsinv, final String backupStorageInstallPath, final String primaryStorageInstallPath, final ReturnValueCompletion<String> completion) {
176175
GetSftpBackupStorageDownloadCredentialMsg gmsg = new GetSftpBackupStorageDownloadCredentialMsg();
177176
gmsg.setBackupStorageUuid(bsinv.getUuid());
178177
bus.makeTargetServiceIdByResourceUuid(gmsg, BackupStorageConstant.SERVICE_ID, bsinv.getUuid());

‎plugin/sharedMountPointPrimaryStorage/src/main/java/org/zstack/storage/primary/smp/BackupStorageKvmUploader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ public abstract class BackupStorageKvmUploader {
99
// When uploading an image from 'psPath' to backup storage, the 'bsPath'
1010
// might be allocated by the backup storage and returned by the completion,
1111
// instead of being known ahead of time.
12-
public abstract void uploadBits(String bsPath, String psPath, ReturnValueCompletion<String> completion);
12+
public abstract void uploadBits(String imageUuid, String bsPath, String psPath, ReturnValueCompletion<String> completion);
1313
}

‎plugin/sharedMountPointPrimaryStorage/src/main/java/org/zstack/storage/primary/smp/KvmBackend.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,7 @@ public void run(final FlowTrigger trigger, Map data) {
11081108
backupStorageInstallPath = ((BackupStorageAskInstallPathReply) br).getInstallPath();
11091109

11101110
BackupStorageKvmUploader uploader = getBackupStorageKvmUploader(msg.getBackupStorageUuid());
1111-
uploader.uploadBits(backupStorageInstallPath, temporaryTemplatePath, new ReturnValueCompletion<String>(trigger) {
1111+
uploader.uploadBits(msg.getImageInventory().getUuid(), backupStorageInstallPath, temporaryTemplatePath, new ReturnValueCompletion<String>(trigger) {
11121112
@Override
11131113
public void success(String bsPath) {
11141114
backupStorageInstallPath = bsPath;
@@ -1167,7 +1167,7 @@ public void handle(ErrorCode errCode, Map data) {
11671167
@Override
11681168
void handle(UploadBitsToBackupStorageMsg msg, final ReturnValueCompletion<UploadBitsToBackupStorageReply> completion) {
11691169
SftpBackupStorageKvmUploader uploader = new SftpBackupStorageKvmUploader(msg.getBackupStorageUuid());
1170-
uploader.uploadBits(msg.getBackupStorageInstallPath(), msg.getPrimaryStorageInstallPath(), new ReturnValueCompletion<String>(completion) {
1170+
uploader.uploadBits(null, msg.getBackupStorageInstallPath(), msg.getPrimaryStorageInstallPath(), new ReturnValueCompletion<String>(completion) {
11711171
@Override
11721172
public void success(String bsPath) {
11731173
UploadBitsToBackupStorageReply reply = new UploadBitsToBackupStorageReply();
@@ -1236,7 +1236,7 @@ public SftpBackupStorageKvmUploader(String backupStorageUuid) {
12361236
}
12371237

12381238
@Override
1239-
public void uploadBits(final String bsPath, final String psPath, final ReturnValueCompletion<String> completion) {
1239+
public void uploadBits(final String imageUuid, final String bsPath, final String psPath, final ReturnValueCompletion<String> completion) {
12401240
GetSftpBackupStorageDownloadCredentialMsg gmsg = new GetSftpBackupStorageDownloadCredentialMsg();
12411241
gmsg.setBackupStorageUuid(bsUuid);
12421242
bus.makeTargetServiceIdByResourceUuid(gmsg, BackupStorageConstant.SERVICE_ID, bsUuid);
@@ -1446,7 +1446,7 @@ void handle(BackupVolumeSnapshotFromPrimaryStorageToBackupStorageMsg msg, final
14461446

14471447
final String installPath = ((BackupStorageAskInstallPathReply) br).getInstallPath();
14481448
BackupStorageKvmUploader uploader = getBackupStorageKvmUploader(bsUuid);
1449-
uploader.uploadBits(installPath, sinv.getPrimaryStorageInstallPath(), new ReturnValueCompletion<String>(completion) {
1449+
uploader.uploadBits(null, installPath, sinv.getPrimaryStorageInstallPath(), new ReturnValueCompletion<String>(completion) {
14501450
@Override
14511451
public void success(String bsPath) {
14521452
BackupVolumeSnapshotFromPrimaryStorageToBackupStorageReply reply = new BackupVolumeSnapshotFromPrimaryStorageToBackupStorageReply();

0 commit comments

Comments
 (0)