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/07/03 03:20:45 UTC
[1/2] git commit: updated refs/heads/4.4-forward to 40e28de
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward 63c4f0289 -> 40e28de72
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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f37b1524
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f37b1524
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f37b1524
Branch: refs/heads/4.4-forward
Commit: f37b1524892ab805615dbff2c59e5a1d10c116d3
Parents: 63c4f02
Author: Prachi Damle <pr...@citrix.com>
Authored: Wed Jul 2 17:24:29 2014 -0700
Committer: Prachi Damle <pr...@citrix.com>
Committed: Wed Jul 2 17:56:39 2014 -0700
----------------------------------------------------------------------
.../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/f37b1524/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 c2a5ff5..aa3e6e1 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/f37b1524/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..1c3a9f1 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;
[2/2] git commit: updated refs/heads/4.4-forward to 40e28de
Posted by pr...@apache.org.
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.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/40e28de7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/40e28de7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/40e28de7
Branch: refs/heads/4.4-forward
Commit: 40e28de7275804f4483868ba8a737878ff54fba8
Parents: f37b152
Author: Prachi Damle <pr...@citrix.com>
Authored: Wed Jul 2 18:02:40 2014 -0700
Committer: Prachi Damle <pr...@citrix.com>
Committed: Wed Jul 2 18:02:40 2014 -0700
----------------------------------------------------------------------
.../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/40e28de7/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 aa3e6e1..0e02d1b 100644
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -1244,7 +1244,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");
@@ -1371,10 +1371,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/40e28de7/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 1c3a9f1..c29101d 100755
--- a/server/src/com/cloud/deploy/FirstFitPlanner.java
+++ b/server/src/com/cloud/deploy/FirstFitPlanner.java
@@ -190,7 +190,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()) {
@@ -321,7 +321,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);
@@ -464,10 +464,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;
}