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/12/12 02:01:08 UTC
git commit: updated refs/heads/master to 5dccaa1
Updated Branches:
refs/heads/master 26c1ba296 -> 5dccaa183
CLOUDSTACK-5454: Delete previous template and snapshot after migrating
NFS to S3 throws Error.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5dccaa18
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5dccaa18
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5dccaa18
Branch: refs/heads/master
Commit: 5dccaa1832bd92327f12520fd485b0b58eee9b18
Parents: 26c1ba2
Author: Min Chen <mi...@citrix.com>
Authored: Wed Dec 11 16:54:11 2013 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Wed Dec 11 16:54:40 2013 -0800
----------------------------------------------------------------------
.../cloudstack/storage/resource/NfsSecondaryStorageResource.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5dccaa18/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 79236e6..71fbc97 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
@@ -1666,6 +1666,10 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
protected Answer execute(final DeleteCommand cmd) {
DataTO obj = cmd.getData();
DataObjectType objType = obj.getObjectType();
+ if (obj.getPath() == null) {
+ // account for those fake entries for NFS migration to object store
+ return new Answer(cmd, true, "Object with null install path does not exist on image store , no need to delete");
+ }
switch (objType) {
case TEMPLATE:
return deleteTemplate(cmd);