This is an automated email from the ASF dual-hosted git repository. shwstppr pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit e720b72e158355dc7551ad0316cee07a564aaa47 Merge: d4b8e2cbe8 a21efe75df Author: Abhishek Kumar <[email protected]> AuthorDate: Wed Aug 31 17:38:30 2022 +0530 Merge remote-tracking branch 'apache/4.17' into main .../cloudstack/storage/to/PrimaryDataStoreTO.java | 7 ++ .../subsystem/api/storage/PrimaryDataStore.java | 4 + .../vmsnapshot/DefaultVMSnapshotStrategy.java | 32 ++++-- .../vmsnapshot/DefaultVMSnapshotStrategyTest.java | 106 ++++++++++++++++++ .../storage/vmsnapshot/VMSnapshotStrategyTest.java | 8 ++ .../storage/datastore/PrimaryDataStoreImpl.java | 12 ++ .../vmware/manager/VmwareHostService.java | 3 + .../vmware/manager/VmwareStorageManagerImpl.java | 111 +++++++++++-------- .../hypervisor/vmware/resource/VmwareResource.java | 5 + .../VmwareSecondaryStorageResourceHandler.java | 15 ++- .../storage/resource/VmwareStorageProcessor.java | 122 ++++++++++----------- 11 files changed, 302 insertions(+), 123 deletions(-) diff --cc engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java index 7f9f2bee99,eba597c3c5..cf0bca9cfe --- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java +++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/PrimaryDataStoreImpl.java @@@ -102,8 -100,9 +103,11 @@@ public class PrimaryDataStoreImpl imple this.pdsv = pdsv; this.driver = driver; this.provider = provider; + this.uuid = pdsv.getUuid(); + this.name = pdsv.getName(); + if (pdsv.getParent() != null && pdsv.getParent() > 0L) { + this.parentStoragePool = dataStoreDao.findById(pdsv.getParent()); + } } public static PrimaryDataStoreImpl createDataStore(StoragePoolVO pdsv, PrimaryDataStoreDriver driver, DataStoreProvider provider) {
