Skip to content

Commit a0abdc2

Browse files
committed
Make register template report the virtual size
1 parent ce1eaa1 commit a0abdc2

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -753,14 +753,15 @@ protected Answer registerTemplateOnSwift(DownloadCommand cmd) {
753753
_storage.create(uniqDir.getAbsolutePath(), "template.properties");
754754
File metaFile = new File(metaFileName);
755755
FileWriter writer = new FileWriter(metaFile);
756+
long virtualSize = getVirtualSize(file, getTemplateFormat(file.getName()));
756757
BufferedWriter bufferWriter = new BufferedWriter(writer);
757758
bufferWriter.write("uniquename=" + cmd.getName());
758759
bufferWriter.write("\n");
759760
bufferWriter.write("filename=" + fileName);
760761
bufferWriter.write("\n");
761762
bufferWriter.write("size=" + file.length());
762763
bufferWriter.write("\n");
763-
bufferWriter.write("virtualsize=" + getVirtualSize(file, getTemplateFormat(file.getName())));
764+
bufferWriter.write("virtualsize=" + virtualSize);
764765
bufferWriter.close();
765766
writer.close();
766767
SwiftUtil.putObject(swiftTO, metaFile, container, "template.properties");
@@ -774,7 +775,7 @@ protected Answer registerTemplateOnSwift(DownloadCommand cmd) {
774775
}
775776

776777
DownloadAnswer answer =
777-
new DownloadAnswer(null, 100, null, VMTemplateStorageResourceAssoc.Status.DOWNLOADED, swiftPath, swiftPath, file.length(), file.length(), md5sum);
778+
new DownloadAnswer(null, 100, null, VMTemplateStorageResourceAssoc.Status.DOWNLOADED, swiftPath, swiftPath, virtualSize, file.length(), md5sum);
778779
return answer;
779780
} catch (IOException e) {
780781
s_logger.debug("Failed to register template into swift", e);

0 commit comments

Comments
 (0)