You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/07/03 16:14:04 UTC
[1/2] git commit: updated refs/heads/4.4 to 29b09b1
Repository: cloudstack
Updated Branches:
refs/heads/4.4 332836746 -> 29b09b1e2
CLOUDSTACK-7047: DeploymentPlanner should include disabled resources only when the VM owner is Admin account
Changes:
-DeploymentPlanner should include disabled resources only when the VM owner is Admin account. The disabled resources should be ignored when VM is owned by any other user.
(cherry picked from commit 40e28de7275804f4483868ba8a737878ff54fba8)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b70bd23b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b70bd23b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b70bd23b
Branch: refs/heads/4.4
Commit: b70bd23be37bb7d8fa581b26a0bb6d8c657c9098
Parents: 3328367
Author: Prachi Damle <pr...@citrix.com>
Authored: Wed Jul 2 18:02:40 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Thu Jul 3 16:13:05 2014 +0200
----------------------------------------------------------------------
.../com/cloud/deploy/DeploymentPlanningManagerImpl.java | 10 +++++-----
server/src/com/cloud/deploy/FirstFitPlanner.java | 12 ++++++------
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b70bd23b/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 f954615..c61e507 100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -1243,7 +1243,7 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
if (s_logger.isDebugEnabled()) {
s_logger.debug("We need to allocate new storagepool for this volume");
}
- if (!isRootAdmin(plan.getReservationContext())) {
+ if (!isRootAdmin(vmProfile)) {
if (!isEnabledForAllocation(plan.getDataCenterId(), plan.getPodId(), plan.getClusterId())) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Cannot allocate new storagepool for this volume in this cluster, allocation state is disabled");
@@ -1359,10 +1359,10 @@ public class DeploymentPlanningManagerImpl extends ManagerBase implements Deploy
return true;
}
- private boolean isRootAdmin(ReservationContext reservationContext) {
- if (reservationContext != null) {
- if (reservationContext.getAccount() != null) {
- return _accountMgr.isRootAdmin(reservationContext.getAccount().getId());
+ private boolean isRootAdmin(VirtualMachineProfile vmProfile) {
+ if (vmProfile != null) {
+ if (vmProfile.getOwner() != null) {
+ return _accountMgr.isRootAdmin(vmProfile.getOwner().getId());
} else {
return false;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b70bd23b/server/src/com/cloud/deploy/FirstFitPlanner.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java
index 6ffe31f..cd093f3 100755
--- a/server/src/com/cloud/deploy/FirstFitPlanner.java
+++ b/server/src/com/cloud/deploy/FirstFitPlanner.java
@@ -191,7 +191,7 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
}
podsWithCapacity.removeAll(avoid.getPodsToAvoid());
}
- if (!isRootAdmin(plan.getReservationContext())) {
+ if (!isRootAdmin(vmProfile)) {
List<Long> disabledPods = listDisabledPods(plan.getDataCenterId());
if (!disabledPods.isEmpty()) {
if (s_logger.isDebugEnabled()) {
@@ -322,7 +322,7 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
prioritizedClusterIds.removeAll(avoid.getClustersToAvoid());
}
- if (!isRootAdmin(plan.getReservationContext())) {
+ if (!isRootAdmin(vmProfile)) {
List<Long> disabledClusters = new ArrayList<Long>();
if (isZone) {
disabledClusters = listDisabledClusters(plan.getDataCenterId(), null);
@@ -465,10 +465,10 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentClusterPla
}
- private boolean isRootAdmin(ReservationContext reservationContext) {
- if(reservationContext != null){
- if(reservationContext.getAccount() != null){
- return _accountMgr.isRootAdmin(reservationContext.getAccount().getId());
+ private boolean isRootAdmin(VirtualMachineProfile vmProfile) {
+ if (vmProfile != null) {
+ if (vmProfile.getOwner() != null) {
+ return _accountMgr.isRootAdmin(vmProfile.getOwner().getId());
}else{
return false;
}
[2/2] git commit: updated refs/heads/4.4 to 29b09b1
Posted by da...@apache.org.
CLOUDSTACK-7047: DeploymentPlanner should include disabled resources only when the VM owner is Admin account
Changes:
- removing unused imports
Conflicts:
server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
(cherry picked from commit f37b1524892ab805615dbff2c59e5a1d10c116d3)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/29b09b1e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/29b09b1e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/29b09b1e
Branch: refs/heads/4.4
Commit: 29b09b1e21132d1c6c2739dbd0df99d895aef039
Parents: b70bd23
Author: Prachi Damle <pr...@citrix.com>
Authored: Wed Jul 2 17:24:29 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Thu Jul 3 16:13:15 2014 +0200
----------------------------------------------------------------------
.../com/cloud/deploy/DeploymentPlanningManagerImpl.java | 11 +++++------
server/src/com/cloud/deploy/FirstFitPlanner.java | 1 -
2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/29b09b1e/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 c61e507..8589b1a 100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -118,12 +118,11 @@ import com.cloud.utils.db.Transaction;
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.vm.DiskProfile;
-import com.cloud.vm.ReservationContext;
-import com.cloud.vm.VMInstanceVO;
-import com.cloud.vm.VirtualMachine;
-import com.cloud.vm.VirtualMachine.Event;
+import com.cloud.utils.fsm.StateListener;
+import com.cloud.vm.DiskProfile;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachine.Event;
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.UserVmDao;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/29b09b1e/server/src/com/cloud/deploy/FirstFitPlanner.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java
index cd093f3..c29101d 100755
--- a/server/src/com/cloud/deploy/FirstFitPlanner.java
+++ b/server/src/com/cloud/deploy/FirstFitPlanner.java
@@ -56,7 +56,6 @@ import com.cloud.storage.dao.VolumeDao;
import com.cloud.user.AccountManager;
import com.cloud.utils.NumbersUtil;
import com.cloud.utils.Pair;
-import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.UserVmDao;