Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 1f7c7850b -> fe63ca24d
fixing topology locking issue Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/59a8b661 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/59a8b661 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/59a8b661 Branch: refs/heads/4.0.0-grouping Commit: 59a8b66141ee41db263b8fc220eef0572108e9b5 Parents: f34747c Author: reka <[email protected]> Authored: Thu Sep 25 18:43:41 2014 +0530 Committer: reka <[email protected]> Committed: Thu Sep 25 18:43:41 2014 +0530 ---------------------------------------------------------------------- .../autoscaler/monitor/application/ApplicationMonitor.java | 4 ++-- .../apache/stratos/autoscaler/monitor/group/GroupMonitor.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/59a8b661/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java index 09921de..6c320a0 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java @@ -82,9 +82,9 @@ public class ApplicationMonitor extends Monitor { String clusterId = clusterDataHolder.getClusterId(); String serviceName = clusterDataHolder.getServiceType(); Cluster cluster = null; - TopologyManager.acquireReadLock(); + //TopologyManager.acquireReadLock(); cluster = TopologyManager.getTopology().getService(serviceName).getCluster(clusterId); - TopologyManager.releaseReadLock(); + //TopologyManager.releaseReadLock(); if (cluster != null) { startClusterMonitor(this,cluster); } else { http://git-wip-us.apache.org/repos/asf/stratos/blob/59a8b661/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java index aa17b1e..0ce9dbb 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java @@ -100,9 +100,9 @@ public class GroupMonitor extends Monitor { String clusterId = dataHolder.getClusterId(); String serviceName = dataHolder.getServiceType(); Cluster cluster = null; - TopologyManager.acquireReadLock(); + //TopologyManager.acquireReadLock(); cluster = TopologyManager.getTopology().getService(serviceName).getCluster(clusterId); - TopologyManager.releaseReadLock(); + //TopologyManager.releaseReadLock(); if (cluster != null) { startClusterMonitor(this, cluster); } else {
