gitqueue
diff --git a/‎plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java‎
Lines changed: 17 additions & 8 deletions b/‎plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java‎
Lines changed: 17 additions & 8 deletions
@@ -17,8 +17,10 @@
 package com.cloud.hypervisor.kvm.resource;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.log4j.Logger;
@@ -39,24 +41,24 @@ public class KVMHAMonitor extends KVMHABase implements Runnable {
 
     public KVMHAMonitor(NfsStoragePool pool, String host, String scriptPath) {
         if (pool != null) {
-            this._storagePool.put(pool._poolUUID, pool);
+            _storagePool.put(pool._poolUUID, pool);
         }
-        this._hostIP = host;
+        _hostIP = host;
         KVMHABase.s_heartBeatPath = scriptPath;
     }
 
     public void addStoragePool(NfsStoragePool pool) {
         synchronized (_storagePool) {
-            this._storagePool.put(pool._poolUUID, pool);
+            _storagePool.put(pool._poolUUID, pool);
         }
     }
 
     public void removeStoragePool(String uuid) {
         synchronized (_storagePool) {
-            NfsStoragePool pool = this._storagePool.get(uuid);
+            NfsStoragePool pool = _storagePool.get(uuid);
             if (pool != null) {
                 Script.runSimpleBashScript("umount " + pool._mountDestPath);
-                this._storagePool.remove(uuid);
+                _storagePool.remove(uuid);
             }
         }
     }
@@ -72,6 +74,7 @@ private class Monitor extends ManagedContextRunnable {
         @Override
         protected void runInContext() {
             synchronized (_storagePool) {
+                Set<String> removedPools = new HashSet<String>();
                 for (String uuid : _storagePool.keySet()) {
                     NfsStoragePool primaryStoragePool = _storagePool.get(uuid);
 
@@ -84,13 +87,13 @@ protected void runInContext() {
                         storage = conn.storagePoolLookupByUUIDString(uuid);
                         if (storage == null) {
                             s_logger.debug("Libvirt storage pool " + uuid + " not found, removing from HA list");
-                            removeStoragePool(uuid);
+                            removedPools.add(uuid);
                             continue;
 
                         } else if (storage.getInfo().state != StoragePoolState.VIR_STORAGE_POOL_RUNNING) {
                             s_logger.debug("Libvirt storage pool " + uuid + " found, but not running, removing from HA list");
 
-                            removeStoragePool(uuid);
+                            removedPools.add(uuid);
                             continue;
                         }
                         s_logger.debug("Found NFS storage pool " + uuid + " in libvirt, continuing");
@@ -102,7 +105,7 @@ protected void runInContext() {
                         // connection fails
                         if (e.toString().contains("pool not found")) {
                             s_logger.debug("removing pool from HA monitor since it was deleted");
-                            removeStoragePool(uuid);
+                            removedPools.add(uuid);
                             continue;
                         }
                     }
@@ -132,6 +135,12 @@ protected void runInContext() {
                         result = cmd.execute();
                     }
                 }
+
+                if (!removedPools.isEmpty()) {
+                    for (String uuid : removedPools) {
+                        removeStoragePool(uuid);
+                    }
+                }
             }
 
         }
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,10 @@`
`17`	`17`	`package com.cloud.hypervisor.kvm.resource;`
`18`	`18`
`19`	`19`	`import java.util.ArrayList;`
	`20`	`+import java.util.HashSet;`
`20`	`21`	`import java.util.List;`
`21`	`22`	`import java.util.Map;`
	`23`	`+import java.util.Set;`
`22`	`24`	`import java.util.concurrent.ConcurrentHashMap;`
`23`	`25`
`24`	`26`	`import org.apache.log4j.Logger;`
`@@ -39,24 +41,24 @@ public class KVMHAMonitor extends KVMHABase implements Runnable {`
`39`	`41`
`40`	`42`	`public KVMHAMonitor(NfsStoragePool pool, String host, String scriptPath) {`
`41`	`43`	`if (pool != null) {`
`42`		`- this._storagePool.put(pool._poolUUID, pool);`
	`44`	`+ _storagePool.put(pool._poolUUID, pool);`
`43`	`45`	`}`
`44`		`- this._hostIP = host;`
	`46`	`+ _hostIP = host;`
`45`	`47`	`KVMHABase.s_heartBeatPath = scriptPath;`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`public void addStoragePool(NfsStoragePool pool) {`
`49`	`51`	`synchronized (_storagePool) {`
`50`		`- this._storagePool.put(pool._poolUUID, pool);`
	`52`	`+ _storagePool.put(pool._poolUUID, pool);`
`51`	`53`	`}`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`public void removeStoragePool(String uuid) {`
`55`	`57`	`synchronized (_storagePool) {`
`56`		`- NfsStoragePool pool = this._storagePool.get(uuid);`
	`58`	`+ NfsStoragePool pool = _storagePool.get(uuid);`
`57`	`59`	`if (pool != null) {`
`58`	`60`	`Script.runSimpleBashScript("umount " + pool._mountDestPath);`
`59`		`- this._storagePool.remove(uuid);`
	`61`	`+ _storagePool.remove(uuid);`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`	`}`
`@@ -72,6 +74,7 @@ private class Monitor extends ManagedContextRunnable {`
`72`	`74`	`@Override`
`73`	`75`	`protected void runInContext() {`
`74`	`76`	`synchronized (_storagePool) {`
	`77`	`+ Set<String> removedPools = new HashSet<String>();`
`75`	`78`	`for (String uuid : _storagePool.keySet()) {`
`76`	`79`	`NfsStoragePool primaryStoragePool = _storagePool.get(uuid);`
`77`	`80`
`@@ -84,13 +87,13 @@ protected void runInContext() {`
`84`	`87`	`storage = conn.storagePoolLookupByUUIDString(uuid);`
`85`	`88`	`if (storage == null) {`
`86`	`89`	`s_logger.debug("Libvirt storage pool " + uuid + " not found, removing from HA list");`
`87`		`- removeStoragePool(uuid);`
	`90`	`+ removedPools.add(uuid);`
`88`	`91`	`continue;`
`89`	`92`
`90`	`93`	`} else if (storage.getInfo().state != StoragePoolState.VIR_STORAGE_POOL_RUNNING) {`
`91`	`94`	`s_logger.debug("Libvirt storage pool " + uuid + " found, but not running, removing from HA list");`
`92`	`95`
`93`		`- removeStoragePool(uuid);`
	`96`	`+ removedPools.add(uuid);`
`94`	`97`	`continue;`
`95`	`98`	`}`
`96`	`99`	`s_logger.debug("Found NFS storage pool " + uuid + " in libvirt, continuing");`
`@@ -102,7 +105,7 @@ protected void runInContext() {`
`102`	`105`	`// connection fails`
`103`	`106`	`if (e.toString().contains("pool not found")) {`
`104`	`107`	`s_logger.debug("removing pool from HA monitor since it was deleted");`
`105`		`- removeStoragePool(uuid);`
	`108`	`+ removedPools.add(uuid);`
`106`	`109`	`continue;`
`107`	`110`	`}`
`108`	`111`	`}`
`@@ -132,6 +135,12 @@ protected void runInContext() {`
`132`	`135`	`result = cmd.execute();`
`133`	`136`	`}`
`134`	`137`	`}`
	`138`	`+`
	`139`	`+ if (!removedPools.isEmpty()) {`
	`140`	`+ for (String uuid : removedPools) {`
	`141`	`+ removeStoragePool(uuid);`
	`142`	`+ }`
	`143`	`+ }`
`135`	`144`	`}`
`136`	`145`
`137`	`146`	`}`