Ova download fix (#6758)

Author: DaanHoogland

core/src/main/java/com/cloud/agent/api/storage/CreateDatadiskTemplateCommand.java

@@ -18,6 +18,8 @@
 
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.to.DataTO;
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 public final class CreateDatadiskTemplateCommand extends Command {
     private DataTO dataDiskTemplate;
@@ -68,4 +70,8 @@ public void setDiskId(String diskId) {
         this.diskId = diskId;
     }
 
+    public String stringRepresentation() {
+        return ReflectionToStringBuilder.toString(this, ToStringStyle.SIMPLE_STYLE);
+    }
+
 }

engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java

@@ -156,8 +156,9 @@ public List<GuestOSHypervisorVO> listByOsNameAndHypervisorMinimumVersion(String
         final QueryBuilder<GuestOSHypervisorVO> sc = QueryBuilder.create(GuestOSHypervisorVO.class);
         sc.and(sc.entity().getGuestOsName(), SearchCriteria.Op.EQ, guestOsName);
         sc.and(sc.entity().getHypervisorType(), SearchCriteria.Op.EQ, hypervisorType);
-        sc.and(sc.entity().getHypervisorVersion(), SearchCriteria.Op.GTEQ, minHypervisorVersion);
-        sc.and(sc.entity().getHypervisorVersion(), SearchCriteria.Op.NEQ, "default");
+        sc.and().op(sc.entity().getHypervisorVersion(), SearchCriteria.Op.GTEQ, minHypervisorVersion);
+        sc.or(sc.entity().getHypervisorVersion(), SearchCriteria.Op.NEQ, "default");
+        sc.cp();
         return sc.list();
     }
 

engine/storage/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelperImpl.java

@@ -169,6 +169,10 @@ private Long retrieveTemplateGuestOsIdFromGuestOsInfo(long templateId, String gu
                 hypervisor.toString(), minimumHypervisorVersion);
 
         if (CollectionUtils.isNotEmpty(guestOsMappings)) {
+            if (LOGGER.isDebugEnabled()) {
+                String msg = String.format("number of hypervisor mappings for guest os \"%s\" is: %d", guestOsType, guestOsMappings.size());
+                LOGGER.debug(msg);
+            }
             Long guestOsId = null;
             if (guestOsMappings.size() == 1) {
                 GuestOSHypervisorVO mapping = guestOsMappings.get(0);
@@ -190,7 +194,7 @@ private Long retrieveTemplateGuestOsIdFromGuestOsInfo(long templateId, String gu
             }
             return guestOsId;
         } else {
-            throw new CloudRuntimeException("Did not find a guest OS with type " + guestOsType);
+            throw new CloudRuntimeException(String.format("Did not find a guest OS (%s) with type \"%s\" and minimal hypervisor hardware version %s.", guestOsDescription, guestOsType, minimumHardwareVersion));
         }
     }
 

services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java

@@ -23,7 +23,6 @@
 import static com.cloud.network.NetworkModel.USERDATA_DIR;
 import static com.cloud.network.NetworkModel.USERDATA_FILE;
 import static com.cloud.utils.storage.S3.S3Utils.putFile;
-import static java.lang.String.format;
 import static java.util.Arrays.asList;
 
 import java.io.BufferedReader;
@@ -473,6 +472,9 @@ public Answer execute(CreateDatadiskTemplateCommand cmd) {
 
             long templateId = dataDiskTemplate.getId();
             String templateUniqueName = dataDiskTemplate.getUniqueName();
+            if (s_logger.isDebugEnabled()) {
+                s_logger.debug(String.format("no cmd? %s", cmd.stringRepresentation()));
+            }
             String origDisk = cmd.getPath();
             long virtualSize = dataDiskTemplate.getSize();
             String diskName = origDisk.substring((origDisk.lastIndexOf(File.separator)) + 1);
@@ -802,7 +804,7 @@ protected Answer copyFromS3ToNfs(CopyCommand cmd, DataTO srcData, S3TO s3, DataT
             return postProcessing(destFile, downloadPath, destPath, srcData, destData);
         } catch (Exception e) {
 
-            final String errMsg = format("Failed to download" + "due to $1%s", e.getMessage());
+            final String errMsg = String.format("Failed to download" + "due to $1%s", e.getMessage());
             s_logger.error(errMsg, e);
             return new CopyCmdAnswer(errMsg);
         }