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 2015/01/19 07:20:14 UTC

stratos git commit: Changing MemberStatus.Activated to MemberStatus.Active to be consistent with other entities

Repository: stratos
Updated Branches:
  refs/heads/master ba5dc26b1 -> 88f8de938


Changing MemberStatus.Activated to MemberStatus.Active to be consistent with other entities


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

Branch: refs/heads/master
Commit: 88f8de93852d932420b060c3b72174b933cc080c
Parents: ba5dc26
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Jan 19 11:50:05 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Jan 19 11:50:05 2015 +0530

----------------------------------------------------------------------
 .../autoscaler/context/cluster/ClusterContext.java        |  2 +-
 .../agent/extensions/DefaultExtensionHandler.java         | 10 +++++-----
 .../controller/messaging/topology/TopologyBuilder.java    |  8 ++++----
 .../services/impl/CloudControllerServiceImpl.java         |  4 ++--
 .../load/balancer/conf/LoadBalancerConfiguration.java     |  2 +-
 .../receiver/LoadBalancerTopologyEventReceiver.java       |  4 ++--
 .../apache/stratos/messaging/domain/topology/Member.java  |  2 +-
 .../stratos/messaging/domain/topology/MemberStatus.java   |  6 +++---
 .../topology/MemberActivatedMessageProcessor.java         |  8 ++++----
 .../stratos/rest/endpoint/api/StratosApiV40Utils.java     |  2 +-
 .../cep/extension/FaultHandlingWindowProcessor.java       |  2 +-
 11 files changed, 25 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/88f8de93/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java
index 1100340..1b8154e 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterContext.java
@@ -319,7 +319,7 @@ public class ClusterContext extends AbstractClusterContext {
                 memberContext.setPartition(partition);
                 memberContext.setProperties(AutoscalerUtil.toStubProperties(member.getProperties()));
 
-                if (MemberStatus.Activated.equals(member.getStatus())) {
+                if (MemberStatus.Active.equals(member.getStatus())) {
                     clusterLevelPartitionContext.addActiveMember(memberContext);
                     if (log.isDebugEnabled()) {
                         String msg = String.format("Active member read from topology and added to active member list: %s", member.toString());

http://git-wip-us.apache.org/repos/asf/stratos/blob/88f8de93/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java
index ee51c5c..1403c56 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java
@@ -578,7 +578,7 @@ public class DefaultExtensionHandler implements ExtensionHandler {
 
                 List<Member> apistoreMemberList = new ArrayList<Member>();
                 for (Member member : apistoreClusterCollection.iterator().next().getMembers()) {
-                    if (member.getStatus().equals(MemberStatus.Starting) || member.getStatus().equals(MemberStatus.Activated)) {
+                    if (member.getStatus().equals(MemberStatus.Starting) || member.getStatus().equals(MemberStatus.Active)) {
                         apistoreMemberList.add(member);
                         this.wkMembers.add(member);
                     }
@@ -597,7 +597,7 @@ public class DefaultExtensionHandler implements ExtensionHandler {
 
                 List<Member> publisherMemberList = new ArrayList<Member>();
                 for (Member member : publisherClusterCollection.iterator().next().getMembers()) {
-                    if (member.getStatus().equals(MemberStatus.Starting) || member.getStatus().equals(MemberStatus.Activated)) {
+                    if (member.getStatus().equals(MemberStatus.Starting) || member.getStatus().equals(MemberStatus.Active)) {
                         publisherMemberList.add(member);
                         this.wkMembers.add(member);
                     }
@@ -659,7 +659,7 @@ public class DefaultExtensionHandler implements ExtensionHandler {
                 if (member.getProperties() != null &&
                         member.getProperties().containsKey("PRIMARY") &&
                         member.getProperties().getProperty("PRIMARY").toLowerCase().equals("true") &&
-                        (member.getStatus().equals(MemberStatus.Starting) || member.getStatus().equals(MemberStatus.Activated))
+                        (member.getStatus().equals(MemberStatus.Starting) || member.getStatus().equals(MemberStatus.Active))
                         ) {
                     wkMembers.add(member);
                     this.wkMembers.add(member);
@@ -734,7 +734,7 @@ public class DefaultExtensionHandler implements ExtensionHandler {
 
                 if (member.getProperties() != null && member.getProperties().containsKey("PRIMARY") &&
                         member.getProperties().getProperty("PRIMARY").toLowerCase().equals("true") &&
-                        (member.getStatus().equals(MemberStatus.Starting) || member.getStatus().equals(MemberStatus.Activated))) {
+                        (member.getStatus().equals(MemberStatus.Starting) || member.getStatus().equals(MemberStatus.Active))) {
 
                     managerWkaMembers.add(member);
                     this.wkMembers.add(member);
@@ -807,7 +807,7 @@ public class DefaultExtensionHandler implements ExtensionHandler {
                 if (member.getProperties() != null &&
                         member.getProperties().containsKey("PRIMARY") &&
                         member.getProperties().getProperty("PRIMARY").toLowerCase().equals("true") &&
-                        (member.getStatus().equals(MemberStatus.Starting) || member.getStatus().equals(MemberStatus.Activated))) {
+                        (member.getStatus().equals(MemberStatus.Starting) || member.getStatus().equals(MemberStatus.Active))) {
                     if (log.isDebugEnabled()) {
                         log.debug("Added worker member " + member.getMemberId());
                     }

http://git-wip-us.apache.org/repos/asf/stratos/blob/88f8de93/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
index 7c4c7fd..6842d55 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/topology/TopologyBuilder.java
@@ -625,12 +625,12 @@ public class TopologyBuilder {
         try {
             TopologyManager.acquireWriteLock();
             // try update lifecycle state
-            if (!member.isStateTransitionValid(MemberStatus.Activated)) {
+            if (!member.isStateTransitionValid(MemberStatus.Active)) {
                 log.error("Invalid State Transition from " + member.getStatus() + " to " +
-                        MemberStatus.Activated);
+                        MemberStatus.Active);
                 return;
             } else {
-                member.setStatus(MemberStatus.Activated);
+                member.setStatus(MemberStatus.Active);
                 log.info("member started event adding status activated");
                 Cartridge cartridge = CloudControllerContext.getInstance().
                         getCartridge(instanceActivatedEvent.getServiceName());
@@ -659,7 +659,7 @@ public class TopologyBuilder {
                         memberActivatedEvent.getNetworkPartitionId(),
                         memberActivatedEvent.getClusterId(),
                         memberActivatedEvent.getServiceName(),
-                        MemberStatus.Activated.toString(),
+                        MemberStatus.Active.toString(),
                         null);
             }
         } finally {

http://git-wip-us.apache.org/repos/asf/stratos/blob/88f8de93/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
index 3c0daf4..dd0ddf1 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
@@ -593,7 +593,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
      *                 the topology if needed.
      */
     private boolean fixMemberStatus(Member member, Topology topology) {
-        if (member.getStatus() == MemberStatus.Activated) {
+        if (member.getStatus() == MemberStatus.Active) {
             MemberReadyToShutdownEvent memberReadyToShutdownEvent = new MemberReadyToShutdownEvent(
                     member.getServiceName(),
                     member.getClusterId(),
@@ -752,7 +752,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
                     //finding the responding members from the existing members in the topology.
                     int sizeOfRespondingMembers = 0;
                     for (Member member : members) {
-                        if (member.getStatus().getCode() >= MemberStatus.Activated.getCode()) {
+                        if (member.getStatus().getCode() >= MemberStatus.Active.getCode()) {
                             sizeOfRespondingMembers++;
                         }
                     }

http://git-wip-us.apache.org/repos/asf/stratos/blob/88f8de93/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
index 5064233..1c4abce 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/conf/LoadBalancerConfiguration.java
@@ -495,7 +495,7 @@ public class LoadBalancerConfiguration {
                                 Port port = new Port(portNode.getName(), Integer.valueOf(value), Integer.valueOf(proxy));
                                 member.addPort(port);
                             }
-                            member.setStatus(MemberStatus.Activated);
+                            member.setStatus(MemberStatus.Active);
                             cluster.addMember(member);
                         }
                         // Add cluster to service

http://git-wip-us.apache.org/repos/asf/stratos/blob/88f8de93/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerTopologyEventReceiver.java b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerTopologyEventReceiver.java
index 0c8ee28..9e036bf 100644
--- a/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerTopologyEventReceiver.java
+++ b/components/org.apache.stratos.load.balancer/src/main/java/org/apache/stratos/load/balancer/messaging/receiver/LoadBalancerTopologyEventReceiver.java
@@ -74,7 +74,7 @@ public class LoadBalancerTopologyEventReceiver extends TopologyEventReceiver {
                                     }
                                 }
                                 for (Member member : cluster.getMembers()) {
-                                    if (member.getStatus() == MemberStatus.Activated) {
+                                    if (member.getStatus() == MemberStatus.Active) {
                                         addMemberIpsToMemberIpHostnameMap(cluster, member);
                                     }
 
@@ -92,7 +92,7 @@ public class LoadBalancerTopologyEventReceiver extends TopologyEventReceiver {
 
             private boolean clusterHasActiveMembers(Cluster cluster) {
                 for (Member member : cluster.getMembers()) {
-                    if (member.getStatus() == MemberStatus.Activated) {
+                    if (member.getStatus() == MemberStatus.Active) {
                         return true;
                     }
                 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/88f8de93/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java
index ae25888..b8c2b5a 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Member.java
@@ -108,7 +108,7 @@ public class Member implements Serializable, LifeCycleStateTransitionBehavior<Me
     }
 
     public boolean isActive () {
-        return memberStateManager.getCurrentState().equals(MemberStatus.Activated);
+        return memberStateManager.getCurrentState().equals(MemberStatus.Active);
     }
 
     public Collection<Port> getPorts() {

http://git-wip-us.apache.org/repos/asf/stratos/blob/88f8de93/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/MemberStatus.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/MemberStatus.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/MemberStatus.java
index 7fdc9df..7d8f212 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/MemberStatus.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/MemberStatus.java
@@ -47,13 +47,13 @@ public enum MemberStatus implements LifeCycleState {
     Starting(2) {
         @Override
         public Set<LifeCycleState> getNextStates() {
-            return new HashSet<LifeCycleState>(Arrays.asList(MemberStatus.Starting, MemberStatus.Activated));
+            return new HashSet<LifeCycleState>(Arrays.asList(MemberStatus.Starting, MemberStatus.Active));
         }
     },
-    Activated(3) {
+    Active(3) {
         @Override
         public Set<LifeCycleState> getNextStates() {
-            return new HashSet<LifeCycleState>(Arrays.asList(MemberStatus.Activated, MemberStatus.Suspended,
+            return new HashSet<LifeCycleState>(Arrays.asList(MemberStatus.Active, MemberStatus.Suspended,
                     MemberStatus.In_Maintenance, MemberStatus.Starting));
         }
     },

http://git-wip-us.apache.org/repos/asf/stratos/blob/88f8de93/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java
index b66bbea..7511b56 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/MemberActivatedMessageProcessor.java
@@ -148,7 +148,7 @@ public class MemberActivatedMessageProcessor extends MessageProcessor {
             }
         }
 
-        if (member.getStatus() == MemberStatus.Activated) {
+        if (member.getStatus() == MemberStatus.Active) {
             if (log.isDebugEnabled()) {
                 log.debug(String.format("Member already activated: [service] %s [cluster] %s [member] %s",
                         event.getServiceName(),
@@ -161,10 +161,10 @@ public class MemberActivatedMessageProcessor extends MessageProcessor {
             member.addPorts(event.getPorts());
             member.setDefaultPrivateIP(event.getDefaultPrivateIP());
             member.setMemberPrivateIPs(event.getMemberPrivateIPs());
-            if (!member.isStateTransitionValid(MemberStatus.Activated)) {
-                log.error("Invalid State Transition from " + member.getStatus() + " to " + MemberStatus.Activated);
+            if (!member.isStateTransitionValid(MemberStatus.Active)) {
+                log.error("Invalid State Transition from " + member.getStatus() + " to " + MemberStatus.Active);
             }
-            member.setStatus(MemberStatus.Activated);
+            member.setStatus(MemberStatus.Active);
 
             if (log.isInfoEnabled()) {
                 log.info(String.format("Member activated: [service] %s [cluster] %s [member] %s",

http://git-wip-us.apache.org/repos/asf/stratos/blob/88f8de93/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
index a8bb042..a88cec0 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/api/StratosApiV40Utils.java
@@ -746,7 +746,7 @@ public class StratosApiV40Utils {
 //        }
 //
 //        for(Member member : cluster.getMembers()) {
-//            if(member.getStatus().toString().equals(MemberStatus.Activated)) {
+//            if(member.getStatus().toString().equals(MemberStatus.Active)) {
 //                noOfActiveInstances ++;
 //            }
 //        }

http://git-wip-us.apache.org/repos/asf/stratos/blob/88f8de93/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
----------------------------------------------------------------------
diff --git a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
index ee17a24..8175155 100644
--- a/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
+++ b/extensions/cep/stratos-cep-extension/src/main/java/org/apache/stratos/cep/extension/FaultHandlingWindowProcessor.java
@@ -156,7 +156,7 @@ public class FaultHandlingWindowProcessor extends WindowProcessor implements Run
                     if (cluster.getMembers() != null) {
                         for (Member member : cluster.getMembers()) {
                             // we are checking faulty status only in previously activated members
-                            if (member != null && MemberStatus.Activated.equals(member.getStatus())) {
+                            if (member != null && MemberStatus.Active.equals(member.getStatus())) {
                                 // Initialize the member time stamp map from the topology at the beginning
                                 memberTimeStampMap.putIfAbsent(member.getMemberId(), currentTimeStamp);
                             }