update log and timout

Author: Pearl Dsilva

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

@@ -6984,7 +6984,7 @@ static boolean checkIfVolumeGroupIsClustered(String vgName) {
         try {
             // Use vgs with --noheadings and -o attr to get VG attributes
             OutputInterpreter.AllLinesParser parser = new OutputInterpreter.AllLinesParser();
-            Script vgsCmd = new Script("vgs", 5000, LOGGER);
+            Script vgsCmd = new Script("vgs", 10000, LOGGER);
             vgsCmd.add("--noheadings");
             vgsCmd.add("--unbuffered");
             vgsCmd.add("-o");

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

@@ -175,7 +175,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", 5000, logger);
+            Script activateVol = new Script("lvchange", 10000, logger);
             activateVol.add("-asy");
             activateVol.add(pool.getLocalPath() + File.separator + name);
             String result = activateVol.execute();
@@ -269,7 +269,7 @@ private StoragePool createCLVMStoragePool(Connect conn, String uuid, String host
         String volgroupName = path;
         volgroupName = volgroupName.replaceFirst("^/", "");
 
-        Script checkVgExists = new Script("vgs", 5000, logger);
+        Script checkVgExists = new Script("vgs", 10000, logger);
         checkVgExists.add("--noheadings");
         checkVgExists.add("-o", "vg_name");
         checkVgExists.add(volgroupName);
@@ -315,7 +315,7 @@ private void setPoolCapacityFromVgStats(LibvirtStoragePool pool, long[] vgStats,
     }
 
     private long[] getVgStats(String vgName) {
-        Script getVgStats = new Script("vgs", 5000, logger);
+        Script getVgStats = new Script("vgs", 10000, logger);
         getVgStats.add("--noheadings");
         getVgStats.add("--units", "b");
         getVgStats.add("--nosuffix");
@@ -470,7 +470,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", 5000, logger);
+        Script checkLvCmd = new Script("/usr/sbin/lvs", 10000, logger);
         checkLvCmd.add("--noheadings");
         checkLvCmd.add("--unbuffered");
         checkLvCmd.add(vgName + "/" + volumeUuid);
@@ -551,7 +551,7 @@ private void ensureTemplateAccessibility(String volumeUuid, String lvPath, KVMSt
 
     private long getClvmVolumeSize(String lvPath) {
         try {
-            Script lvsCmd = new Script("/usr/sbin/lvs", 5000, logger);
+            Script lvsCmd = new Script("/usr/sbin/lvs", 10000, logger);
             lvsCmd.add("--noheadings");
             lvsCmd.add("--units");
             lvsCmd.add("b");
@@ -670,7 +670,7 @@ private String getClvmBackingFile(KVMPhysicalDisk template, KVMStoragePool destP
      */
     private void ensureTemplateLvInSharedMode(String templatePath, boolean throwOnFailure) {
         try {
-            Script checkLvs = new Script("lvs", Duration.millis(5000), logger);
+            Script checkLvs = new Script("lvs", Duration.millis(10000), logger);
             checkLvs.add("--noheadings");
             checkLvs.add("-o", "lv_attr");
             checkLvs.add(templatePath);
@@ -882,7 +882,7 @@ private KVMPhysicalDisk createClvmNgDiskWithBacking(String volumeUuid, int timeo
     }
 
     private boolean lvExists(String lvPath) {
-        Script checkLv = new Script("lvs", Duration.millis(5000), logger);
+        Script checkLv = new Script("lvs", Duration.millis(10000), logger);
         checkLv.add("--noheadings");
         checkLv.add("--unbuffered");
         checkLv.add(lvPath);
@@ -954,7 +954,7 @@ private boolean cleanupCLVMVolume(String uuid, KVMStoragePool pool) {
             String lvPath = "/dev/" + vgName + "/" + uuid;
             logger.debug("Volume path: {}", lvPath);
 
-            Script checkLvs = new Script("lvs", 5000, logger);
+            Script checkLvs = new Script("lvs", 10000, logger);
             checkLvs.add("--noheadings");
             checkLvs.add("--unbuffered");
             checkLvs.add(lvPath);
@@ -979,7 +979,7 @@ private boolean cleanupCLVMVolume(String uuid, KVMStoragePool pool) {
             }
 
             logger.info("Step 2: Removing volume {}", uuid);
-            Script removeLv = new Script("lvremove", 10000, logger);
+            Script removeLv = new Script("lvremove", 30000, logger);
             removeLv.add("-f");
             removeLv.add(lvPath);
 

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

@@ -1267,7 +1267,7 @@ private boolean deleteClvmSnapshot(String snapshotPath, StoragePoolType poolType
 
             // Use managesnapshot.sh script for deletion (consistent with create/backup)
             // Script handles MD5 transformation and pool-specific commands internally
-            Script deleteCommand = new Script(_manageSnapshotPath, 10000, logger);
+            Script deleteCommand = new Script(_manageSnapshotPath, 30000, logger);
             deleteCommand.add("-d", volumePath);
             deleteCommand.add("-n", snapshotUuid);
 
@@ -1308,7 +1308,11 @@ private void deleteSnapshotOnPrimary(final CopyCommand cmd, final SnapshotObject
                     // Both CLVM and CLVM_NG use the same deletion method via managesnapshot.sh script
                     boolean cleanedUp = deleteClvmSnapshot(snapshotPath, primaryPool.getType(), false);
                     if (!cleanedUp) {
-                        logger.info("No need to delete {} snapshot on primary as it doesn't exist: {}", primaryPool.getType(), snapshotPath);
+                        String[] parsedPath = parseClvmSnapshotPath(snapshotPath, primaryPool.getType());
+                        String snapMd5 = (parsedPath != null) ? computeMd5Hash(parsedPath[2]) : computeMd5Hash(snapshotPath);
+                        logger.warn("Deletion of Snapshot: {} on primary store may have failed as it doesn't exist: {} " +
+                                "(MD5 of snapshot UUID: {} - admins can use this to manually locate and delete the LV via managesnapshot.sh or lvremove)",
+                                primaryPool.getType(), snapshotPath, snapMd5);
                     }
                 } else {
                     Files.deleteIfExists(Paths.get(snapshotPath));