increase lv cmd timeouts to consider cluster load

Author: Pearl Dsilva

core/src/main/java/org/apache/cloudstack/storage/clvm/command/ClvmLockTransferCommand.java

@@ -77,7 +77,7 @@ public ClvmLockTransferCommand(Operation operation, String lvPath, String volume
         this.operation = operation;
         this.lvPath = lvPath;
         this.volumeUuid = volumeUuid;
-        setWait(30);
+        setWait(65);
     }
 
     public String getLvPath() {

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

@@ -5760,7 +5760,7 @@ private Answer listLvmVolumes(String localPath, int startIndex, int pageSize) {
             }
         }
 
-        Script lvs = new Script("lvs", 10000, logger);
+        Script lvs = new Script("lvs", 30000, logger);
         lvs.add("--noheadings");
         lvs.add("--nosuffix");
         lvs.add("-o", "lv_name,lv_size");
@@ -7092,7 +7092,7 @@ static boolean checkIfVolumeGroupIsClustered(String vgName) {
 
         try {
             OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
-            Script vgsCmd = new Script("vgs", 10000, LOGGER);
+            Script vgsCmd = new Script("vgs", 30000, LOGGER);
             vgsCmd.add("--noheadings");
             vgsCmd.add("--unbuffered");
             vgsCmd.add("-o");

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

@@ -64,7 +64,7 @@ public Answer execute(ClvmLockTransferCommand cmd, LibvirtComputingResource serv
                     return new ClvmLockTransferAnswer(cmd, false, "Unknown operation: " + operation);
             }
 
-            Script script = new Script("/usr/sbin/lvchange", 30000, logger);
+            Script script = new Script("/usr/sbin/lvchange", 60000, logger);
             script.add(lvchangeOpt);
             script.add(lvPath);
 
@@ -103,7 +103,7 @@ public Answer execute(ClvmLockTransferCommand cmd, LibvirtComputingResource serv
      */
     private Answer handleQueryLockState(ClvmLockTransferCommand cmd, String lvPath, String volumeUuid) {
         try {
-            Script script = new Script("/usr/sbin/lvs", 10000, logger);
+            Script script = new Script("/usr/sbin/lvs", 30000, logger);
             script.add("-o");
             script.add("lv_attr,lv_host");
             script.add("--noheadings");

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

@@ -172,7 +172,7 @@ public KVMPhysicalDisk createPhysicalDisk(String name, KVMStoragePool pool,
     public boolean connectPhysicalDisk(String name, KVMStoragePool pool, Map<String, String> details, boolean isVMMigrate) {
         if (isVMMigrate) {
             logger.info("Activating CLVM/CLVM_NG volume {} in shared mode for VM migration", name);
-            Script activateVol = new Script("lvchange", 10000, logger);
+            Script activateVol = new Script("lvchange", 30000, logger);
             activateVol.add("-asy");
             activateVol.add(pool.getLocalPath() + File.separator + name);
             String result = activateVol.execute();
@@ -266,7 +266,7 @@ private StoragePool createCLVMStoragePool(Connect conn, String uuid, String host
         String volgroupName = path;
         volgroupName = volgroupName.replaceFirst("^/", "");
 
-        Script checkVgExists = new Script("vgs", 10000, logger);
+        Script checkVgExists = new Script("vgs", 30000, logger);
         checkVgExists.add("--noheadings");
         checkVgExists.add("-o", "vg_name");
         checkVgExists.add(volgroupName);
@@ -312,7 +312,7 @@ private void setPoolCapacityFromVgStats(LibvirtStoragePool pool, long[] vgStats,
     }
 
     private long[] getVgStats(String vgName) {
-        Script getVgStats = new Script("vgs", 10000, logger);
+        Script getVgStats = new Script("vgs", 30000, logger);
         getVgStats.add("--noheadings");
         getVgStats.add("--units", "b");
         getVgStats.add("--nosuffix");
@@ -466,7 +466,7 @@ private KVMPhysicalDisk getPhysicalDiskViaDirectBlockDevice(String volumeUuid, K
 
     private void verifyLvExistsInVg(String volumeUuid, String vgName) {
         logger.debug("Checking if volume {} exists in VG {}", volumeUuid, vgName);
-        Script checkLvCmd = new Script("/usr/sbin/lvs", 10000, logger);
+        Script checkLvCmd = new Script("/usr/sbin/lvs", 30000, logger);
         checkLvCmd.add("--noheadings");
         checkLvCmd.add("--unbuffered");
         checkLvCmd.add(vgName + "/" + volumeUuid);
@@ -547,7 +547,7 @@ private void ensureTemplateAccessibility(String volumeUuid, String lvPath, KVMSt
 
     private long getClvmVolumeSize(String lvPath) {
         try {
-            Script lvsCmd = new Script("/usr/sbin/lvs", 10000, logger);
+            Script lvsCmd = new Script("/usr/sbin/lvs", 30000, logger);
             lvsCmd.add("--noheadings");
             lvsCmd.add("--units");
             lvsCmd.add("b");
@@ -666,7 +666,7 @@ private String getClvmBackingFile(KVMPhysicalDisk template, KVMStoragePool destP
      */
     private void ensureTemplateLvInSharedMode(String templatePath, boolean throwOnFailure) {
         try {
-            Script checkLvs = new Script("lvs", Duration.millis(10000), logger);
+            Script checkLvs = new Script("lvs", Duration.millis(30000), logger);
             checkLvs.add("--noheadings");
             checkLvs.add("-o", "lv_attr");
             checkLvs.add(templatePath);
@@ -881,7 +881,7 @@ private KVMPhysicalDisk createClvmNgDiskWithBacking(String volumeUuid, int timeo
     }
 
     private boolean lvExists(String lvPath) {
-        Script checkLv = new Script("lvs", Duration.millis(10000), logger);
+        Script checkLv = new Script("lvs", Duration.millis(30000), logger);
         checkLv.add("--noheadings");
         checkLv.add("--unbuffered");
         checkLv.add(lvPath);
@@ -953,7 +953,7 @@ private boolean cleanupCLVMVolume(String uuid, KVMStoragePool pool) {
             String lvPath = "/dev/" + vgName + "/" + uuid;
             logger.debug("Volume path: {}", lvPath);
 
-            Script checkLvs = new Script("lvs", 10000, logger);
+            Script checkLvs = new Script("lvs", 30000, logger);
             checkLvs.add("--noheadings");
             checkLvs.add("--unbuffered");
             checkLvs.add(lvPath);