You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/12/10 07:33:59 UTC
[1/2] stratos git commit: Remove getMemberCount method and improve
comment, log
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 12e669a61 -> 0e540557e
Remove getMemberCount method and improve comment, log
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0e540557
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0e540557
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0e540557
Branch: refs/heads/4.1.0-test
Commit: 0e540557e27f7946e8185b947fff7022a4bff295
Parents: 1e95d58
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Wed Dec 10 12:04:53 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Wed Dec 10 12:05:02 2014 +0530
----------------------------------------------------------------------
.../autoscaler/rule/RuleTasksDelegator.java | 33 +++-----------------
1 file changed, 5 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0e540557/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
index 2b42139..16d4db5 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java
@@ -118,41 +118,18 @@ public class RuleTasksDelegator {
return numberOfInstances;
}
- public int getMemberCount(String clusterId, int scalingPara) {
-
- int activeMemberCount = 0;
- int memberCount = 0;
- for (Service service : TopologyManager.getTopology().getServices()) {
- if (service.clusterExists(clusterId)) {
- Cluster cluster = service.getCluster(clusterId);
-
- for (Member member : cluster.getMembers()) {
- if (member.isActive() || member.getStatus() == MemberStatus.Created || member.getStatus() == MemberStatus.Starting) {
- memberCount++;
- if (member.isActive()) {
- activeMemberCount++;
- }
- }
- }
- }
- }
- if (scalingPara == 1) {
- return memberCount;
- } else {
- return activeMemberCount;
- }
-
-
- }
-
public AutoscaleAlgorithm getAutoscaleAlgorithm(String partitionAlgorithm) {
+
AutoscaleAlgorithm autoscaleAlgorithm = null;
//FIXME to not parse for algo when partition is chosen by the parent
+
if(partitionAlgorithm == null) {
+
+ //Send one after another as default
partitionAlgorithm = Constants.ONE_AFTER_ANOTHER_ALGORITHM_ID;
}
if (log.isDebugEnabled()) {
- log.debug(String.format("Partition algorithm is ", partitionAlgorithm));
+ log.debug(String.format("Retrieving partition algorithm [Partition algorithm]: ", partitionAlgorithm));
}
if (Constants.ROUND_ROBIN_ALGORITHM_ID.equals(partitionAlgorithm)) {
[2/2] stratos git commit: get instance count using
getNonTerminatedMemberCount in scaling drools
Posted by la...@apache.org.
get instance count using getNonTerminatedMemberCount in scaling drools
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1e95d58a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1e95d58a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1e95d58a
Branch: refs/heads/4.1.0-test
Commit: 1e95d58a58b57efaa44d5af1526f4215d400491a
Parents: 12e669a
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Wed Dec 10 12:03:57 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Wed Dec 10 12:05:02 2014 +0530
----------------------------------------------------------------------
.../modules/distribution/src/main/conf/drools/scaling.drl | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/1e95d58a/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 163d671..01b2327 100644
--- a/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
+++ b/products/stratos/modules/distribution/src/main/conf/drools/scaling.drl
@@ -90,9 +90,7 @@ dialect "mvel"
laPredictedValue : Double() from delegator.getLoadAveragePredictedValue(clusterInstanceContext)
- activeInstancesCount : Integer() from delegator.getMemberCount(clusterId , 0)
- instancesCount : Integer() from delegator.getMemberCount(clusterId , 1)
-
+ activeInstancesCount : Integer() from clusterInstanceContext.getNonTerminatedMemberCount()
requestsServedPerInstance : Float() from clusterInstanceContext.getRequestsServedPerInstance()
averageRequestsServedPerInstance : Float() from clusterInstanceContext.getAverageRequestsServedPerInstance()
@@ -104,7 +102,7 @@ dialect "mvel"
- scaleUp : Boolean() from (instancesCount < numberOfRequiredInstances )
+ scaleUp : Boolean() from (activeInstancesCount < numberOfRequiredInstances )
scaleDown : Boolean() from (activeInstancesCount > numberOfRequiredInstances )
eval(log.debug("[scaling] " + " [cluster] " + clusterId + " RIF Resetted?: " + rifReset))
@@ -125,11 +123,11 @@ dialect "mvel"
then
- log.debug("Number Of Required Instances " + numberOfRequiredInstances + " Instances Count " + instancesCount);
+ log.debug("Number Of Required Instances " + numberOfRequiredInstances + " Instances Count " + activeInstancesCount);
if(scaleUp){
- int additionalInstances = numberOfRequiredInstances - instancesCount ;
+ int additionalInstances = numberOfRequiredInstances - activeInstancesCount ;
clusterInstanceContext.resetScaleDownRequestsCount();
int count = 0;