Repository: cloudstack Updated Branches: refs/heads/master 09a62b838 -> 723aedf9b
CLOUDSTACK-7820: Don't consider disabled hosts for calculating disable threshold. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/723aedf9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/723aedf9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/723aedf9 Branch: refs/heads/master Commit: 723aedf9b1e8ef8eec0b13e83abfa5eceecfce56 Parents: 09a62b8 Author: Nitin Mehta <nitin.me...@citrix.com> Authored: Thu Oct 30 17:05:11 2014 -0700 Committer: Nitin Mehta <nitin.me...@citrix.com> Committed: Thu Oct 30 17:05:11 2014 -0700 ---------------------------------------------------------------------- engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/723aedf9/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java index 45b10f0..d9e6184 100755 --- a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java +++ b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java @@ -178,7 +178,7 @@ public class CapacityDaoImpl extends GenericDaoBase<CapacityVO, Long> implements "ELSE (SELECT config.value FROM `cloud`.`configuration` config WHERE config.name = ?) " + "END configValue " + "FROM `cloud`.`op_host_capacity` capacity INNER JOIN `cloud`.`cluster_details` overcommit ON overcommit.cluster_id = capacity.cluster_id " + - "WHERE capacity.data_center_id = ? AND capacity.capacity_type = ? AND capacity.total_capacity > 0 AND overcommit.name = ?) cluster " + + "WHERE capacity.data_center_id = ? AND capacity.capacity_type = ? AND capacity.total_capacity > 0 AND overcommit.name = ? AND capacity.capacity_state='Enabled') cluster " + "GROUP BY cluster.cluster_id) clusterList " + "WHERE clusterList.ratio > clusterList.value; ";
