Updated Branches: refs/heads/master dfc250e53 -> 4cd05fe38
correcting a instance count increment logic issue Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7858f3e9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7858f3e9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7858f3e9 Branch: refs/heads/master Commit: 7858f3e9fae458748f9b988826895d32cf8ef931 Parents: e589c5c Author: Lahiru Sandaruwan <[email protected]> Authored: Wed Dec 25 14:58:41 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Wed Dec 25 14:58:41 2013 +0530 ---------------------------------------------------------------------- .../message/receiver/topology/AutoscalerTopologyReceiver.java | 1 + .../org/apache/stratos/autoscaler/rule/RuleTasksDelegator.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7858f3e9/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 5850728..dab18cb 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,6 +236,7 @@ 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/7858f3e9/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 2d99894..4e9f1c9 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,6 +13,8 @@ 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... */ @@ -62,7 +64,6 @@ public class RuleTasksDelegator { partitionContext.addPendingMember(memberContext); } - partitionContext.incrementCurrentMemberCount(1); } catch (Throwable e) { String message = "Cannot spawn an instance"; log.error(message, e);
