Repository: stratos Updated Branches: refs/heads/4.1.0-test 97297b701 -> d127f6d62
Get the active instance count correctly Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d127f6d6 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d127f6d6 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d127f6d6 Branch: refs/heads/4.1.0-test Commit: d127f6d627b49c732845a408235daed2fbcfb4a7 Parents: 97297b7 Author: Lahiru Sandaruwan <[email protected]> Authored: Thu Dec 11 22:32:11 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Thu Dec 11 22:32:22 2014 +0530 ---------------------------------------------------------------------- .../context/cluster/ClusterInstanceContext.java | 10 ++++++++++ .../modules/distribution/src/main/conf/drools/scaling.drl | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/d127f6d6/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java index a4c8c1f..ae63615 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java @@ -138,6 +138,16 @@ public class ClusterInstanceContext extends InstanceContext { return null; } + public int getActiveMemberCount() { + + int activeMemberCount = 0; + for (ClusterLevelPartitionContext partitionContext : partitionCtxts) { + + activeMemberCount += partitionContext.getActiveMemberCount(); + } + return activeMemberCount; + } + public int getNonTerminatedMemberCount() { int nonTerminatedMemberCount = 0; http://git-wip-us.apache.org/repos/asf/stratos/blob/d127f6d6/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl ---------------------------------------------------------------------- diff --git a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl index 35d012b..adb1489 100644 --- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl +++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl @@ -87,7 +87,7 @@ dialect "mvel" laPredictedValue : Double() from delegator.getLoadAveragePredictedValue(clusterInstanceContext) - activeInstancesCount : Integer() from clusterInstanceContext.getNonTerminatedMemberCount() + activeInstancesCount : Integer() from clusterInstanceContext.getActiveMemberCount() requestsServedPerInstance : Float() from clusterInstanceContext.getRequestsServedPerInstance() averageRequestsServedPerInstance : Float() from clusterInstanceContext.getAverageRequestsServedPerInstance()
