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/03 09:43:17 UTC
[1/2] git commit: MemberID null check refine when member_fault event
messages received
Updated Branches:
refs/heads/master 5a43d560b -> eeabf459f
MemberID null check refine when member_fault event messages received
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/18e83aaf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/18e83aaf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/18e83aaf
Branch: refs/heads/master
Commit: 18e83aaf0d1b7b687233e0717c1f9f5e6b27201e
Parents: 6029d2b
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Dec 3 14:11:09 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Dec 3 14:11:09 2013 -0500
----------------------------------------------------------------------
.../message/receiver/health/HealthEventMessageDelegator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/18e83aaf/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 55d3018..2f0a3e2 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
@@ -60,7 +60,7 @@ public class HealthEventMessageDelegator implements Runnable {
messageProperties = setEventValues(messageText);
this.clusterId = messageProperties.get("cluster_id");
- log.info("Received event " + eventName);
+ log.info("Received event " + eventName + " for cluster " + this.clusterId);
if(Constants.AVERAGE_REQUESTS_IN_FLIGHT.equals(eventName)){
Float messageValue = Float.parseFloat(messageProperties.get("value"));
@@ -75,8 +75,9 @@ public class HealthEventMessageDelegator implements Runnable {
AutoscalerContext.getInstance().getClusterContext(clusterId).setRequestsInFlightSecondDerivative(messageValue);
}else if (Constants.MEMBER_FAULT_EVENT_NAME.equals(eventName)){
+
String memberId = messageProperties.get("member_id");
- if(memberId != null && !memberId.isEmpty())
+ if(memberId == null || memberId.isEmpty())
log.error("MemberId is not included in the received message");
handleMemberfaultEvent(memberId);
}
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ud...@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/eeabf459
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/eeabf459
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/eeabf459
Branch: refs/heads/master
Commit: eeabf459f03ea96c4264d3ac6e105b429db6909b
Parents: 18e83aa 5a43d56
Author: Udara Liyanage <ud...@wso2.com>
Authored: Tue Dec 3 14:12:37 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Tue Dec 3 14:12:37 2013 -0500
----------------------------------------------------------------------
.../src/test/resources/autoscaler-old.drl | 97 ++++++++++++++------
.../src/test/resources/autoscaler.drl | 97 ++++++--------------
2 files changed, 97 insertions(+), 97 deletions(-)
----------------------------------------------------------------------