CLVM: move sanlock HA checker and lease reader to kvm.storage.clvm package, rename heartbeat check

Author: Pearl1594

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

@@ -44,7 +44,7 @@ public Boolean hasHeartBeat() {
                 storagePools.stream().map(pool -> pool.getPoolUUID()).collect(Collectors.joining(", ")));
         logger.debug("Checking heart beat with KVMHAChecker for {}", hostAndPools);
 
-        boolean heartBeatCheckResult = checkPoolsHeartBeat();
+        boolean heartBeatCheckResult = doesAnyPoolHasHeartBeat();
 
         if (!heartBeatCheckResult) {
             logger.warn("All checks with KVMHAChecker for {} considered it as dead. It may cause a shutdown of the host.", hostAndPools);
@@ -57,7 +57,7 @@ public Boolean hasHeartBeat() {
      * With reportIfHeartBeatFailedForOneStoragePool the host is dead as soon as one pool has no heart beat,
      * otherwise it is dead only when none of the pools has one.
      */
-    private boolean checkPoolsHeartBeat() {
+    private boolean doesAnyPoolHasHeartBeat() {
         boolean anyPoolHasHeartBeat = false;
         for (HAStoragePool pool : storagePools) {
             boolean poolHasHeartBeat = pool.getPool().hasHeartBeat(pool, host);

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

@@ -230,7 +230,7 @@
 import com.cloud.hypervisor.kvm.resource.rolling.maintenance.RollingMaintenanceServiceExecutor;
 import com.cloud.hypervisor.kvm.resource.wrapper.LibvirtRequestWrapper;
 import com.cloud.hypervisor.kvm.resource.wrapper.LibvirtUtilitiesHelper;
-import com.cloud.hypervisor.kvm.storage.ClvmSanlockHaChecker;
+import com.cloud.hypervisor.kvm.storage.clvm.ClvmSanlockHaChecker;
 import com.cloud.hypervisor.kvm.storage.IscsiStorageCleanupMonitor;
 import com.cloud.hypervisor.kvm.storage.KVMPhysicalDisk;
 import com.cloud.hypervisor.kvm.storage.KVMStoragePool;

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

@@ -20,7 +20,7 @@
 import java.io.File;
 
 import com.cloud.agent.api.Answer;
-import com.cloud.hypervisor.kvm.storage.ClvmSanlockLeaseReader;
+import com.cloud.hypervisor.kvm.storage.clvm.ClvmSanlockLeaseReader;
 import com.cloud.utils.exception.CloudRuntimeException;
 import org.apache.cloudstack.storage.clvm.command.ClvmLockTransferAnswer.LeaseMode;
 import org.apache.cloudstack.storage.clvm.command.ClvmLockTransferCommand;

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

@@ -34,6 +34,7 @@
 import com.cloud.agent.properties.AgentPropertiesFileHandler;
 import com.cloud.ha.HighAvailabilityManager;
 import com.cloud.hypervisor.kvm.resource.KVMHABase.HAStoragePool;
+import com.cloud.hypervisor.kvm.storage.clvm.ClvmSanlockHaChecker;
 import com.cloud.storage.Storage;
 import com.cloud.storage.Storage.StoragePoolType;
 import com.cloud.storage.clvm.ClvmPoolManager;

…or/kvm/storage/ClvmSanlockHaChecker.java …m/storage/clvm/ClvmSanlockHaChecker.javaplugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ClvmSanlockHaChecker.java renamed to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/clvm/ClvmSanlockHaChecker.java plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ClvmSanlockHaChecker.java renamed to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/clvm/ClvmSanlockHaChecker.java

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloud.hypervisor.kvm.storage;
+package com.cloud.hypervisor.kvm.storage.clvm;
 
 import java.io.File;
 import java.util.regex.Matcher;

…/kvm/storage/ClvmSanlockLeaseReader.java …storage/clvm/ClvmSanlockLeaseReader.javaplugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ClvmSanlockLeaseReader.java renamed to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/clvm/ClvmSanlockLeaseReader.java plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/ClvmSanlockLeaseReader.java renamed to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/clvm/ClvmSanlockLeaseReader.java

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloud.hypervisor.kvm.storage;
+package com.cloud.hypervisor.kvm.storage.clvm;
 
 import java.util.ArrayList;
 import java.util.List;

…vm/storage/ClvmSanlockHaCheckerTest.java …orage/clvm/ClvmSanlockHaCheckerTest.javaplugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ClvmSanlockHaCheckerTest.java renamed to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/clvm/ClvmSanlockHaCheckerTest.java plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ClvmSanlockHaCheckerTest.java renamed to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/clvm/ClvmSanlockHaCheckerTest.java

@@ -16,7 +16,7 @@
 // under the License.
 
 
-package com.cloud.hypervisor.kvm.storage;
+package com.cloud.hypervisor.kvm.storage.clvm;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

…/storage/ClvmSanlockLeaseReaderTest.java …age/clvm/ClvmSanlockLeaseReaderTest.javaplugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ClvmSanlockLeaseReaderTest.java renamed to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/clvm/ClvmSanlockLeaseReaderTest.java plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ClvmSanlockLeaseReaderTest.java renamed to plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/clvm/ClvmSanlockLeaseReaderTest.java

@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloud.hypervisor.kvm.storage;
+package com.cloud.hypervisor.kvm.storage.clvm;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;