test: fix several simulator CI failures (#10890)

* test: fix several simulator CI failures

* Inject dataStoreProviderManager
This commit is contained in:
Wei Zhou 2025-05-19 18:33:14 +02:00 committed by GitHub
parent 538e35f8ad
commit 5444261902
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -413,9 +413,10 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
ResourceCleanupService resourceCleanupService;
@Inject
VmWorkJobDao vmWorkJobDao;
@Inject
DataStoreProviderManager dataStoreProviderManager;
private SingleCache<List<Long>> vmIdsInProgressCache;
DataStoreProviderManager dataStoreProviderManager;
VmWorkJobHandlerProxy _jobHandlerProxy = new VmWorkJobHandlerProxy(this);
@ -1230,12 +1231,14 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
}
}
DataStoreProvider storeProvider = dataStoreProviderManager.getDataStoreProvider(pool.getStorageProviderName());
if (storeProvider != null) {
DataStoreDriver storeDriver = storeProvider.getDataStoreDriver();
if (storeDriver instanceof PrimaryDataStoreDriver) {
((PrimaryDataStoreDriver)storeDriver).detachVolumeFromAllStorageNodes(vol);
}
}
}
}
final VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vm, template, offering, owner, params);
logBootModeParameters(params);