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 18:57:32 UTC
[1/2] git commit: updated refs/heads/4.2 to b0e8c83
Updated Branches:
refs/heads/4.2 93f79e1a1 -> b0e8c83ec
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/2aa2f475
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2aa2f475
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2aa2f475
Branch: refs/heads/4.2
Commit: 2aa2f47519002e4156479ee3ded6dfa30ae33f79
Parents: 6403bb3
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 16:54:49 2013 +0530
----------------------------------------------------------------------
.../resource/VmwareStorageProcessor.java | 23 +++++++-------------
1 file changed, 8 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2aa2f475/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 1198583..413ccfe 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/4.2 to b0e8c83
Posted by sa...@apache.org.
Merge branch '4.2' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.2
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b0e8c83e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b0e8c83e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b0e8c83e
Branch: refs/heads/4.2
Commit: b0e8c83ec978a0956d04778da19bd31c282a9b02
Parents: 2aa2f47 93f79e1
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Sat Jul 27 16:57:37 2013 +0530
Committer: Sateesh Chodapuneedi <sa...@apache.org>
Committed: Sat Jul 27 16:57:37 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/vm/UserVmManagerImpl.java | 7 ++++---
server/test/com/cloud/vm/UserVmManagerTest.java | 3 ++-
setup/db/db/schema-307to410.sql | 10 ++++++++++
setup/db/templates.sql | 6 +++---
test/integration/smoke/test_vm_life_cycle.py | 15 +++------------
5 files changed, 22 insertions(+), 19 deletions(-)
----------------------------------------------------------------------