Skip to content

Commit cd35b78

Browse files
author
gitlab
committed
Merge branch 'fix-create-data-vol@@2' into 'master'
<fix>[storage]: fix create data volume from image See merge request zstackio/zstack!3492
2 parents 4de721c + f977190 commit cd35b78

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

storage/src/main/java/org/zstack/storage/volume/VolumeManagerImpl.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,11 @@ public void run(final FlowTrigger trigger, Map data) {
324324
amsg.setPurpose(PrimaryStorageAllocationPurpose.CreateDataVolume.toString());
325325
amsg.setRequiredPrimaryStorageUuid(msg.getPrimaryStorageUuid());
326326
amsg.setRequiredHostUuid(msg.getHostUuid());
327-
amsg.setSystemTags(msg.getSystemTags());
327+
if (msg.getApiMsg() != null) {
328+
amsg.setSystemTags(msg.getApiMsg().getSystemTags());
329+
} else {
330+
amsg.setSystemTags(msg.getSystemTags());
331+
}
328332

329333
if (vvo.isShareable()) {
330334
amsg.setPossiblePrimaryStorageTypes(PrimaryStorageType.getSupportSharedVolumePSTypeNames());

0 commit comments

Comments
 (0)