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 2014/02/04 01:27:43 UTC
git commit: updated refs/heads/4.3-forward to b11c13d
Updated Branches:
refs/heads/4.3-forward 50234ea72 -> b11c13d4a
CLOUDSTACK-6019:CreateVolume from snapshot in NFS is throwing Warning
"sync snapshot from cache to region wide store failed for image store
test".
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b11c13d4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b11c13d4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b11c13d4
Branch: refs/heads/4.3-forward
Commit: b11c13d4a120a6361231ee415082576dac6fe385
Parents: 50234ea
Author: Min Chen <mi...@citrix.com>
Authored: Mon Feb 3 16:26:40 2014 -0800
Committer: Min Chen <mi...@citrix.com>
Committed: Mon Feb 3 16:27:31 2014 -0800
----------------------------------------------------------------------
.../resource/VmwareStorageSubsystemCommandHandler.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b11c13d4/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java
index d1b8be8..5eccc3c 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageSubsystemCommandHandler.java
@@ -95,6 +95,15 @@ public class VmwareStorageSubsystemCommandHandler extends StorageSubsystemComman
} else if (srcData.getObjectType() == DataObjectType.TEMPLATE) {
// sync template from NFS cache to S3 in NFS migration to S3 case
storageManager.createOvaForTemplate((TemplateObjectTO)srcData);
+ } else if (srcData.getObjectType() == DataObjectType.SNAPSHOT && destData.getObjectType() == DataObjectType.SNAPSHOT) {
+ // sync snapshot from NFS cache to S3 in NFS migration to S3 case
+ String parentPath = storageResource.getRootDir(srcDataStore.getUrl());
+ SnapshotObjectTO snap = (SnapshotObjectTO)srcData;
+ String path = snap.getPath();
+ int index = path.lastIndexOf(File.separator);
+ String name = path.substring(index + 1);
+ String snapDir = path.substring(0, index);
+ storageManager.createOva(parentPath + File.separator + snapDir, name);
} else if (srcData.getObjectType() == DataObjectType.SNAPSHOT && destData.getObjectType() == DataObjectType.TEMPLATE) {
//create template from snapshot on src at first, then copy it to s3
TemplateObjectTO cacheTemplate = (TemplateObjectTO)destData;