You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2013/07/24 23:53:09 UTC
git commit: updated refs/heads/master to 7799f64
Updated Branches:
refs/heads/master ddbe5338d -> 7799f6482
CLOUDSTACK-3741: a typo in adding .qcow2 extension.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7799f648
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7799f648
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7799f648
Branch: refs/heads/master
Commit: 7799f6482fe8c16923554cd6515cc8783be363d2
Parents: ddbe533
Author: Min Chen <mi...@citrix.com>
Authored: Wed Jul 24 14:48:05 2013 -0700
Committer: Min Chen <mi...@citrix.com>
Committed: Wed Jul 24 14:53:00 2013 -0700
----------------------------------------------------------------------
.../storage/resource/NfsSecondaryStorageResource.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7799f648/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
----------------------------------------------------------------------
diff --git a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
index 29c05d5..082fc6c 100755
--- a/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
+++ b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
@@ -417,12 +417,10 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
} else if (srcData.getHypervisorType() == HypervisorType.KVM) {
File srcFile = getFile(srcData.getPath(), srcDataStore.getUrl());
File destFile = getFile(destData.getPath(), destDataStore.getUrl());
- // get snapshot file name, add extension if it is missing
+ // get snapshot file name
String templateName = srcFile.getName();
- if (!templateName.endsWith(ImageFormat.QCOW2.getFileExtension())) {
- templateName = templateName + ImageFormat.QCOW2.getFileExtension();
- }
- String destFileFullPath = destFile.getAbsolutePath() + File.separator + templateName;
+ // add kvm file extension for copied template name
+ String destFileFullPath = destFile.getAbsolutePath() + File.separator + templateName + "." + ImageFormat.QCOW2.getFileExtension();
s_logger.debug("copy snapshot " + srcFile.getAbsolutePath() + " to template " + destFileFullPath);
Script.runSimpleBashScript("cp " + srcFile.getAbsolutePath() + " " + destFileFullPath);
// template post processing
@@ -439,7 +437,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
loc.save();
TemplateProp prop = loc.getTemplateInfo();
TemplateObjectTO newTemplate = new TemplateObjectTO();
- newTemplate.setPath(destData.getPath() + File.separator + templateName);
+ newTemplate.setPath(destData.getPath() + File.separator + templateName + "." + ImageFormat.QCOW2.getFileExtension());
newTemplate.setFormat(ImageFormat.QCOW2);
newTemplate.setSize(prop.getSize());
return new CopyCmdAnswer(newTemplate);