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 2014/01/01 07:11:05 UTC
git commit: updated refs/heads/4.3 to ce48b0b
Updated Branches:
refs/heads/4.3 ea497b815 -> ce48b0bd5
Revert "CLOUDSTACK-5329: fix NPE, in case of zone wide primary storage"
This reverts commit 23841e3369877e404e4c7f4000a1ee540d1dcfa8.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ce48b0bd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ce48b0bd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ce48b0bd
Branch: refs/heads/4.3
Commit: ce48b0bd55db1ed949a388010c0373199e63ae21
Parents: ea497b8
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Wed Jan 1 11:23:57 2014 +0530
Committer: Sanjay Tripathi <sa...@citrix.com>
Committed: Wed Jan 1 11:23:57 2014 +0530
----------------------------------------------------------------------
api/src/com/cloud/storage/StoragePool.java | 3 ---
server/src/com/cloud/vm/UserVmManagerImpl.java | 12 ++++++------
2 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce48b0bd/api/src/com/cloud/storage/StoragePool.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/StoragePool.java b/api/src/com/cloud/storage/StoragePool.java
index 1f5713e..6e9af12 100644
--- a/api/src/com/cloud/storage/StoragePool.java
+++ b/api/src/com/cloud/storage/StoragePool.java
@@ -18,7 +18,6 @@ package com.cloud.storage;
import java.util.Date;
-import com.cloud.hypervisor.Hypervisor;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;
@@ -105,6 +104,4 @@ public interface StoragePool extends Identity, InternalIdentity {
String getStorageProviderName();
boolean isInMaintenance();
-
- Hypervisor.HypervisorType getHypervisor();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ce48b0bd/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index bd8cae1..19285da 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -36,7 +36,6 @@ import javax.naming.ConfigurationException;
import com.cloud.capacity.Capacity;
import com.cloud.exception.InsufficientServerCapacityException;
-import org.apache.cloudstack.engine.subsystem.api.storage.*;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
@@ -71,6 +70,10 @@ import org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntity;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
import org.apache.cloudstack.engine.service.api.OrchestrationService;
+import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory;
+import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
+import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService.VolumeApiResult;
import org.apache.cloudstack.framework.async.AsyncCallFuture;
import org.apache.cloudstack.framework.config.ConfigKey;
@@ -4054,12 +4057,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
throw new InvalidParameterValueException(
"Data disks attached to the vm, can not migrate. Need to dettach data disks at first");
}
- HypervisorType destHypervisorType = destPool.getHypervisor();
- if (destHypervisorType == null) {
- destHypervisorType = _clusterDao.findById(
- destPool.getClusterId()).getHypervisorType();
- }
+ HypervisorType destHypervisorType = _clusterDao.findById(
+ destPool.getClusterId()).getHypervisorType();
if (vm.getHypervisorType() != destHypervisorType) {
throw new InvalidParameterValueException(
"hypervisor is not compatible: dest: "