You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/12/11 16:52:10 UTC
[1/2] git commit: putting read lock when accessing Topology Manager
Updated Branches:
refs/heads/master 02b6b7fb4 -> 12ac6fb3c
putting read lock when accessing Topology Manager
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/64bc33d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/64bc33d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/64bc33d6
Branch: refs/heads/master
Commit: 64bc33d64fff1e9269b56371f3a3dec79f8cd4e8
Parents: 5f2b804
Author: Isuru <is...@wso2.com>
Authored: Wed Dec 11 21:20:08 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Wed Dec 11 21:20:08 2013 +0530
----------------------------------------------------------------------
.../processor/ClusterStatusEventProcessor.java | 13 ++++-
.../processor/InstanceStatusEventProcessor.java | 56 +++++++++++++++++---
2 files changed, 59 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/64bc33d6/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/ClusterStatusEventProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/ClusterStatusEventProcessor.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/ClusterStatusEventProcessor.java
index 4539799..5dc50c1 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/ClusterStatusEventProcessor.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/ClusterStatusEventProcessor.java
@@ -73,8 +73,17 @@ public class ClusterStatusEventProcessor extends TopologyEventProcessor {
if (cartridgeSubscriptionInfo != null) {
- Cluster cluster = TopologyManager.getTopology().
- getService(cartridgeSubscriptionInfo.getCartridge()).getCluster(cartridgeSubscriptionInfo.getClusterDomain());
+ Cluster cluster;
+ //acquire read lock
+ TopologyManager.acquireReadLock();
+ try {
+ cluster = TopologyManager.getTopology().
+ getService(cartridgeSubscriptionInfo.getCartridge()).getCluster(cartridgeSubscriptionInfo.getClusterDomain());
+ } finally {
+ //release read lock
+ TopologyManager.releaseReadLock();
+ }
+
//add the new cluster to the Topology Cluster Info. model
TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscriptionInfo.getTenantId(),
cartridgeSubscriptionInfo.getCartridge(),
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/64bc33d6/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/InstanceStatusEventProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/InstanceStatusEventProcessor.java b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/InstanceStatusEventProcessor.java
index 8eeaf64..8a03b7a 100644
--- a/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/InstanceStatusEventProcessor.java
+++ b/components/org.apache.stratos.adc.mgt/src/main/java/org/apache/stratos/adc/mgt/topology/event/processor/InstanceStatusEventProcessor.java
@@ -83,8 +83,18 @@ public class InstanceStatusEventProcessor extends TopologyEventProcessor {
CartridgeSubscriptionInfo cartridgeSubscriptionInfo = getCartridgeSubscriptionInfo(clusterDomain);
if(cartridgeSubscriptionInfo != null) {
- Cluster cluster = TopologyManager.getTopology().
- getService(cartridgeSubscriptionInfo.getCartridge()).getCluster(clusterDomain);
+
+ Cluster cluster;
+ //acquire read lock
+ TopologyManager.acquireReadLock();
+ try {
+ cluster = TopologyManager.getTopology().
+ getService(cartridgeSubscriptionInfo.getCartridge()).getCluster(cartridgeSubscriptionInfo.getClusterDomain());
+ } finally {
+ //release read lock
+ TopologyManager.releaseReadLock();
+ }
+
TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscriptionInfo.getTenantId(),
cartridgeSubscriptionInfo.getCartridge(),
cartridgeSubscriptionInfo.getAlias(), cluster);
@@ -100,8 +110,18 @@ public class InstanceStatusEventProcessor extends TopologyEventProcessor {
CartridgeSubscriptionInfo cartridgeSubscriptionInfo = getCartridgeSubscriptionInfo(clusterDomain);
if(cartridgeSubscriptionInfo != null) {
- Cluster cluster = TopologyManager.getTopology().
- getService(cartridgeSubscriptionInfo.getCartridge()).getCluster(clusterDomain);
+
+ Cluster cluster;
+ //acquire read lock
+ TopologyManager.acquireReadLock();
+ try {
+ cluster = TopologyManager.getTopology().
+ getService(cartridgeSubscriptionInfo.getCartridge()).getCluster(cartridgeSubscriptionInfo.getClusterDomain());
+ } finally {
+ //release read lock
+ TopologyManager.releaseReadLock();
+ }
+ //update the model
TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscriptionInfo.getTenantId(),
cartridgeSubscriptionInfo.getCartridge(),
cartridgeSubscriptionInfo.getAlias(), cluster);
@@ -117,8 +137,18 @@ public class InstanceStatusEventProcessor extends TopologyEventProcessor {
CartridgeSubscriptionInfo cartridgeSubscriptionInfo = getCartridgeSubscriptionInfo(clusterDomain);
if(cartridgeSubscriptionInfo != null) {
- Cluster cluster = TopologyManager.getTopology().
- getService(cartridgeSubscriptionInfo.getCartridge()).getCluster(clusterDomain);
+
+ Cluster cluster;
+ //acquire read lock
+ TopologyManager.acquireReadLock();
+ try {
+ cluster = TopologyManager.getTopology().
+ getService(cartridgeSubscriptionInfo.getCartridge()).getCluster(cartridgeSubscriptionInfo.getClusterDomain());
+ } finally {
+ //release read lock
+ TopologyManager.releaseReadLock();
+ }
+ //update the model
TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscriptionInfo.getTenantId(),
cartridgeSubscriptionInfo.getCartridge(),
cartridgeSubscriptionInfo.getAlias(), cluster);
@@ -133,8 +163,18 @@ public class InstanceStatusEventProcessor extends TopologyEventProcessor {
CartridgeSubscriptionInfo cartridgeSubscriptionInfo = getCartridgeSubscriptionInfo(clusterDomain);
if(cartridgeSubscriptionInfo != null) {
- Cluster cluster = TopologyManager.getTopology().
- getService(cartridgeSubscriptionInfo.getCartridge()).getCluster(clusterDomain);
+
+ Cluster cluster;
+ //acquire read lock
+ TopologyManager.acquireReadLock();
+ try {
+ cluster = TopologyManager.getTopology().
+ getService(cartridgeSubscriptionInfo.getCartridge()).getCluster(cartridgeSubscriptionInfo.getClusterDomain());
+ } finally {
+ //release read lock
+ TopologyManager.releaseReadLock();
+ }
+ //update the model
TopologyClusterInformationModel.getInstance().addCluster(cartridgeSubscriptionInfo.getTenantId(),
cartridgeSubscriptionInfo.getCartridge(),
cartridgeSubscriptionInfo.getAlias(), cluster);
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by is...@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/12ac6fb3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/12ac6fb3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/12ac6fb3
Branch: refs/heads/master
Commit: 12ac6fb3c14e02f732fc723e8ecbf0e0f1796684
Parents: 64bc33d 02b6b7f
Author: Isuru <is...@wso2.com>
Authored: Wed Dec 11 21:21:40 2013 +0530
Committer: Isuru <is...@wso2.com>
Committed: Wed Dec 11 21:21:40 2013 +0530
----------------------------------------------------------------------
.../HealthStatisticsEventBuilder.xml | 10 +
.../InstanceStatisticsEventBuilder.xml | 22 +++
.../LoadBalancerStatisticsEventBuilder.xml | 10 +
.../stratos.instance.stats_1.0.0_builder.xml | 10 +
.../AverageLoadAverageEventFormatter.xml | 11 ++
.../AverageMemoryConsumptionEventFormatter.xml | 11 ++
.../AverageRequestsInflightEventFormatter.xml | 11 ++
.../FaultMessageEventFormatter.xml | 11 ++
.../event-formatters/GradientEventFormatter.xml | 11 ++
.../GradientLoadAverageEventFormatter.xml | 11 ++
.../GradientMemoryConsumptionEventFormatter.xml | 11 ++
.../SecondDerivativeEventFormatter.xml | 11 ++
...econdDerivativeLoadAverageEventFormatter.xml | 11 ++
...erivativeMemoryConsumptionEventFormatter.xml | 11 ++
.../HealthStatisticsEventBuilder.xml | 10 -
.../InstanceStatisticsEventBuilder.xml | 22 ---
.../LoadBalancerStatisticsEventBuilder.xml | 10 -
.../stratos.instance.stats_1.0.0_builder.xml | 10 -
.../AverageLoadAverageEventFormatter.xml | 11 --
.../AverageMemoryConsumptionEventFormatter.xml | 11 --
.../AverageRequestsInflightEventFormatter.xml | 11 --
.../FaultMessageEventFormatter.xml | 11 --
.../eventformatters/GradientEventFormatter.xml | 11 --
.../GradientLoadAverageEventFormatter.xml | 11 --
.../GradientMemoryConsumptionEventFormatter.xml | 11 --
.../SecondDerivativeEventFormatter.xml | 11 --
...econdDerivativeLoadAverageEventFormatter.xml | 11 --
...erivativeMemoryConsumptionEventFormatter.xml | 11 --
.../execution-plans/AverageHeathRequest.xml | 23 +++
.../AverageRequestsInflightFinder.xml | 19 ++
.../execution-plans/GradientOfHealthRequest.xml | 23 +++
.../GradientOfRequestsInFlightFinder.xml | 18 ++
.../SecondDerivativeOfHealthRequest.xml | 21 +++
...SecondDerivativeOfRequestsInFlightFinder.xml | 19 ++
.../executionplans/AverageHeathRequest.xml | 23 ---
.../AverageRequestsInflightFinder.xml | 19 --
.../executionplans/GradientOfHealthRequest.xml | 23 ---
.../GradientOfRequestsInFlightFinder.xml | 18 --
.../SecondDerivativeOfHealthRequest.xml | 21 ---
...SecondDerivativeOfRequestsInFlightFinder.xml | 19 --
.../DefaultWSO2EventInputAdaptor.xml | 3 +
.../InstanceStatsInputAdaptor.xml | 9 +
.../DefaultWSO2EventInputAdaptor.xml | 3 -
.../InstanceStatsInputAdaptor.xml | 9 -
.../DefaultWSO2EventOutputAdaptor.xml | 8 +
.../output-event-adaptors/JMSOutputAdaptor.xml | 8 +
.../DefaultWSO2EventOutputAdaptor.xml | 8 -
.../outputeventadaptors/JMSOutputAdaptor.xml | 8 -
.../stream-manager-config.xml | 182 +++++++++++++++++++
.../stream-manager-config.xml | 182 -------------------
50 files changed, 495 insertions(+), 495 deletions(-)
----------------------------------------------------------------------