You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2013/12/18 12:32:53 UTC
[1/2] git commit: Add lb cluster moniter for full topology receiver
Updated Branches:
refs/heads/master 314a58993 -> 70c184f87
Add lb cluster moniter for full topology receiver
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a1fea083
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a1fea083
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a1fea083
Branch: refs/heads/master
Commit: a1fea083bed50ffddbbda70c588d51e3d712f22b
Parents: 47a5f65
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Dec 18 17:01:53 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Dec 18 17:01:53 2013 -0500
----------------------------------------------------------------------
.../autoscaler/topology/AutoscalerTopologyReceiver.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a1fea083/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 9372fe0..7dabf19 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
@@ -86,8 +86,13 @@ public class AutoscalerTopologyReceiver implements Runnable {
TopologyManager.acquireReadLock();
for(Service service : TopologyManager.getTopology().getServices()) {
for(Cluster cluster : service.getClusters()) {
-
- Thread th = new Thread(new ClusterMonitorAdder(cluster));
+ Thread th;
+ if(cluster.isLbCluster()){
+ th= new Thread(new LBClusterMonitorAdder(cluster));
+ }else{
+ th = new Thread(new ClusterMonitorAdder(cluster));
+ }
+
th.start();
}
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ud...@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/70c184f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/70c184f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/70c184f8
Branch: refs/heads/master
Commit: 70c184f87f6789f557175ef5d2940ab816272103
Parents: a1fea08 314a589
Author: Udara Liyanage <ud...@wso2.com>
Authored: Wed Dec 18 17:02:40 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Wed Dec 18 17:02:40 2013 -0500
----------------------------------------------------------------------
.../stratos/autoscaler/AutoscalerContext.java | 4 ++
.../health/HealthEventMessageDelegator.java | 2 +-
.../autoscaler/monitor/AbstractMonitor.java | 8 ++-
.../autoscaler/monitor/ClusterMonitor.java | 35 +++++++++----
.../autoscaler/monitor/LbClusterMonitor.java | 51 ++++++++++++-------
.../topology/AutoscalerTopologyReceiver.java | 53 ++++++++++++++++----
.../stratos/cli/RestCommandLineService.java | 12 ++---
.../stratos/cli/commands/SubscribeCommand.java | 16 +++---
.../impl/CloudControllerServiceImpl.java | 2 +-
.../controller/topology/TopologyBuilder.java | 3 +-
10 files changed, 128 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/70c184f8/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/topology/AutoscalerTopologyReceiver.java
----------------------------------------------------------------------