CLOUDSTACK-2051 - The previous patch ensures that holes in deleting storage

Marcus Sorensen · Marcus Sorensen · commit 2057221f4f1f · 2013-04-16T22:18:38.000-06:00
pools the proper way won't cause problems for KVM HA Monitor, this patch closes
holes. Call the KVMStoragePool deleteStoragePool that properly removes it from
the KVMHA hashmap, instead of the pools direct delete() call.

Signed-off-by: Marcus Sorensen &lt;marcus@betterservers.com&gt; 1366172318 -0600
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -1270,7 +1270,7 @@ private CopyVolumeAnswer execute(CopyVolumeCommand cmd) {
                 secondaryStoragePool = _storagePoolMgr.getStoragePoolByURI(
                         secondaryStorageUrl);
                 secondaryStoragePool.createFolder(volumeDestPath);
-                secondaryStoragePool.delete();
+                _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid());
                 secondaryStoragePool = _storagePoolMgr.getStoragePoolByURI(
                         secondaryStorageUrl
                         + volumeDestPath);
@@ -1292,7 +1292,7 @@ private CopyVolumeAnswer execute(CopyVolumeCommand cmd) {
             return new CopyVolumeAnswer(cmd, false, e.toString(), null, null);
         } finally {
             if (secondaryStoragePool != null) {
-                secondaryStoragePool.delete();
+                _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid());
             }
         }
     }
@@ -1415,7 +1415,7 @@ protected KVMPhysicalDisk templateToPrimaryDownload(String templateUrl, KVMStora
             return null;
         } finally {
             if (secondaryPool != null) {
-                secondaryPool.delete();
+                _storagePoolMgr.deleteStoragePool(secondaryPool.getType(),secondaryPool.getUuid());
             }
         }
     }
@@ -2008,7 +2008,7 @@ protected BackupSnapshotAnswer execute(final BackupSnapshotCommand cmd) {
                     true);
         } finally {
             if (secondaryStoragePool != null) {
-                secondaryStoragePool.delete();
+                _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid());
             }
         }
         return new BackupSnapshotAnswer(cmd, true, null, snapshotRelPath
@@ -2040,7 +2040,7 @@ protected DeleteSnapshotBackupAnswer execute(
             return new DeleteSnapshotBackupAnswer(cmd, false, e.toString());
         } finally {
             if (secondaryStoragePool != null) {
-                secondaryStoragePool.delete();
+                _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid());
             }
         }
         return new DeleteSnapshotBackupAnswer(cmd, true, null);
@@ -2069,7 +2069,7 @@ protected Answer execute(DeleteSnapshotsDirCommand cmd) {
             return new Answer(cmd, false, e.toString());
         } finally {
             if (secondaryStoragePool != null) {
-                secondaryStoragePool.delete();
+                _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid());
             }
 
         }
@@ -2167,10 +2167,10 @@ protected CreatePrivateTemplateAnswer execute(
             return new CreatePrivateTemplateAnswer(cmd, false, e.getMessage());
         } finally {
             if (secondaryPool != null) {
-                secondaryPool.delete();
+                _storagePoolMgr.deleteStoragePool(secondaryPool.getType(), secondaryPool.getUuid());
             }
             if (snapshotPool != null) {
-                snapshotPool.delete();
+                _storagePoolMgr.deleteStoragePool(snapshotPool.getType(), snapshotPool.getUuid());
             }
         }
     }
@@ -2304,7 +2304,7 @@ protected CreatePrivateTemplateAnswer execute(
             return new CreatePrivateTemplateAnswer(cmd, false, e.toString());
         } finally {
             if (secondaryStorage != null) {
-                secondaryStorage.delete();
+                _storagePoolMgr.deleteStoragePool(secondaryStorage.getType(), secondaryStorage.getUuid());
             }
         }
     }
@@ -2362,7 +2362,7 @@ protected PrimaryStorageDownloadAnswer execute(
             return new PrimaryStorageDownloadAnswer(e.toString());
         } finally {
             if (secondaryPool != null) {
-                secondaryPool.delete();
+                _storagePoolMgr.deleteStoragePool(secondaryPool.getType(),secondaryPool.getUuid());
             }
         }
     }
@@ -3454,7 +3454,7 @@ private boolean cleanupDisk(Connect conn, DiskDef disk) {
             KVMStoragePool pool = _storagePoolMgr.getStoragePool(
                                       StoragePoolType.Filesystem, poolUuid);
             if (pool != null) {
-                pool.delete();
+                _storagePoolMgr.deleteStoragePool(pool.getType(),pool.getUuid());
             }
             return true;
         } catch (CloudRuntimeException e) {

Original file line number	Diff line number	Diff line change
`@@ -1270,7 +1270,7 @@ private CopyVolumeAnswer execute(CopyVolumeCommand cmd) {`
`1270`	`1270`	`secondaryStoragePool = _storagePoolMgr.getStoragePoolByURI(`
`1271`	`1271`	`secondaryStorageUrl);`
`1272`	`1272`	`secondaryStoragePool.createFolder(volumeDestPath);`
`1273`		`- secondaryStoragePool.delete();`
	`1273`	`+ _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid());`
`1274`	`1274`	`secondaryStoragePool = _storagePoolMgr.getStoragePoolByURI(`
`1275`	`1275`	`secondaryStorageUrl`
`1276`	`1276`	`+ volumeDestPath);`
`@@ -1292,7 +1292,7 @@ private CopyVolumeAnswer execute(CopyVolumeCommand cmd) {`
`1292`	`1292`	`return new CopyVolumeAnswer(cmd, false, e.toString(), null, null);`
`1293`	`1293`	`} finally {`
`1294`	`1294`	`if (secondaryStoragePool != null) {`
`1295`		`- secondaryStoragePool.delete();`
	`1295`	`+ _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid());`
`1296`	`1296`	`}`
`1297`	`1297`	`}`
`1298`	`1298`	`}`
`@@ -1415,7 +1415,7 @@ protected KVMPhysicalDisk templateToPrimaryDownload(String templateUrl, KVMStora`
`1415`	`1415`	`return null;`
`1416`	`1416`	`} finally {`
`1417`	`1417`	`if (secondaryPool != null) {`
`1418`		`- secondaryPool.delete();`
	`1418`	`+ _storagePoolMgr.deleteStoragePool(secondaryPool.getType(),secondaryPool.getUuid());`
`1419`	`1419`	`}`
`1420`	`1420`	`}`
`1421`	`1421`	`}`
`@@ -2008,7 +2008,7 @@ protected BackupSnapshotAnswer execute(final BackupSnapshotCommand cmd) {`
`2008`	`2008`	`true);`
`2009`	`2009`	`} finally {`
`2010`	`2010`	`if (secondaryStoragePool != null) {`
`2011`		`- secondaryStoragePool.delete();`
	`2011`	`+ _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid());`
`2012`	`2012`	`}`
`2013`	`2013`	`}`
`2014`	`2014`	`return new BackupSnapshotAnswer(cmd, true, null, snapshotRelPath`
`@@ -2040,7 +2040,7 @@ protected DeleteSnapshotBackupAnswer execute(`
`2040`	`2040`	`return new DeleteSnapshotBackupAnswer(cmd, false, e.toString());`
`2041`	`2041`	`} finally {`
`2042`	`2042`	`if (secondaryStoragePool != null) {`
`2043`		`- secondaryStoragePool.delete();`
	`2043`	`+ _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid());`
`2044`	`2044`	`}`
`2045`	`2045`	`}`
`2046`	`2046`	`return new DeleteSnapshotBackupAnswer(cmd, true, null);`
`@@ -2069,7 +2069,7 @@ protected Answer execute(DeleteSnapshotsDirCommand cmd) {`
`2069`	`2069`	`return new Answer(cmd, false, e.toString());`
`2070`	`2070`	`} finally {`
`2071`	`2071`	`if (secondaryStoragePool != null) {`
`2072`		`- secondaryStoragePool.delete();`
	`2072`	`+ _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid());`
`2073`	`2073`	`}`
`2074`	`2074`
`2075`	`2075`	`}`
`@@ -2167,10 +2167,10 @@ protected CreatePrivateTemplateAnswer execute(`
`2167`	`2167`	`return new CreatePrivateTemplateAnswer(cmd, false, e.getMessage());`
`2168`	`2168`	`} finally {`
`2169`	`2169`	`if (secondaryPool != null) {`
`2170`		`- secondaryPool.delete();`
	`2170`	`+ _storagePoolMgr.deleteStoragePool(secondaryPool.getType(), secondaryPool.getUuid());`
`2171`	`2171`	`}`
`2172`	`2172`	`if (snapshotPool != null) {`
`2173`		`- snapshotPool.delete();`
	`2173`	`+ _storagePoolMgr.deleteStoragePool(snapshotPool.getType(), snapshotPool.getUuid());`
`2174`	`2174`	`}`
`2175`	`2175`	`}`
`2176`	`2176`	`}`
`@@ -2304,7 +2304,7 @@ protected CreatePrivateTemplateAnswer execute(`
`2304`	`2304`	`return new CreatePrivateTemplateAnswer(cmd, false, e.toString());`
`2305`	`2305`	`} finally {`
`2306`	`2306`	`if (secondaryStorage != null) {`
`2307`		`- secondaryStorage.delete();`
	`2307`	`+ _storagePoolMgr.deleteStoragePool(secondaryStorage.getType(), secondaryStorage.getUuid());`
`2308`	`2308`	`}`
`2309`	`2309`	`}`
`2310`	`2310`	`}`
`@@ -2362,7 +2362,7 @@ protected PrimaryStorageDownloadAnswer execute(`
`2362`	`2362`	`return new PrimaryStorageDownloadAnswer(e.toString());`
`2363`	`2363`	`} finally {`
`2364`	`2364`	`if (secondaryPool != null) {`
`2365`		`- secondaryPool.delete();`
	`2365`	`+ _storagePoolMgr.deleteStoragePool(secondaryPool.getType(),secondaryPool.getUuid());`
`2366`	`2366`	`}`
`2367`	`2367`	`}`
`2368`	`2368`	`}`
`@@ -3454,7 +3454,7 @@ private boolean cleanupDisk(Connect conn, DiskDef disk) {`
`3454`	`3454`	`KVMStoragePool pool = _storagePoolMgr.getStoragePool(`
`3455`	`3455`	`StoragePoolType.Filesystem, poolUuid);`
`3456`	`3456`	`if (pool != null) {`
`3457`		`- pool.delete();`
	`3457`	`+ _storagePoolMgr.deleteStoragePool(pool.getType(),pool.getUuid());`
`3458`	`3458`	`}`
`3459`	`3459`	`return true;`
`3460`	`3460`	`} catch (CloudRuntimeException e) {`