You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2014/10/13 11:43:32 UTC
[1/3] git commit: checking whether member is in the topology when
updating memberTimeStampMap
Repository: stratos
Updated Branches:
refs/heads/master d77e16128 -> 8105f276e
checking whether member is in the topology when updating memberTimeStampMap
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d33ae46a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d33ae46a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d33ae46a
Branch: refs/heads/master
Commit: d33ae46a748af953304cc6e1d9195b4fefbc959c
Parents: be94843
Author: R-Rajkumar <rr...@gmail.com>
Authored: Mon Oct 13 13:27:37 2014 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Mon Oct 13 13:27:37 2014 +0530
----------------------------------------------------------------------
.../stratos/cep/extension/FaultHandlingWindowProcessor.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d33ae46a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
----------------------------------------------------------------------
diff --git a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
index 34333ad..f3ab64d 100644
--- a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
+++ b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
@@ -102,6 +102,15 @@ public class FaultHandlingWindowProcessor extends WindowProcessor implements Run
*/
protected void addDataToMap(InEvent event) {
String id = (String) event.getData()[memberIdAttrIndex];
+ //checking whether this member is the topology.
+ //sometimes there can be a delay between publishing member terminated events
+ //and actually terminating instances. Hence CEP might get events for already terminated members
+ //so we are checking the topology for the member existence
+ Member member = getMemberFromId(id);
+ if (null == member) {
+ log.debug("Member not found in the toplogy. Event rejected");
+ return;
+ }
if (StringUtils.isNotEmpty(id)) {
memberTimeStampMap.put(id, event.getTimeStamp());
} else {
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/stratos
Posted by ra...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8105f276
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8105f276
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8105f276
Branch: refs/heads/master
Commit: 8105f276eb171ba630cfb55be2540652a05cdff8
Parents: 6994011 d77e161
Author: R-Rajkumar <rr...@gmail.com>
Authored: Mon Oct 13 15:13:15 2014 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Mon Oct 13 15:13:15 2014 +0530
----------------------------------------------------------------------
.../java/org/apache/stratos/cli/RestClient.java | 34 +------
.../stratos/cli/RestCommandLineService.java | 99 ++++++++++----------
.../autoscaler/partition/PropertyBean.java | 6 ++
.../stratos/cli/beans/topology/Cluster.java | 14 +++
.../stratos/cli/beans/topology/Member.java | 19 +++-
.../org/apache/stratos/cli/utils/CliUtils.java | 63 ++++++++++---
.../impl/CloudControllerServiceImpl.java | 3 +-
.../topology/TopologyEventPublisher.java | 4 +-
.../model/TopologyClusterInformationModel.java | 2 +-
.../messaging/domain/topology/Cluster.java | 17 ++--
.../messaging/domain/topology/Member.java | 8 ++
.../InstanceSpawnedMessageProcessor.java | 5 +-
.../rest/endpoint/bean/topology/Cluster.java | 21 +++--
.../rest/endpoint/bean/topology/Member.java | 17 +++-
.../bean/util/converter/PojoConverter.java | 23 ++++-
.../distribution/src/main/conf/autoscaler.xml | 2 +-
16 files changed, 214 insertions(+), 123 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: using try catch when reading topology
Posted by ra...@apache.org.
using try catch when reading topology
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/69940114
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/69940114
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/69940114
Branch: refs/heads/master
Commit: 69940114bea87832fcca36d85a57235090606ee6
Parents: d33ae46
Author: R-Rajkumar <rr...@gmail.com>
Authored: Mon Oct 13 15:04:37 2014 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Mon Oct 13 15:04:37 2014 +0530
----------------------------------------------------------------------
.../extension/FaultHandlingWindowProcessor.java | 34 +++++++++++---------
1 file changed, 19 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/69940114/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
----------------------------------------------------------------------
diff --git a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
index f3ab64d..4563323 100644
--- a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
+++ b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
@@ -176,26 +176,30 @@ public class FaultHandlingWindowProcessor extends WindowProcessor implements Run
return null;
}
if (TopologyManager.getTopology().isInitialized()){
- TopologyManager.acquireReadLock();
- if (TopologyManager.getTopology().getServices() == null){
- return null;
- }
-
- // TODO make this efficient by adding APIs to messaging component
- for (Service service : TopologyManager.getTopology().getServices()) {
- if (service.getClusters() != null) {
- for (Cluster cluster : service.getClusters()) {
- if (cluster.getMembers() != null) {
- for (Member member : cluster.getMembers()){
- if (memberId.equals(member.getMemberId())){
- return member;
+ try {
+ TopologyManager.acquireReadLock();
+ if (TopologyManager.getTopology().getServices() == null){
+ return null;
+ }
+ // TODO make this efficient by adding APIs to messaging component
+ for (Service service : TopologyManager.getTopology().getServices()) {
+ if (service.getClusters() != null) {
+ for (Cluster cluster : service.getClusters()) {
+ if (cluster.getMembers() != null) {
+ for (Member member : cluster.getMembers()){
+ if (memberId.equals(member.getMemberId())){
+ return member;
+ }
}
}
}
}
}
- }
- TopologyManager.releaseReadLock();
+ } catch (Exception e) {
+ log.error("Error while reading topology" + e);
+ } finally {
+ TopologyManager.releaseReadLock();
+ }
}
return null;
}