Updated Branches: refs/heads/master 77d0eb476 -> e589c5c7c
fixing increment of member count in min rule Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e589c5c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e589c5c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e589c5c7 Branch: refs/heads/master Commit: e589c5c7c296de546d7fcc4c303d43e904e0fddd Parents: 77d0eb4 Author: Lahiru Sandaruwan <[email protected]> Authored: Wed Dec 25 12:45:27 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed Dec 25 12:45:27 2013 +0530 ---------------------------------------------------------------------- .../message/receiver/topology/AutoscalerTopologyReceiver.java | 1 - .../org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java | 3 +-- .../java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e589c5c7/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyReceiver.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyReceiver.java index dab18cb..5850728 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyReceiver.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/topology/AutoscalerTopologyReceiver.java @@ -236,7 +236,6 @@ public class AutoscalerTopologyReceiver implements Runnable { if(log.isInfoEnabled()){ log.info(String.format("Member stat context has been added: [member] %s", memberId)); } - partitionContext.incrementCurrentMemberCount(1); partitionContext.removePendingMember(memberId); } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e589c5c7/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 4e9f1c9..2d99894 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 @@ -13,8 +13,6 @@ import org.apache.stratos.autoscaler.partition.PartitionManager; import org.apache.stratos.cloud.controller.deployment.partition.Partition; import org.apache.stratos.cloud.controller.pojo.MemberContext; -import java.util.Properties; - /** * This will have utility methods that need to be executed from rule file... */ @@ -64,6 +62,7 @@ public class RuleTasksDelegator { partitionContext.addPendingMember(memberContext); } + partitionContext.incrementCurrentMemberCount(1); } catch (Throwable e) { String message = "Cannot spawn an instance"; log.error(message, e); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e589c5c7/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java index 74c9fe0..71eeb63 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java @@ -242,6 +242,7 @@ public class AutoscalerUtil { } partitionContext.addMemberStatsContext(new MemberStatsContext(memberId)); + partitionContext.incrementCurrentMemberCount(1); if(log.isInfoEnabled()){ log.info(String.format("Member stat context has been added: [member] %s", memberId)); }
