DaanHoogland commented on code in PR #10561:
URL: https://github.com/apache/cloudstack/pull/10561#discussion_r1993549836
##########
plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/LinstorPrimaryDataStoreLifeCycleImpl.java:
##########
@@ -289,6 +296,34 @@ public boolean cancelMaintain(DataStore store) {
@Override
public boolean deleteDataStore(DataStore store) {
+ StoragePool storagePool = (StoragePool)store;
+ StoragePoolVO storagePoolVO =
_primaryDataStoreDao.findById(storagePool.getId());
+ if (storagePoolVO == null) {
+ return false;
+ }
+
+ List<VMTemplateStoragePoolVO> unusedTemplatesInPool =
templateMgr.getUnusedTemplatesInPool(storagePoolVO);
+ for (VMTemplateStoragePoolVO templatePoolVO : unusedTemplatesInPool) {
+ if (templatePoolVO.getDownloadState() ==
VMTemplateStorageResourceAssoc.Status.DOWNLOADED) {
+ templateMgr.evictTemplateFromStoragePool(templatePoolVO);
+ }
+ }
Review Comment:
extra method
##########
plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/LinstorPrimaryDataStoreLifeCycleImpl.java:
##########
@@ -289,6 +296,34 @@ public boolean cancelMaintain(DataStore store) {
@Override
public boolean deleteDataStore(DataStore store) {
+ StoragePool storagePool = (StoragePool)store;
+ StoragePoolVO storagePoolVO =
_primaryDataStoreDao.findById(storagePool.getId());
+ if (storagePoolVO == null) {
+ return false;
+ }
+
+ List<VMTemplateStoragePoolVO> unusedTemplatesInPool =
templateMgr.getUnusedTemplatesInPool(storagePoolVO);
+ for (VMTemplateStoragePoolVO templatePoolVO : unusedTemplatesInPool) {
+ if (templatePoolVO.getDownloadState() ==
VMTemplateStorageResourceAssoc.Status.DOWNLOADED) {
+ templateMgr.evictTemplateFromStoragePool(templatePoolVO);
+ }
+ }
+
+ List<StoragePoolHostVO> poolHostVOs =
storagePoolHostDao.listByPoolId(store.getId());
+ for (StoragePoolHostVO poolHostVO : poolHostVOs) {
+ DeleteStoragePoolCommand deleteStoragePoolCommand = new
DeleteStoragePoolCommand(storagePool);
+ final Answer answer = agentMgr.easySend(poolHostVO.getHostId(),
deleteStoragePoolCommand);
+ if (answer != null && answer.getResult()) {
+ s_logger.info("Successfully deleted storage pool: " +
storagePool.getId() + " from host: " + poolHostVO.getHostId());
+ } else {
+ if (answer != null) {
+ s_logger.error("Failed to delete storage pool: " +
storagePool.getId() + " from host: " + poolHostVO.getHostId() + " , result: " +
answer.getResult());
+ } else {
+ s_logger.error("Failed to delete storage pool: " +
storagePool.getId() + " from host: " + poolHostVO.getHostId());
+ }
+ }
+ }
Review Comment:
extra method?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
