Skip to content

Commit 5444261

Browse files
test: fix several simulator CI failures (#10890)
* test: fix several simulator CI failures * Inject dataStoreProviderManager
1 parent 538e35f commit 5444261

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,10 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
413413
ResourceCleanupService resourceCleanupService;
414414
@Inject
415415
VmWorkJobDao vmWorkJobDao;
416+
@Inject
417+
DataStoreProviderManager dataStoreProviderManager;
416418

417419
private SingleCache<List<Long>> vmIdsInProgressCache;
418-
DataStoreProviderManager dataStoreProviderManager;
419420

420421
VmWorkJobHandlerProxy _jobHandlerProxy = new VmWorkJobHandlerProxy(this);
421422

@@ -1230,9 +1231,11 @@ public void orchestrateStart(final String vmUuid, final Map<VirtualMachineProfil
12301231
}
12311232
}
12321233
DataStoreProvider storeProvider = dataStoreProviderManager.getDataStoreProvider(pool.getStorageProviderName());
1233-
DataStoreDriver storeDriver = storeProvider.getDataStoreDriver();
1234-
if (storeDriver instanceof PrimaryDataStoreDriver) {
1235-
((PrimaryDataStoreDriver)storeDriver).detachVolumeFromAllStorageNodes(vol);
1234+
if (storeProvider != null) {
1235+
DataStoreDriver storeDriver = storeProvider.getDataStoreDriver();
1236+
if (storeDriver instanceof PrimaryDataStoreDriver) {
1237+
((PrimaryDataStoreDriver)storeDriver).detachVolumeFromAllStorageNodes(vol);
1238+
}
12361239
}
12371240
}
12381241
}

0 commit comments

Comments
 (0)