cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelv...@apache.org
Subject [17/27] git commit: updated refs/heads/master to ae23144
Date Wed, 04 Sep 2013 22:42:26 GMT
CLOUDSTACK-4458: Volume attach/detach command needs to sent to hypervisor resource even when
target VM is in Stopped state


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/281b94d5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/281b94d5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/281b94d5

Branch: refs/heads/master
Commit: 281b94d5875b9b1e8645e8b95b4800042c8b0365
Parents: ea13e08
Author: Kelven Yang <kelveny@gmail.com>
Authored: Wed Aug 28 18:37:45 2013 -0700
Committer: Kelven Yang <kelveny@gmail.com>
Committed: Wed Sep 4 14:49:46 2013 -0700

----------------------------------------------------------------------
 .../apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java   | 1 -
 .../vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java          | 2 +-
 .../src/com/cloud/storage/resource/VmwareStorageProcessor.java    | 2 +-
 .../src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java      | 3 +--
 4 files changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/281b94d5/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
index 66cfa46..3ead93f 100644
--- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
+++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
@@ -250,7 +250,6 @@ public class SnapshotServiceImpl implements SnapshotService {
         AsyncCallFuture<SnapshotResult> future = new AsyncCallFuture<SnapshotResult>();
         SnapshotResult result = new SnapshotResult(snapshot, null);
         try {
-
             snapObj.processEvent(Snapshot.Event.BackupToSecondary);
 
             DataStore imageStore = this.findSnapshotImageStore(snapshot);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/281b94d5/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
index e7f6260..53207d7 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -342,7 +342,7 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru
{
                 }
             }
         }
-
+        
         if(!needDelegation) {
             return new Pair<Boolean, Long>(Boolean.FALSE, new Long(hostId));
         }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/281b94d5/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 83a9531..d8ea1bd 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -963,7 +963,7 @@ public class VmwareStorageProcessor implements StorageProcessor {
                     throw new Exception("unable to prepare snapshot backup directory");
                 }
             }
-        }
+        }	
 
         VirtualMachineMO clonedVm = null;
         try {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/281b94d5/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index a461a79..3512af5 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -1055,8 +1055,7 @@ public class VirtualMachineMO extends BaseMO {
 		// VirtualDisk, we only perform prefix matching
 		Pair<VirtualDisk, String> deviceInfo = getDiskDevice(vmdkDatastorePath, false);
 		if(deviceInfo == null) {
-			if(s_logger.isTraceEnabled())
-				s_logger.trace("vCenter API trace - detachDisk() done (failed)");
+			s_logger.warn("vCenter API trace - detachDisk() done (failed)");
 			throw new Exception("No such disk device: " + vmdkDatastorePath);
 		}
 


Mime
View raw message