address comments

Author: slavkap

plugins/hypervisors/kvm/src/main/java/com/cloud/ha/KVMInvestigator.java

@@ -83,7 +83,6 @@ public Status isAgentAlive(Host agent) {
             return haManager.getHostStatus(agent);
         }
 
-        //TODO: check storage for HA support
         List<StoragePoolVO> clusterPools = _storagePoolDao.listPoolsByCluster(agent.getClusterId());
         boolean storageSupportHA = storageSupportHa(clusterPools);
         if (!storageSupportHA) {

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java

@@ -89,65 +89,71 @@ protected void runHeartBeat() {
             Set<String> removedPools = new HashSet<>();
             for (String uuid : storagePool.keySet()) {
                 HAStoragePool primaryStoragePool = storagePool.get(uuid);
-                StoragePool storage;
                 if (primaryStoragePool.getPool().getType() == StoragePoolType.NetworkFilesystem) {
-                    try {
-                        Connect conn = LibvirtConnection.getConnection();
-                        storage = conn.storagePoolLookupByUUIDString(uuid);
-                        if (storage == null || storage.getInfo().state != StoragePoolState.VIR_STORAGE_POOL_RUNNING) {
-                            if (storage == null) {
-                                s_logger.debug(String.format("Libvirt storage pool [%s] not found, removing from HA list.", uuid));
-                            } else {
-                                s_logger.debug(String.format("Libvirt storage pool [%s] found, but not running, removing from HA list.", uuid));
-                            }
-
-                            removedPools.add(uuid);
-                            continue;
-                        }
-
-                        s_logger.debug(String.format("Found NFS storage pool [%s] in libvirt, continuing.", uuid));
-
-                    } catch (LibvirtException e) {
-                        s_logger.debug(String.format("Failed to lookup libvirt storage pool [%s].", uuid), e);
-
-                        if (e.toString().contains("pool not found")) {
-                            s_logger.debug(String.format("Removing pool [%s] from HA monitor since it was deleted.", uuid));
-                            removedPools.add(uuid);
-                            continue;
-                        }
+                    checkForNotExistingPools(removedPools, uuid);
+                    if (removedPools.contains(uuid)) {
+                        continue;
                     }
                 }
-
                 String result = null;
-                for (int i = 1; i <= _heartBeatUpdateMaxTries; i++) {
-                    result = primaryStoragePool.getPool().createHeartBeatCommand(primaryStoragePool, hostPrivateIp, true);
-
-                    if (result != null) {
-                        s_logger.warn(String.format("Write heartbeat for pool [%s] failed: %s; try: %s of %s.", uuid, result, i, _heartBeatUpdateMaxTries));
-                        try {
-                            Thread.sleep(_heartBeatUpdateRetrySleep);
-                        } catch (InterruptedException e) {
-                            s_logger.debug("[IGNORED] Interrupted between heartbeat retries.", e);
-                        }
-                    } else {
-                        break;
-                    }
-
-                }
+                result = executePoolHeartBeatCommand(uuid, primaryStoragePool, result);
 
                 if (result != null && rebootHostAndAlertManagementOnHeartbeatTimeout) {
                     s_logger.warn(String.format("Write heartbeat for pool [%s] failed: %s; stopping cloudstack-agent.", uuid, result));
                     primaryStoragePool.getPool().createHeartBeatCommand(primaryStoragePool, null, false);;
                 }
             }
-
             if (!removedPools.isEmpty()) {
                 for (String uuid : removedPools) {
                     removeStoragePool(uuid);
                 }
             }
         }
+    }
 
+    private String executePoolHeartBeatCommand(String uuid, HAStoragePool primaryStoragePool, String result) {
+        for (int i = 1; i <= _heartBeatUpdateMaxTries; i++) {
+            result = primaryStoragePool.getPool().createHeartBeatCommand(primaryStoragePool, hostPrivateIp, true);
+
+            if (result != null) {
+                s_logger.warn(String.format("Write heartbeat for pool [%s] failed: %s; try: %s of %s.", uuid, result, i, _heartBeatUpdateMaxTries));
+                try {
+                    Thread.sleep(_heartBeatUpdateRetrySleep);
+                } catch (InterruptedException e) {
+                    s_logger.debug("[IGNORED] Interrupted between heartbeat retries.", e);
+                }
+            } else {
+                break;
+            }
+
+        }
+        return result;
+    }
+
+    private void checkForNotExistingPools(Set<String> removedPools, String uuid) {
+        try {
+            Connect conn = LibvirtConnection.getConnection();
+            StoragePool storage = conn.storagePoolLookupByUUIDString(uuid);
+            if (storage == null || storage.getInfo().state != StoragePoolState.VIR_STORAGE_POOL_RUNNING) {
+                if (storage == null) {
+                    s_logger.debug(String.format("Libvirt storage pool [%s] not found, removing from HA list.", uuid));
+                } else {
+                    s_logger.debug(String.format("Libvirt storage pool [%s] found, but not running, removing from HA list.", uuid));
+                }
+
+                removedPools.add(uuid);
+            }
+
+            s_logger.debug(String.format("Found NFS storage pool [%s] in libvirt, continuing.", uuid));
+
+        } catch (LibvirtException e) {
+            s_logger.debug(String.format("Failed to lookup libvirt storage pool [%s].", uuid), e);
+
+            if (e.toString().contains("pool not found")) {
+                s_logger.debug(String.format("Removing pool [%s] from HA monitor since it was deleted.", uuid));
+                removedPools.add(uuid);
+            }
+        }
     }
 
     @Override

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java

@@ -361,7 +361,6 @@ private synchronized KVMStoragePool createStoragePool(String name, String host,
 
         // LibvirtStorageAdaptor-specific statement
         if (pool.isPoolSupportHA() && primaryStorage) {
-            //KVMHABase.HAStoragePool nfspool = new KVMHABase.HAStoragePool(pool.getUuid(), host, path, pool.getLocalPath(), PoolType.PrimaryStorage);
             KVMHABase.HAStoragePool storagePool = new KVMHABase.HAStoragePool(pool, host, path, PoolType.PrimaryStorage);
             _haMonitor.addStoragePool(storagePool);
         }