apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ova download fix (#6758)

Browse Source
This commit is contained in:
dahn 2022-10-21 14:31:19 +02:00 committed by GitHub
parent 48ffa5dc0b
commit 4a06363749
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,8 @@ package com.cloud.agent.api.storage;
import com.cloud.agent.api.Command; import com.cloud.agent.api.Command;
import com.cloud.agent.api.to.DataTO; 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 { public final class CreateDatadiskTemplateCommand extends Command {
private DataTO dataDiskTemplate; private DataTO dataDiskTemplate;
@ -68,4 +70,8 @@ public final class CreateDatadiskTemplateCommand extends Command {
this.diskId = diskId; this.diskId = diskId;
} }
public String stringRepresentation() {
return ReflectionToStringBuilder.toString(this, ToStringStyle.SIMPLE_STYLE);
}
} }

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

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

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

@ -169,6 +169,10 @@ public class DeployAsIsHelperImpl implements DeployAsIsHelper {
hypervisor.toString(), minimumHypervisorVersion); hypervisor.toString(), minimumHypervisorVersion);
if (CollectionUtils.isNotEmpty(guestOsMappings)) { 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; Long guestOsId = null;
if (guestOsMappings.size() == 1) { if (guestOsMappings.size() == 1) {
GuestOSHypervisorVO mapping = guestOsMappings.get(0); GuestOSHypervisorVO mapping = guestOsMappings.get(0);
@ -190,7 +194,7 @@ public class DeployAsIsHelperImpl implements DeployAsIsHelper {
} }
return guestOsId; return guestOsId;
} else { } 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));
} }
} }

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

@ -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_DIR;
import static com.cloud.network.NetworkModel.USERDATA_FILE; import static com.cloud.network.NetworkModel.USERDATA_FILE;
import static com.cloud.utils.storage.S3.S3Utils.putFile; import static com.cloud.utils.storage.S3.S3Utils.putFile;
import static java.lang.String.format;
import static java.util.Arrays.asList; import static java.util.Arrays.asList;
import java.io.BufferedReader; import java.io.BufferedReader;
@ -473,6 +472,9 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
long templateId = dataDiskTemplate.getId(); long templateId = dataDiskTemplate.getId();
String templateUniqueName = dataDiskTemplate.getUniqueName(); String templateUniqueName = dataDiskTemplate.getUniqueName();
if (s_logger.isDebugEnabled()) {
s_logger.debug(String.format("no cmd? %s", cmd.stringRepresentation()));
}
String origDisk = cmd.getPath(); String origDisk = cmd.getPath();
long virtualSize = dataDiskTemplate.getSize(); long virtualSize = dataDiskTemplate.getSize();
String diskName = origDisk.substring((origDisk.lastIndexOf(File.separator)) + 1); 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); return postProcessing(destFile, downloadPath, destPath, srcData, destData);
} catch (Exception e) { } 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); s_logger.error(errMsg, e);
return new CopyCmdAnswer(errMsg); return new CopyCmdAnswer(errMsg);
} }