You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/10/30 05:13:32 UTC

[08/50] [abbrv] git commit: fixing fault handling issue in autoscaler

fixing fault handling issue in autoscaler


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/07c51099
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/07c51099
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/07c51099

Branch: refs/heads/docker-grouping-merge
Commit: 07c510997acbcbd7ab377fcbff1bd808181c3bd1
Parents: 7a5797d
Author: reka <rt...@gmail.com>
Authored: Mon Oct 27 14:11:38 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Mon Oct 27 14:14:22 2014 +0530

----------------------------------------------------------------------
 .../receiver/health/AutoscalerHealthStatEventReceiver.java       | 2 +-
 .../apache/stratos/autoscaler/status/checker/StatusChecker.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/07c51099/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/AutoscalerHealthStatEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/AutoscalerHealthStatEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/AutoscalerHealthStatEventReceiver.java
index b909749..f090fcb 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/AutoscalerHealthStatEventReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/message/receiver/health/AutoscalerHealthStatEventReceiver.java
@@ -663,7 +663,7 @@ public class AutoscalerHealthStatEventReceiver implements Runnable {
             // remove from active member list
             partitionCtxt.removeActiveMemberById(memberId);
             //Check the clusterStatus as part of the member fault event
-            StatusChecker.getInstance().onMemberFaultEvent(clusterId, "appId", partitionCtxt);
+            StatusChecker.getInstance().onMemberFaultEvent(clusterId, partitionCtxt);
 
 
             if (log.isInfoEnabled()) {

http://git-wip-us.apache.org/repos/asf/stratos/blob/07c51099/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java
index 7019d0b..6309e02 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java
@@ -124,12 +124,12 @@ public class StatusChecker {
 
     /**
      * @param clusterId
-     * @param appId
      * @param partitionContext is to decide in which partition has less members while others have active members
      */
-    public void onMemberFaultEvent(final String clusterId, final String appId, final PartitionContext partitionContext) {
+    public void onMemberFaultEvent(final String clusterId, final PartitionContext partitionContext) {
         ClusterMonitor monitor = (ClusterMonitor) AutoscalerContext.getInstance().getMonitor(clusterId);
         boolean clusterInActive = getClusterInActive(monitor, partitionContext);
+        String appId = monitor.getAppId();
         if (clusterInActive) {
             //TODO evaluate life cycle
             //send cluster In-Active event to cluster status topic