You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2013/12/20 21:45:20 UTC
git commit: updated refs/heads/master to 9947e68
Updated Branches:
refs/heads/master e52a4d930 -> 9947e688c
CS-18564: create template from snapshot failed, due to the volume(the
snapshot created from) is deleted.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9947e688
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9947e688
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9947e688
Branch: refs/heads/master
Commit: 9947e688c4d4046774d9a14cb28151cb757a16f5
Parents: e52a4d9
Author: Edison Su <su...@gmail.com>
Authored: Fri Dec 20 12:43:06 2013 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Fri Dec 20 12:45:02 2013 -0800
----------------------------------------------------------------------
.../storage/resource/NfsSecondaryStorageResource.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9947e688/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 00c1aac..6964bf4 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
@@ -444,7 +444,14 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
File srcFile = getFile(srcData.getPath(), srcDataStore.getUrl());
File destFile = getFile(destData.getPath(), destDataStore.getUrl());
- ImageFormat srcFormat = srcData.getVolume().getFormat();
+ VolumeObjectTO volumeObjectTO = srcData.getVolume();
+ ImageFormat srcFormat = null;
+ //TODO: the image format should be stored in snapshot table, instead of getting from volume
+ if (volumeObjectTO != null) {
+ srcFormat = volumeObjectTO.getFormat();
+ } else {
+ srcFormat = ImageFormat.QCOW2;
+ }
// get snapshot file name
String templateName = srcFile.getName();