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/23 10:11:21 UTC
git commit: fixing dead code in healthEventMessagedelegater
Updated Branches:
refs/heads/master 61e1f8c04 -> d06412657
fixing dead code in healthEventMessagedelegater
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d0641265
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d0641265
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d0641265
Branch: refs/heads/master
Commit: d06412657fda5dfb5346b7f555abf5a746872a55
Parents: 61e1f8c
Author: Udara Liyanage <ud...@wso2.com>
Authored: Mon Dec 23 03:58:39 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Mon Dec 23 03:58:39 2013 -0500
----------------------------------------------------------------------
.../health/HealthEventMessageDelegator.java | 32 ++++++++++++--------
1 file changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/d0641265/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
index 6f6286a..daee00a 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/HealthEventMessageDelegator.java
@@ -211,6 +211,13 @@ public class HealthEventMessageDelegator implements Runnable {
private LoadAverage findLoadAverage(Event event) {
String memberId = event.getProperties().get("member_id");
Member member = findMember(memberId);
+
+ if(null == member){
+ if(log.isErrorEnabled()) {
+ log.error(String.format("Member not found: [member] %s", memberId));
+ }
+ return null;
+ }
AbstractMonitor monitor = AutoscalerContext.getInstance().getMonitor(member.getClusterId());
if(null == monitor){
if(log.isErrorEnabled()) {
@@ -227,12 +234,8 @@ public class HealthEventMessageDelegator implements Runnable {
log.error(String.format("Member context is not available for : [member] %s", memberId));
}
return null;
- } else if(null == member){
- if(log.isErrorEnabled()) {
- log.error(String.format("Member not found: [member] %s", memberId));
- }
- return null;
- } else if(!member.isActive()){
+ }
+ else if(!member.isActive()){
if(log.isDebugEnabled()){
log.debug(String.format("Member activated event has not received for the member %s. Therefore ignoring" +
" the health stat", memberId));
@@ -252,6 +255,14 @@ public class HealthEventMessageDelegator implements Runnable {
private MemoryConsumption findMemoryConsumption(Event event) {
String memberId = event.getProperties().get("member_id");
Member member = findMember(memberId);
+
+ if(null == member){
+ if(log.isErrorEnabled()) {
+ log.error(String.format("Member not found: [member] %s", memberId));
+ }
+ return null;
+ }
+
AbstractMonitor monitor = AutoscalerContext.getInstance().getMonitor(member.getClusterId());
if(null == monitor){
if(log.isErrorEnabled()) {
@@ -259,6 +270,8 @@ public class HealthEventMessageDelegator implements Runnable {
}
return null;
}
+
+
String networkPartitionId = findNetworkPartitionId(memberId);
MemberStatsContext memberStatsContext = monitor.getNetworkPartitionCtxt(networkPartitionId)
.getPartitionCtxt(member.getPartitionId())
@@ -268,12 +281,7 @@ public class HealthEventMessageDelegator implements Runnable {
log.error(String.format("Member context is not available for : [member] %s", memberId));
}
return null;
- } else if(null == member){
- if(log.isErrorEnabled()) {
- log.error(String.format("Member not found: [member] %s", memberId));
- }
- return null;
- } else if(!member.isActive()){
+ }else if(!member.isActive()){
if(log.isDebugEnabled()){
log.debug(String.format("Member activated event has not received for the member %s. Therefore ignoring" +
" the health stat", memberId));