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/10/18 19:15:45 UTC
git commit: updating the status
Repository: stratos
Updated Branches:
refs/heads/4.0.0-grouping f00e2f369 -> 3c2d3e722
updating the status
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3c2d3e72
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3c2d3e72
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3c2d3e72
Branch: refs/heads/4.0.0-grouping
Commit: 3c2d3e7222f72646dfced66d75d372800ab0aabc
Parents: f00e2f3
Author: reka <rt...@gmail.com>
Authored: Sat Oct 18 22:44:16 2014 +0530
Committer: reka <rt...@gmail.com>
Committed: Sat Oct 18 22:44:16 2014 +0530
----------------------------------------------------------------------
.../stratos/cloud/controller/topology/TopologyBuilder.java | 2 +-
.../cloud/controller/topology/TopologyEventPublisher.java | 2 +-
.../org/apache/stratos/messaging/domain/topology/Status.java | 5 +++--
.../topology/ClusterMaintenanceModeMessageProcessor.java | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3c2d3e72/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
index 5a90264..6645529 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java
@@ -209,7 +209,7 @@ public class TopologyBuilder {
try {
TopologyManager.acquireWriteLock();
Cluster cluster = service.getCluster(ctxt.getClusterId());
- cluster.setStatus(Status.In_Maintenance);
+ cluster.setStatus(Status.In_Active);
TopologyManager.updateTopology(topology);
} finally {
TopologyManager.releaseWriteLock();
http://git-wip-us.apache.org/repos/asf/stratos/blob/3c2d3e72/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java
index a6d8350..2cb1eeb 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyEventPublisher.java
@@ -124,7 +124,7 @@ public class TopologyEventPublisher {
public static void sendClusterMaintenanceModeEvent(ClusterContext ctxt) {
ClusterMaintenanceModeEvent clusterMaintenanceModeEvent = new ClusterMaintenanceModeEvent(ctxt.getCartridgeType(), ctxt.getClusterId());
- clusterMaintenanceModeEvent.setStatus(Status.In_Maintenance);
+ clusterMaintenanceModeEvent.setStatus(Status.In_Active);
if(log.isInfoEnabled()) {
log.info(String.format("Publishing cluster maintenance mode event: [service] %s [cluster] %s",
clusterMaintenanceModeEvent.getServiceName(), clusterMaintenanceModeEvent.getClusterId()));
http://git-wip-us.apache.org/repos/asf/stratos/blob/3c2d3e72/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Status.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Status.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Status.java
index 7ba27fc..2bd0945 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Status.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Status.java
@@ -24,8 +24,9 @@ public enum Status {
Created(1),
Running(2),
Activated(3),
- In_Maintenance(4),
- Removed(5);
+ In_Active(4),
+ Terminating(4),
+ Terminated(5);
private int code;
http://git-wip-us.apache.org/repos/asf/stratos/blob/3c2d3e72/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterMaintenanceModeMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterMaintenanceModeMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterMaintenanceModeMessageProcessor.java
index 57d7c45..4dc573e 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterMaintenanceModeMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterMaintenanceModeMessageProcessor.java
@@ -110,7 +110,7 @@ public class ClusterMaintenanceModeMessageProcessor extends MessageProcessor {
}
} else {
// Apply changes to the topology
- cluster.setStatus(Status.In_Maintenance);
+ cluster.setStatus(Status.In_Active);
if (log.isInfoEnabled()) {
log.info(String.format("Cluster updated as maintenance mode: %s",
cluster.toString()));