You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2014/12/05 06:37:10 UTC
stratos git commit: fixing status calculation issue
Repository: stratos
Updated Branches:
refs/heads/master 3405862ec -> e65dd4cad
fixing status calculation issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e65dd4ca
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e65dd4ca
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e65dd4ca
Branch: refs/heads/master
Commit: e65dd4cadbfebc81b57506b7949a0b8c8464c11b
Parents: 3405862
Author: reka <rt...@gmail.com>
Authored: Fri Dec 5 11:00:52 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Fri Dec 5 11:01:06 2014 +0530
----------------------------------------------------------------------
.../autoscaler/event/publisher/ClusterStatusEventPublisher.java | 3 ++-
.../status/processor/cluster/ClusterStatusInActiveProcessor.java | 2 +-
.../processor/cluster/ClusterStatusTerminatedProcessor.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e65dd4ca/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java
index 5ce090d..af3e2eb 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/publisher/ClusterStatusEventPublisher.java
@@ -122,7 +122,8 @@ public class ClusterStatusEventPublisher {
if (clusterInstance.isStateTransitionValid(ClusterStatus.Active) &&
clusterInstance.getStatus() != ClusterStatus.Active) {
ClusterStatusClusterActivatedEvent clusterActivatedEvent =
- new ClusterStatusClusterActivatedEvent(appId, serviceName, clusterId, "test***");
+ new ClusterStatusClusterActivatedEvent(appId, serviceName,
+ clusterId, instanceId);
publishEvent(clusterActivatedEvent);
} else {
http://git-wip-us.apache.org/repos/asf/stratos/blob/e65dd4ca/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusInActiveProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusInActiveProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusInActiveProcessor.java
index 83cb2cf..91305bf 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusInActiveProcessor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusInActiveProcessor.java
@@ -97,7 +97,7 @@ public class ClusterStatusInActiveProcessor extends ClusterStatusProcessor {
ClusterInstanceContext instanceContext = clusterLevelNetworkPartitionContext.
getClusterInstanceContext(instanceId);
if(instanceContext != null) {
- if(instanceContext.getActiveMembers() < instanceContext.getMaxInstanceCount()) {
+ if(instanceContext.getActiveMembers() < instanceContext.getMinInstanceCount()) {
clusterInActive = true;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e65dd4ca/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java
index 0a4fdd2..729e431 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusTerminatedProcessor.java
@@ -56,7 +56,7 @@ public class ClusterStatusTerminatedProcessor extends ClusterStatusProcessor {
} else {
if (nextProcessor != null) {
// ask the next processor to take care of the message.
- return nextProcessor.process(null, clusterId, instanceId);
+ return nextProcessor.process(type, clusterId, instanceId);
} else {
throw new RuntimeException(String.format("Failed to process message using " +
"available message processors: [type] %s [cluster] %s [instance]",