From 14d09f53a449fb3e6250578dd88eadd03504a603 Mon Sep 17 00:00:00 2001 From: Edison Su Date: Mon, 31 Jan 2011 16:37:00 -0500 Subject: [PATCH] fix delete storage pool --- .../agent/resource/computing/LibvirtStorageResource.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtStorageResource.java b/agent/src/com/cloud/agent/resource/computing/LibvirtStorageResource.java index c26a029bbbe..72add3f68d5 100644 --- a/agent/src/com/cloud/agent/resource/computing/LibvirtStorageResource.java +++ b/agent/src/com/cloud/agent/resource/computing/LibvirtStorageResource.java @@ -60,13 +60,14 @@ public class LibvirtStorageResource { public boolean deleteStoragePool(Connect conn, StorageFilerTO spt) throws LibvirtException { StoragePool pool = getStoragePool(conn, spt.getUuid()); + LibvirtStoragePoolDef spd = getStoragePoolDef(conn, pool); synchronized (getStoragePool(pool.getUUIDString())) { pool.destroy(); pool.undefine(); } - LibvirtStoragePoolDef spd = getStoragePoolDef(conn, pool); + if (spd.getPoolType() == poolType.NETFS) { KVMHABase.NfsStoragePool sp = new KVMHABase.NfsStoragePool(spt.getUuid(), @@ -270,6 +271,7 @@ public class LibvirtStorageResource { pool.getHost(), pool.getPath(), pool.getPath()); StoragePool sp = null; try { + s_logger.debug(spd.toString()); addStoragePool(pool.getUuid()); synchronized (getStoragePool(pool.getUuid())) { sp = conn.storagePoolDefineXML(spd.toString(), 0);