You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2014/11/18 23:23:44 UTC
[2/2] git commit: updated refs/heads/4.5 to 968ca06
CLOUDSTACK-5853 cannot deploy vm with differing service storage tag and data disk storage tag
Changes:
- Reverting Marcus's fix since this issue has already fixed by https://issues.apache.org/jira/browse/CLOUDSTACK-5426
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/968ca060
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/968ca060
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/968ca060
Branch: refs/heads/4.5
Commit: 968ca060eea66ba7fe1853c6685069fe8b63b8f2
Parents: 7f54894
Author: Prachi Damle <pr...@citrix.com>
Authored: Mon Nov 17 20:27:41 2014 -0800
Committer: Prachi Damle <pr...@citrix.com>
Committed: Tue Nov 18 14:07:51 2014 -0800
----------------------------------------------------------------------
api/src/com/cloud/deploy/DeploymentPlanner.java | 5 -----
.../storage/allocator/ClusterScopeStoragePoolAllocator.java | 6 ------
.../storage/allocator/ZoneWideStoragePoolAllocator.java | 5 -----
server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 1 -
server/src/com/cloud/vm/UserVmManagerImpl.java | 3 ---
5 files changed, 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/968ca060/api/src/com/cloud/deploy/DeploymentPlanner.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/deploy/DeploymentPlanner.java b/api/src/com/cloud/deploy/DeploymentPlanner.java
index eb62cb1..dc7ea6d 100644
--- a/api/src/com/cloud/deploy/DeploymentPlanner.java
+++ b/api/src/com/cloud/deploy/DeploymentPlanner.java
@@ -176,11 +176,6 @@ public interface DeploymentPlanner extends Adapter {
_poolIds.add(poolId);
}
- public void removePool(long poolId) {
- if (_poolIds != null) {
- _poolIds.remove(poolId);
- }
- }
public void addDataCenter(long dataCenterId) {
if (_dcIds == null) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/968ca060/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
index ea084c7..0f4df4f 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java
@@ -86,12 +86,6 @@ public class ClusterScopeStoragePoolAllocator extends AbstractStoragePoolAllocat
avoid.addPool(pool.getId());
}
- // make sure our matching pool was not in avoid set
- for (StoragePoolVO pool : pools) {
- s_logger.debug("Removing pool " + pool + " from avoid set, must have been inserted when searching for another disk's tag");
- avoid.removePool(pool.getId());
- }
-
if (pools.size() == 0) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("No storage pools available for " + ServiceOffering.StorageType.shared.toString() + " volume allocation, returning");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/968ca060/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
----------------------------------------------------------------------
diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
index f9abfde..b38b76f 100644
--- a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
+++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java
@@ -80,11 +80,6 @@ public class ZoneWideStoragePoolAllocator extends AbstractStoragePoolAllocator {
avoid.addPool(pool.getId());
}
- // make sure our matching pool was not in avoid set
- for (StoragePoolVO pool : storagePoolsByHypervisor) {
- s_logger.debug("Removing pool " + pool + " from avoid set, must have been inserted when searching for another disk's tag");
- avoid.removePool(pool.getId());
- }
for (StoragePoolVO storage : storagePools) {
if (suitablePools.size() == returnUpTo) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/968ca060/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index 3cbe489..c11aef7 100755
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -120,7 +120,6 @@ import com.cloud.utils.db.TransactionCallback;
import com.cloud.utils.db.TransactionStatus;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.fsm.StateListener;
-import com.cloud.utils.fsm.StateMachine2;
import com.cloud.vm.DiskProfile;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/968ca060/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 1cf0ae6..7c60d4a 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -86,9 +86,6 @@ import org.apache.cloudstack.storage.command.DeleteCommand;
import org.apache.cloudstack.storage.command.DettachCommand;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
-import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
-
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command;