This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 4a06363749 Ova download fix (#6758)
4a06363749 is described below
commit 4a0636374931e4e6b562def76acb9f8673a7f22a
Author: dahn <[email protected]>
AuthorDate: Fri Oct 21 14:31:19 2022 +0200
Ova download fix (#6758)
---
.../com/cloud/agent/api/storage/CreateDatadiskTemplateCommand.java | 6 ++++++
.../main/java/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java | 5 +++--
.../cloudstack/storage/image/deployasis/DeployAsIsHelperImpl.java | 6 +++++-
.../cloudstack/storage/resource/NfsSecondaryStorageResource.java | 6 ++++--
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git
a/core/src/main/java/com/cloud/agent/api/storage/CreateDatadiskTemplateCommand.java
b/core/src/main/java/com/cloud/agent/api/storage/CreateDatadiskTemplateCommand.java
index b87d170fe8..3a694aa1cc 100644
---
a/core/src/main/java/com/cloud/agent/api/storage/CreateDatadiskTemplateCommand.java
+++
b/core/src/main/java/com/cloud/agent/api/storage/CreateDatadiskTemplateCommand.java
@@ -18,6 +18,8 @@ package com.cloud.agent.api.storage;
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 final class CreateDatadiskTemplateCommand extends
Command {
this.diskId = diskId;
}
+ public String stringRepresentation() {
+ return ReflectionToStringBuilder.toString(this,
ToStringStyle.SIMPLE_STYLE);
+ }
+
}
\ No newline at end of file
diff --git
a/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java
b/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java
index 31143dc195..ae3ae9aceb 100644
---
a/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java
+++
b/engine/schema/src/main/java/com/cloud/storage/dao/GuestOSHypervisorDaoImpl.java
@@ -156,8 +156,9 @@ public class GuestOSHypervisorDaoImpl extends
GenericDaoBase<GuestOSHypervisorVO
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();
}
diff --git
a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelperImpl.java
b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelperImpl.java
index 326b6a3fc5..2d0a0f2b32 100644
---
a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelperImpl.java
+++
b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelperImpl.java
@@ -169,6 +169,10 @@ public class DeployAsIsHelperImpl implements
DeployAsIsHelper {
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 @@ public class DeployAsIsHelperImpl implements
DeployAsIsHelper {
}
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));
}
}
diff --git
a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index 231eacc568..249c5bcb56 100644
---
a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++
b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -23,7 +23,6 @@ import static com.cloud.network.NetworkModel.PUBLIC_KEYS_FILE;
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 class NfsSecondaryStorageResource extends
ServerResourceBase implements S
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 @@ public class NfsSecondaryStorageResource extends
ServerResourceBase implements S
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);
}
