You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2013/07/27 20:03:15 UTC
[1/2] git commit: updated refs/heads/master to 3adeb12
Updated Branches:
refs/heads/master 40b59d7e2 -> 3adeb12d2
COUDSTACK-3053 Template creation from snapshot is failing on VMware setup
Fixed snapshot vmdk file path while copying snapshot files to template path.
Signed-off-by: Sateesh Chodapuneedi <sa...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/081ba924
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/081ba924
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/081ba924
Branch: refs/heads/master
Commit: 081ba924971987d70c1f3ea9a373c1ff6ced2925
Parents: 40b59d7
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Sat Jul 27 16:54:49 2013 +0530
Committer: Sateesh Chodapuneedi <sa...@apache.org>
Committed: Sat Jul 27 18:02:31 2013 +0530
----------------------------------------------------------------------
.../resource/VmwareStorageProcessor.java | 23 +++++++-------------
1 file changed, 8 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/081ba924/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
index d106889..4df7eb4 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -27,9 +27,6 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
-import com.cloud.agent.api.storage.CopyVolumeAnswer;
-import com.cloud.agent.api.storage.CopyVolumeCommand;
-import com.cloud.agent.api.to.*;
import org.apache.cloudstack.storage.command.AttachAnswer;
import org.apache.cloudstack.storage.command.AttachCommand;
import org.apache.cloudstack.storage.command.CopyCmdAnswer;
@@ -46,14 +43,11 @@ import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.AttachVolumeCommand;
-import com.cloud.agent.api.BackupSnapshotAnswer;
import com.cloud.agent.api.Command;
-import com.cloud.agent.api.CreateVolumeFromSnapshotAnswer;
-import com.cloud.agent.api.ManageSnapshotAnswer;
-import com.cloud.agent.api.ManageSnapshotCommand;
-import com.cloud.agent.api.storage.CreatePrivateTemplateAnswer;
-import com.cloud.agent.api.storage.PrimaryStorageDownloadAnswer;
+import com.cloud.agent.api.to.DataStoreTO;
+import com.cloud.agent.api.to.DataTO;
+import com.cloud.agent.api.to.DiskTO;
+import com.cloud.agent.api.to.NfsTO;
import com.cloud.hypervisor.vmware.manager.VmwareHostService;
import com.cloud.hypervisor.vmware.manager.VmwareStorageMount;
import com.cloud.hypervisor.vmware.mo.ClusterMO;
@@ -71,9 +65,9 @@ import com.cloud.hypervisor.vmware.util.VmwareHelper;
import com.cloud.serializer.GsonHelper;
import com.cloud.storage.DataStoreRole;
import com.cloud.storage.JavaStorageLayer;
+import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.StorageLayer;
import com.cloud.storage.Volume;
-import com.cloud.storage.Storage.ImageFormat;
import com.cloud.storage.template.VmdkProcessor;
import com.cloud.utils.Pair;
import com.cloud.utils.Ternary;
@@ -858,16 +852,15 @@ public class VmwareStorageProcessor implements StorageProcessor {
throw new Exception(msg);
}
- s_logger.info("vmdkfile parent dir: " + snapshotFullVMDKName);
- File snapshotdir = new File(snapshotFullVMDKName);
- // File snapshotdir = new File(snapshotRoot);
+ s_logger.info("vmdkfile parent dir: " + snapshotRoot);
+ File snapshotdir = new File(snapshotRoot);
File[] ssfiles = snapshotdir.listFiles();
// List<String> filenames = new ArrayList<String>();
for (int i = 0; i < ssfiles.length; i++) {
String vmdkfile = ssfiles[i].getName();
s_logger.info("vmdk file name: " + vmdkfile);
if(vmdkfile.toLowerCase().startsWith(backupSSUuid) && vmdkfile.toLowerCase().endsWith(".vmdk")) {
- snapshotFullVMDKName += vmdkfile;
+ snapshotFullVMDKName = snapshotRoot + File.separator + vmdkfile;
templateVMDKName += vmdkfile;
break;
}
[2/2] git commit: updated refs/heads/master to 3adeb12
Posted by sa...@apache.org.
CLOUDSTACK-3879 [VMware] NPE while attempting to create template from volume
Signed-off-by: Sateesh Chodapuneedi <sa...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3adeb12d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3adeb12d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3adeb12d
Branch: refs/heads/master
Commit: 3adeb12d2fff575603ac80fe8b176c68d813d24c
Parents: 081ba92
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Sat Jul 27 16:59:26 2013 +0530
Committer: Sateesh Chodapuneedi <sa...@apache.org>
Committed: Sat Jul 27 18:03:17 2013 +0530
----------------------------------------------------------------------
.../src/com/cloud/storage/resource/VmwareStorageProcessor.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3adeb12d/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
index 4df7eb4..65a0cb5 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -855,6 +855,11 @@ public class VmwareStorageProcessor implements StorageProcessor {
s_logger.info("vmdkfile parent dir: " + snapshotRoot);
File snapshotdir = new File(snapshotRoot);
File[] ssfiles = snapshotdir.listFiles();
+ if (ssfiles == null) {
+ String msg = "unable to find snapshot vmdk files in " + snapshotRoot;
+ s_logger.error(msg);
+ throw new Exception(msg);
+ }
// List<String> filenames = new ArrayList<String>();
for (int i = 0; i < ssfiles.length; i++) {
String vmdkfile = ssfiles[i].getName();