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 2013/12/17 18:46:51 UTC
[1/2] git commit: Adding updates to member counts(for algorithms)
when events received
Updated Branches:
refs/heads/master 00524c6e3 -> 69bad7ce3
Adding updates to member counts(for algorithms) when events received
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/e05aff0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/e05aff0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/e05aff0e
Branch: refs/heads/master
Commit: e05aff0e5416ca29e55823ede7841e131f20add9
Parents: 819373a
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Dec 17 23:21:22 2013 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Dec 17 23:21:22 2013 +0530
----------------------------------------------------------------------
.../apache/stratos/autoscaler/NetworkPartitionContext.java | 7 +++++--
.../autoscaler/topology/AutoscalerTopologyReceiver.java | 7 +++++--
.../org/apache/stratos/autoscaler/util/AutoscalerUtil.java | 2 ++
3 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e05aff0e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
index ef621de..b809cea 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
@@ -289,8 +289,11 @@ public class NetworkPartitionContext implements Serializable {
}
public void increaseMemberCountInPartitionBy(String partitionId, int count){
-
- partitionToMemberCountMap.put(partitionId, getMemberCount(partitionId) + count);
+ if(!partitionCountExists(partitionId)){
+ addPartitionCount(partitionId, 1);
+ } else{
+ partitionToMemberCountMap.put(partitionId, getMemberCount(partitionId) + count);
+ }
}
public void decreaseMemberCountInPartitionBy(String partitionId, int count){
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e05aff0e/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/AutoscalerTopologyReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/AutoscalerTopologyReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/AutoscalerTopologyReceiver.java
index be0e7af..f70e0ac 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/AutoscalerTopologyReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/AutoscalerTopologyReceiver.java
@@ -156,9 +156,12 @@ public class AutoscalerTopologyReceiver implements Runnable {
TopologyManager.acquireReadLock();
MemberTerminatedEvent e = (MemberTerminatedEvent) event;
String networkPartitionId = e.getNetworkPartitionId();
- AutoscalerContext.getInstance().getMonitor(e.getClusterId())
- .getNetworkPartitionCtxt(networkPartitionId).getPartitionCtxt(e.getPartitionId())
+ NetworkPartitionContext networkPartitionContext = AutoscalerContext.getInstance().getMonitor(e.getClusterId())
+ .getNetworkPartitionCtxt(networkPartitionId);
+
+ networkPartitionContext.getPartitionCtxt(e.getPartitionId())
.removeMemberStatsContext(e.getMemberId());
+ networkPartitionContext.decreaseMemberCountInPartitionBy(e.getPartitionId(), 1);
// ClusterContext clusCtx = monitor.getClusterCtxt();
// String networkPartitionId = monitor.
// if (networkPartitionId != null) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/e05aff0e/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 b3358af..0f20f4d 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
@@ -131,8 +131,10 @@ public class AutoscalerUtil {
if(MemberStatus.Activated.equals(member.getStatus())){
partitionContext.addActiveMember(memberContext);
+ networkPartitionContext.increaseMemberCountInPartitionBy(partition.getId(), 1);
} else if(MemberStatus.Created.equals(member.getStatus()) || MemberStatus.Starting.equals(member.getStatus())){
partitionContext.addPendingMember(memberContext);
+ networkPartitionContext.increaseMemberCountInPartitionBy(partition.getId(), 1);
} else if(MemberStatus.Suspended.equals(member.getStatus())){
partitionContext.addFaultyMember(memberId);
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/69bad7ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/69bad7ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/69bad7ce
Branch: refs/heads/master
Commit: 69bad7ce33734e51b561d2640ec6d7f5435578d9
Parents: e05aff0 00524c6
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Dec 17 23:21:32 2013 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Dec 17 23:21:32 2013 +0530
----------------------------------------------------------------------
.../stratos/autoscaler/AutoscalerContext.java | 1 +
.../autoscaler/policy/PolicyManager.java | 4 +-
.../stratos/cli/RestCommandLineService.java | 78 +++++++++++++++++---
.../apache/stratos/cli/utils/CliConstants.java | 1 +
.../pom.xml | 4 +-
.../src/main/conf/cartridge-config.properties | 10 +--
6 files changed, 78 insertions(+), 20 deletions(-)
----------------------------------------------------------------------