Repository: stratos Updated Branches: refs/heads/4.0.0-grouping 54e720ce3 -> c6cadf0bf
changes related to LifeCycleStateManager, adding an identifier for the ease of logging Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c6cadf0b Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c6cadf0b Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c6cadf0b Branch: refs/heads/4.0.0-grouping Commit: c6cadf0bfc940595f724208f12c125d310673b92 Parents: 54e720c Author: Isuru Haththotuwa <[email protected]> Authored: Thu Oct 23 14:26:30 2014 +0530 Committer: Isuru Haththotuwa <[email protected]> Committed: Thu Oct 23 14:26:42 2014 +0530 ---------------------------------------------------------------------- .../controller/topology/TopologyBuilder.java | 2 -- .../messaging/domain/topology/Application.java | 2 +- .../messaging/domain/topology/Cluster.java | 2 +- .../messaging/domain/topology/Group.java | 2 +- .../messaging/domain/topology/Member.java | 2 +- .../lifecycle/LifeCycleStateManager.java | 26 ++++++++++++++------ .../ApplicationActivatedMessageProcessor.java | 5 +--- .../ApplicationInactivatedMessageProcessor.java | 5 +--- .../ApplicationTerminatedMessageProcessor.java | 5 +--- .../ApplicationTerminatingMessageProcessor.java | 5 +--- .../ApplicationUndeployedMessageProcessor.java | 3 --- .../topology/ClusterActivatedProcessor.java | 5 +--- .../topology/ClusterInActivateProcessor.java | 5 +--- .../topology/GroupActivatedProcessor.java | 5 +--- .../topology/GroupTerminatedProcessor.java | 5 +--- .../topology/GroupTerminatingProcessor.java | 5 +--- 16 files changed, 31 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/c6cadf0b/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 ac409c7..9b21c55 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 @@ -717,8 +717,6 @@ public class TopologyBuilder { } // for now anyway update the status forcefully aCluster.setStatus(ClusterStatus.Terminating); - log.info("Cluster " + clusterDataHolder.getClusterId() + "'s status updated to " - + ClusterStatus.Terminating); } else { log.warn("Unable to find Cluster with cluster id " + clusterDataHolder.getClusterId() + http://git-wip-us.apache.org/repos/asf/stratos/blob/c6cadf0b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Application.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Application.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Application.java index ecca8df..0e4438b 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Application.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Application.java @@ -49,7 +49,7 @@ public class Application extends ParentComponent implements LifeCycleStateTransi this.id = id; this.key = RandomStringUtils.randomAlphanumeric(16); this.applicationStateManager = - new LifeCycleStateManager<ApplicationStatus>(ApplicationStatus.Created); + new LifeCycleStateManager<ApplicationStatus>(ApplicationStatus.Created, id); } public String getUniqueIdentifier() { http://git-wip-us.apache.org/repos/asf/stratos/blob/c6cadf0b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java index e990903..1f69fd6 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Cluster.java @@ -68,7 +68,7 @@ public class Cluster implements Serializable, LifeCycleStateTransitionBehavior<C this.hostNames = new ArrayList<String>(); this.memberMap = new HashMap<String, Member>(); this.appId = appId; - this.clusterStateManager = new LifeCycleStateManager<ClusterStatus>(ClusterStatus.Created); + this.clusterStateManager = new LifeCycleStateManager<ClusterStatus>(ClusterStatus.Created, clusterId); // temporary; should be removed //this.status = ClusterStatus.Created; } http://git-wip-us.apache.org/repos/asf/stratos/blob/c6cadf0b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Group.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Group.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Group.java index 0b64f67..79ce4bc 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Group.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/Group.java @@ -45,7 +45,7 @@ public class Group extends ParentComponent implements LifeCycleStateTransitionBe super(); this.name = name; this.alias = alias; - this.groupStateManager = new LifeCycleStateManager<GroupStatus>(GroupStatus.Created); + this.groupStateManager = new LifeCycleStateManager<GroupStatus>(GroupStatus.Created, alias); } public String getUniqueIdentifier() { http://git-wip-us.apache.org/repos/asf/stratos/blob/c6cadf0b/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 1d80b16..fbab2f6 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 @@ -58,7 +58,7 @@ public class Member implements Serializable, LifeCycleStateTransitionBehavior<Me this.partitionId = partitionId; this.memberId = memberId; this.portMap = new HashMap<Integer, Port>(); - this.memberStateManager = new LifeCycleStateManager<MemberStatus>(MemberStatus.Created); + this.memberStateManager = new LifeCycleStateManager<MemberStatus>(MemberStatus.Created, memberId); } public String getServiceName() { http://git-wip-us.apache.org/repos/asf/stratos/blob/c6cadf0b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/lifecycle/LifeCycleStateManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/lifecycle/LifeCycleStateManager.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/lifecycle/LifeCycleStateManager.java index 9151bb1..f57edf8 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/lifecycle/LifeCycleStateManager.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/domain/topology/lifecycle/LifeCycleStateManager.java @@ -32,11 +32,17 @@ public class LifeCycleStateManager<T extends LifeCycleState> implements Serializ private Stack<T> stateStack; - public LifeCycleStateManager(T initialState) { + // a unique id which points to the relevant topology member + // ex.: member id in a Member + private String identifier; + public LifeCycleStateManager(T initialState, String identifier) { + + this.identifier = identifier; stateStack = new Stack<T>(); stateStack.push(initialState); - log.info("Life Cycle State Manager started, initial state: " + initialState.toString()); + log.info("Life Cycle State Manager started for Topology element [ " + identifier + + " ], initial state: " + initialState.toString()); } /** @@ -45,7 +51,7 @@ public class LifeCycleStateManager<T extends LifeCycleState> implements Serializ * @param nextState possible next state for the topology element * @param topologyEvent relevant ToplogyEvent * @param <S> subclass of Topology event - * @return + * @return true if preconditions are valid and satisfied, else false */ public <S extends TopologyEvent> boolean isPreConditionsValid (T nextState, S topologyEvent) { // TODO: implement @@ -66,15 +72,15 @@ public class LifeCycleStateManager<T extends LifeCycleState> implements Serializ /** * Changes the current state to nextState * - * @param nextState + * @param nextState the next state to change */ public void changeState (T nextState) { stateStack.push(nextState); + log.info("Topology element [ " + identifier + " ]'s life Cycle State changed from [ " + + getPreviousState() + " ] to [ " + getCurrentState() + " ]"); if (log.isDebugEnabled()) { printStateTransitions(stateStack); -// log.debug("Life Cycle State changed from [ " + getPreviousState() + " ] to [ " + -// getCurrentState() + " ]"); } } @@ -112,10 +118,14 @@ public class LifeCycleStateManager<T extends LifeCycleState> implements Serializ // print all transitions till now StringBuilder stateTransitions = new StringBuilder("Transitioned States: [ START --> "); - for (int i = 0 ; i < stateStack.size() ; i++) { - stateTransitions.append(stateStack.get(i) + " --> "); + for (T aStateStack : stateStack) { + stateTransitions.append(aStateStack).append(" --> "); } stateTransitions.append(" END ]"); log.debug(stateTransitions); } + + public String getIdentifier() { + return identifier; + } } http://git-wip-us.apache.org/repos/asf/stratos/blob/c6cadf0b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationActivatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationActivatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationActivatedMessageProcessor.java index ed360be..064fb9c 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationActivatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationActivatedMessageProcessor.java @@ -93,10 +93,7 @@ public class ApplicationActivatedMessageProcessor extends MessageProcessor { " ] to [ " + ApplicationStatus.Active + " ]"); } application.setStatus(ApplicationStatus.Active); - if (log.isInfoEnabled()) { - log.info(String.format("Application updated as activated : %s", - application.toString())); - } + } // Notify event listeners http://git-wip-us.apache.org/repos/asf/stratos/blob/c6cadf0b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationInactivatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationInactivatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationInactivatedMessageProcessor.java index a2bdb60..cda1d73 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationInactivatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationInactivatedMessageProcessor.java @@ -93,10 +93,7 @@ public class ApplicationInactivatedMessageProcessor extends MessageProcessor { " ] to [ " + ApplicationStatus.Inactive + " ]"); } application.setStatus(ApplicationStatus.Inactive); - if (log.isInfoEnabled()) { - log.info(String.format("Application updated as inactivated : %s", - application.toString())); - } + } // Notify event listeners http://git-wip-us.apache.org/repos/asf/stratos/blob/c6cadf0b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationTerminatedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationTerminatedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationTerminatedMessageProcessor.java index b08e6f9..2d22c6c 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationTerminatedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationTerminatedMessageProcessor.java @@ -93,10 +93,7 @@ public class ApplicationTerminatedMessageProcessor extends MessageProcessor { " ] to [ " + ApplicationStatus.Terminated + " ]"); } application.setStatus(ApplicationStatus.Terminated); - if (log.isInfoEnabled()) { - log.info(String.format("Application updated as terminating : %s", - application.toString())); - } + } // Notify event listeners http://git-wip-us.apache.org/repos/asf/stratos/blob/c6cadf0b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationTerminatingMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationTerminatingMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationTerminatingMessageProcessor.java index 2c1ed00..cb6e887 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationTerminatingMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationTerminatingMessageProcessor.java @@ -93,10 +93,7 @@ public class ApplicationTerminatingMessageProcessor extends MessageProcessor { " ] to [ " + ApplicationStatus.Terminating + " ]"); } application.setStatus(ApplicationStatus.Terminating); - if (log.isInfoEnabled()) { - log.info(String.format("Application updated as activated : %s", - application.toString())); - } + } // Notify event listeners http://git-wip-us.apache.org/repos/asf/stratos/blob/c6cadf0b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationUndeployedMessageProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationUndeployedMessageProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationUndeployedMessageProcessor.java index 8915e4f..04c6973 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationUndeployedMessageProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ApplicationUndeployedMessageProcessor.java @@ -102,7 +102,6 @@ public class ApplicationUndeployedMessageProcessor extends MessageProcessor { } // for now anyway update the status forcefully application.setStatus(ApplicationStatus.Terminating); - log.info("Application " + event.getApplicationId() + "'s status updated to " + ApplicationStatus.Terminating); // update all the Clusters' statuses to 'Terminating' Set<ClusterDataHolder> clusterData = application.getClusterDataRecursively(); @@ -119,8 +118,6 @@ public class ApplicationUndeployedMessageProcessor extends MessageProcessor { } // for now anyway update the status forcefully aCluster.setStatus(ClusterStatus.Terminating); - log.info("Cluster " + clusterDataHolder.getClusterId() + "'s status updated to " - + ClusterStatus.Terminating + " successfully"); } else { log.warn("Unable to find Cluster with cluster id " + clusterDataHolder.getClusterId() + http://git-wip-us.apache.org/repos/asf/stratos/blob/c6cadf0b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterActivatedProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterActivatedProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterActivatedProcessor.java index f2f2521..899b12f 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterActivatedProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterActivatedProcessor.java @@ -122,10 +122,7 @@ public class ClusterActivatedProcessor extends MessageProcessor { log.error("Invalid State Transition from " + cluster.getStatus() + " to " + ClusterStatus.Active); } cluster.setStatus(ClusterStatus.Active); - if (log.isInfoEnabled()) { - log.info(String.format("Cluster updated as activated : %s", - cluster.toString())); - } + } // Notify event listeners http://git-wip-us.apache.org/repos/asf/stratos/blob/c6cadf0b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInActivateProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInActivateProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInActivateProcessor.java index c9499fb..cfaad73 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInActivateProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInActivateProcessor.java @@ -121,10 +121,7 @@ public class ClusterInActivateProcessor extends MessageProcessor { log.error("Invalid State Transition from " + cluster.getStatus() + " to " + ClusterStatus.Inactive); } cluster.setStatus(ClusterStatus.Inactive); - if (log.isInfoEnabled()) { - log.info(String.format("Cluster updated as maintenance mode: %s", - cluster.toString())); - } + } // Notify event listeners http://git-wip-us.apache.org/repos/asf/stratos/blob/c6cadf0b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupActivatedProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupActivatedProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupActivatedProcessor.java index d7f2de6..aa050ef 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupActivatedProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupActivatedProcessor.java @@ -94,10 +94,7 @@ public class GroupActivatedProcessor extends MessageProcessor { log.error("Invalid State Transition from " + group.getStatus() + " to " + GroupStatus.Active); } group.setStatus(GroupStatus.Active); - if (log.isInfoEnabled()) { - log.info(String.format("Group updated as activated : %s", - group.getUniqueIdentifier())); - } + } // Notify event listeners http://git-wip-us.apache.org/repos/asf/stratos/blob/c6cadf0b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupTerminatedProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupTerminatedProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupTerminatedProcessor.java index 6196776..5e96709 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupTerminatedProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupTerminatedProcessor.java @@ -97,10 +97,7 @@ public class GroupTerminatedProcessor extends MessageProcessor { log.error("Invalid State Transition from " + group.getStatus() + " to " + GroupStatus.Active); } group.setStatus(GroupStatus.Terminated); - if (log.isInfoEnabled()) { - log.info(String.format("Group updated as activated : %s", - group.getUniqueIdentifier())); - } + } // Notify event listeners http://git-wip-us.apache.org/repos/asf/stratos/blob/c6cadf0b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupTerminatingProcessor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupTerminatingProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupTerminatingProcessor.java index afec0f2..210279c 100644 --- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupTerminatingProcessor.java +++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/GroupTerminatingProcessor.java @@ -97,10 +97,7 @@ public class GroupTerminatingProcessor extends MessageProcessor { log.error("Invalid State Transition from " + group.getStatus() + " to " + GroupStatus.Active); } group.setStatus(GroupStatus.Terminating); - if (log.isInfoEnabled()) { - log.info(String.format("Group updated as Terminating : %s", - group.getUniqueIdentifier())); - } + } // Notify event listeners
