Updated Branches: refs/heads/master bb1704007 -> 7930d804e
Adjusting some logs to show better information Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3b120d83 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3b120d83 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3b120d83 Branch: refs/heads/master Commit: 3b120d830cd5d4da1388cd0ae617ab4f2e564c11 Parents: bbbe3a0 Author: Lahiru Sandaruwan <[email protected]> Authored: Mon Dec 23 16:31:18 2013 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Mon Dec 23 16:31:18 2013 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/AutoscalerContext.java | 1 - .../topology/AutoscalerTopologyReceiver.java | 16 ++++++++-------- .../stratos/autoscaler/util/AutoscalerUtil.java | 15 ++++++++++++++- 3 files changed, 22 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3b120d83/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/AutoscalerContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/AutoscalerContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/AutoscalerContext.java index e809db9..7b4b8da 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/AutoscalerContext.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/AutoscalerContext.java @@ -42,7 +42,6 @@ public class AutoscalerContext { } public void addMonitor(ClusterMonitor monitor) { - log.info("Adding moniter clusterid" + monitor.getClusterId()); monitors.put(monitor.getClusterId(), monitor); } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3b120d83/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 520509f..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 @@ -90,14 +90,14 @@ public class AutoscalerTopologyReceiver implements Runnable { TopologyManager.acquireReadLock(); for(Service service : TopologyManager.getTopology().getServices()) { for(Cluster cluster : service.getClusters()) { - Thread th; - if(cluster.isLbCluster()){ - th = new Thread(new LBClusterMonitorAdder(cluster)); - }else{ - th = new Thread(new ClusterMonitorAdder(cluster)); - } - - th.start(); + Thread th; + if(cluster.isLbCluster()){ + th = new Thread(new LBClusterMonitorAdder(cluster)); + }else{ + th = new Thread(new ClusterMonitorAdder(cluster)); + } + + th.start(); } } } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3b120d83/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 85aa783..74c9fe0 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 @@ -140,15 +140,25 @@ public class AutoscalerUtil { } else if(MemberStatus.Suspended.equals(member.getStatus())){ partitionContext.addFaultyMember(memberId); } - partitionContext.addMemberStatsContext(new MemberStatsContext(memberId)); + if(log.isInfoEnabled()){ + log.info(String.format("Member stat context has been added: [member] %s", memberId)); + } } } networkPartitionContext.addPartitionContext(partitionContext); + if(log.isInfoEnabled()){ + log.info(String.format("Partition context has been added: [partition] %s", + partitionContext.getPartitionId())); + } } clusterMonitor.addNetworkPartitionCtxt(networkPartitionContext); + if(log.isInfoEnabled()){ + log.info(String.format("Network partition context has been added: [network partition] %s", + networkPartitionContext.getId())); + } } @@ -232,6 +242,9 @@ public class AutoscalerUtil { } partitionContext.addMemberStatsContext(new MemberStatsContext(memberId)); + if(log.isInfoEnabled()){ + log.info(String.format("Member stat context has been added: [member] %s", memberId)); + } } }
