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

CLOUDSTACK-4398: get physical size of template if the template is stored in S3

Browse Source
This commit is contained in:
Edison Su 2013-08-19 17:51:06 -07:00
parent c4f41f4a53
commit 45b35aaeef
7 changed files with 106 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/com/cloud/storage/template/IsoProcessor.java
View File

@ -57,6 +57,11 @@ public class IsoProcessor extends AdapterBase implements Processor {
return info;
}
@Override
public Long getVirtualSize(File file) {
return file.length();
}
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_storage = (StorageLayer)params.get(StorageLayer.InstanceConfigKey);

5
core/src/com/cloud/storage/template/Processor.java
View File

@ -20,6 +20,8 @@ import com.cloud.exception.InternalErrorException;
import com.cloud.storage.Storage.ImageFormat;
import com.cloud.utils.component.Adapter;
import java.io.File;
/**
* Generic interface to process different types of image formats
* for templates downloaded and for conversion from one format
@ -45,4 +47,7 @@ public interface Processor extends Adapter {
public String filename;
public boolean isCorrupted;
}
Long getVirtualSize(File file);
}

23
core/src/com/cloud/storage/template/QCOW2Processor.java
View File

@ -82,6 +82,29 @@ public class QCOW2Processor extends AdapterBase implements Processor {
return info;
}
public Long getVirtualSize(File file) {
FileInputStream strm = null;
byte[] b = new byte[8];
try {
strm = new FileInputStream(file);
strm.skip(24);
strm.read(b);
} catch (Exception e) {
s_logger.warn("Unable to read qcow2 file " + file, e);
return null;
} finally {
if (strm != null) {
try {
strm.close();
} catch (IOException e) {
}
}
}
long templateSize = NumbersUtil.bytesToLong(b);
return templateSize;
}
@Override
public boolean configure(String name, Map<String, Object> params)
throws ConfigurationException {

5
core/src/com/cloud/storage/template/RawImageProcessor.java
View File

@ -68,4 +68,9 @@ public class RawImageProcessor extends AdapterBase implements Processor {
return info;
}
@Override
public Long getVirtualSize(File file) {
return file.length();
}
}

28
core/src/com/cloud/storage/template/VhdProcessor.java
View File

@ -25,6 +25,7 @@ import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import com.cloud.utils.exception.CloudRuntimeException;
import org.apache.log4j.Logger;
import com.cloud.exception.InternalErrorException;
@ -100,6 +101,33 @@ public class VhdProcessor extends AdapterBase implements Processor {
return info;
}
@Override
public Long getVirtualSize(File file) {
FileInputStream strm = null;
byte[] currentSize = new byte[8];
byte[] creatorApp = new byte[4];
try {
strm = new FileInputStream(file);
strm.skip(file.length() - vhd_footer_size + vhd_footer_creator_app_offset);
strm.read(creatorApp);
strm.skip(vhd_footer_current_size_offset - vhd_footer_creator_ver_offset);
strm.read(currentSize);
} catch (Exception e) {
s_logger.warn("Unable to read vhd file " + file.getAbsolutePath(), e);
throw new CloudRuntimeException("Unable to read vhd file " + file.getAbsolutePath() + ": " + e);
} finally {
if (strm != null) {
try {
strm.close();
} catch (IOException e) {
}
}
}
long templateSize = NumbersUtil.bytesToLong(currentSize);
return templateSize;
}
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
_name = name;

11
core/src/com/cloud/storage/template/VmdkProcessor.java
View File

@ -81,6 +81,17 @@ public class VmdkProcessor extends AdapterBase implements Processor {
return info;
}
@Override
public Long getVirtualSize(File file) {
try {
long size = getTemplateVirtualSize(file.getParent(), file.getName());
return size;
} catch (Exception e) {
}
return file.length();
}
public long getTemplateVirtualSize(String templatePath, String templateName) throws InternalErrorException {
// get the virtual size from the OVF file meta data
long virtualSize=0;

30
services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
View File

@ -270,6 +270,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
newTemplTO.setPath(finalDownloadPath);
newTemplTO.setName(finalFileName);
newTemplTO.setSize(size);
newTemplTO.setPhysicalSize(size);
newDestTO = newTemplTO;
} else {
VolumeObjectTO newVolTO = new VolumeObjectTO();
@ -505,6 +506,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
TemplateObjectTO template = new TemplateObjectTO();
template.setPath(swiftPath);
template.setSize(templateFile.length());
template.setPhysicalSize(template.getSize());
SnapshotObjectTO snapshot = (SnapshotObjectTO)srcData;
template.setFormat(snapshot.getVolume().getFormat());
return new CopyCmdAnswer(template);
@ -718,6 +720,31 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
}
protected Long getVirtualSize(File file, ImageFormat format) {
Processor processor = null;
try {
if (format == null) {
return file.length();
} else if (format == ImageFormat.QCOW2) {
processor = new QCOW2Processor();
} else if (format == ImageFormat.OVA) {
processor = new VmdkProcessor();
} else if (format == ImageFormat.VHD) {
processor = new VhdProcessor();
}
if (processor == null) {
return file.length();
}
processor.configure("template processor", new HashMap<String, Object>());
return processor.getVirtualSize(file);
} catch (Exception e) {
s_logger.debug("Failed to get virtual size:" ,e);
}
return file.length();
}
protected Answer copyFromNfsToS3(CopyCommand cmd) {
final DataTO srcData = cmd.getSrcTO();
final DataTO destData = cmd.getDestTO();
@ -759,7 +786,8 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
if (destData.getObjectType() == DataObjectType.TEMPLATE) {
TemplateObjectTO newTemplate = new TemplateObjectTO();
newTemplate.setPath(key);
newTemplate.setSize(srcFile.length());
newTemplate.setSize(getVirtualSize(srcFile, format));
newTemplate.setPhysicalSize(srcFile.length());
newTemplate.setFormat(format);
retObj = newTemplate;
} else if (destData.getObjectType() == DataObjectType.VOLUME) {