You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/12/12 14:30:28 UTC
stratos git commit: s/InActive/Inative and s/InActivate/Inactivate
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test e28cc3e5b -> 23087d1cf
s/InActive/Inative and s/InActivate/Inactivate
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/23087d1c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/23087d1c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/23087d1c
Branch: refs/heads/4.1.0-test
Commit: 23087d1cff929e6fd6ac477ceb3894e6be2daa3f
Parents: e28cc3e
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri Dec 12 17:46:01 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri Dec 12 19:02:27 2014 +0530
----------------------------------------------------------------------
.../applications/topic/ApplicationBuilder.java | 4 +--
.../topic/ApplicationsEventPublisher.java | 6 ++--
.../publisher/ClusterStatusEventPublisher.java | 6 ++--
.../AutoscalerTopologyEventReceiver.java | 4 +--
.../monitor/cluster/VMClusterMonitor.java | 4 +--
.../component/ParentComponentMonitor.java | 7 ++--
.../cluster/ClusterStatusInActiveProcessor.java | 27 ++++++++--------
.../cluster/ClusterStatusProcessorChain.java | 6 ++--
.../group/GroupStatusInActiveProcessor.java | 14 ++++----
.../group/GroupStatusProcessorChain.java | 6 ++--
.../status/ClusterStatusTopicReceiver.java | 2 +-
.../messaging/topology/TopologyBuilder.java | 34 ++++++++++----------
.../ClusterInstanceInActivateEventListener.java | 2 +-
.../ApplicationsMessageProcessorChain.java | 8 ++---
.../GroupInstanceInActivateProcessor.java | 4 +--
.../ClusterInstanceInActivateProcessor.java | 4 +--
.../topology/TopologyMessageProcessorChain.java | 10 +++---
17 files changed, 73 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
index 210ce7c..2b3388b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationBuilder.java
@@ -553,7 +553,7 @@ public class ApplicationBuilder {
}
- public static void handleGroupInActivateEvent(String appId, String groupId, String instanceId) {
+ public static void handleGroupInactivateEvent(String appId, String groupId, String instanceId) {
if (log.isDebugEnabled()) {
log.debug("Handling group inactive event: [group]: " + groupId +
" [application-id] " + appId);
@@ -583,7 +583,7 @@ public class ApplicationBuilder {
context.setStatus(status);
updateGroupMonitor(appId, groupId, status, instanceId);
ApplicationHolder.persistApplication(application);
- ApplicationsEventPublisher.sendGroupInstanceInActivateEvent(appId, groupId, instanceId);
+ ApplicationsEventPublisher.sendGroupInstanceInactivateEvent(appId, groupId, instanceId);
} else {
log.warn("Group state transition is not valid: [group-id] " + groupId +
" [instance-id] " + instanceId + " [current-state] " + context.getStatus()
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationsEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationsEventPublisher.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationsEventPublisher.java
index 3f4f207..0dbfa4a 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationsEventPublisher.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/topic/ApplicationsEventPublisher.java
@@ -64,7 +64,7 @@ public class ApplicationsEventPublisher {
publishEvent(groupActivatedEvent);
}
- public static void sendGroupInstanceInActivateEvent(String appId, String groupId, String instanceId) {
+ public static void sendGroupInstanceInactivateEvent(String appId, String groupId, String instanceId) {
if (log.isInfoEnabled()) {
log.info("Publishing Group inactivate event for [application]: " + appId +
" [group]: " + groupId);
@@ -109,9 +109,9 @@ public class ApplicationsEventPublisher {
if (log.isInfoEnabled()) {
log.info("Publishing Application Inactivated event for [application]: " + appId);
}
- ApplicationInstanceInactivatedEvent applicationInActivatedEvent =
+ ApplicationInstanceInactivatedEvent applicationInactivatedEvent =
new ApplicationInstanceInactivatedEvent(appId, instanceId);
- publishEvent(applicationInActivatedEvent);
+ publishEvent(applicationInactivatedEvent);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/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 766f5c8..1dec85a 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
@@ -145,7 +145,7 @@ public class ClusterStatusEventPublisher {
}
}
- public static void sendClusterInActivateEvent(String appId, String serviceName,
+ public static void sendClusterInactivateEvent(String appId, String serviceName,
String clusterId, String instanceId) {
try {
TopologyManager.acquireReadLockForCluster(serviceName, clusterId);
@@ -155,10 +155,10 @@ public class ClusterStatusEventPublisher {
ClusterInstance clusterInstance = cluster.getInstanceContexts(instanceId);
if (clusterInstance.isStateTransitionValid(ClusterStatus.Inactive)){
if(clusterInstance.getStatus() != ClusterStatus.Inactive) {
- ClusterStatusClusterInactivateEvent clusterInActivateEvent =
+ ClusterStatusClusterInactivateEvent clusterInactivateEvent =
new ClusterStatusClusterInactivateEvent(appId, serviceName, clusterId, instanceId);
- publishEvent(clusterInActivateEvent);
+ publishEvent(clusterInactivateEvent);
} else {
if(log.isDebugEnabled()){
log.warn("Cluster is already inactive [cluster] " + clusterId);
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
index 865cfb7..b1217db 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/event/receiver/topology/AutoscalerTopologyEventReceiver.java
@@ -214,10 +214,10 @@ public class AutoscalerTopologyEventReceiver {
}
});
- topologyEventReceiver.addEventListener(new ClusterInstanceInActivateEventListener() {
+ topologyEventReceiver.addEventListener(new ClusterInstanceInactivateEventListener() {
@Override
protected void onEvent(Event event) {
- log.info("[ClusterInActivateEvent] Received: " + event.getClass());
+ log.info("[ClusterInactivateEvent] Received: " + event.getClass());
ClusterInstanceInactivateEvent clusterInactivateEvent = (ClusterInstanceInactivateEvent) event;
String clusterId = clusterInactivateEvent.getClusterId();
String instanceId = clusterInactivateEvent.getInstanceId();
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java
index f121ada..9ebd24f 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/VMClusterMonitor.java
@@ -39,7 +39,7 @@ import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent;
import org.apache.stratos.autoscaler.monitor.events.builder.MonitorStatusEventBuilder;
import org.apache.stratos.autoscaler.rule.AutoscalerRuleEvaluator;
import org.apache.stratos.autoscaler.status.processor.cluster.ClusterStatusActiveProcessor;
-import org.apache.stratos.autoscaler.status.processor.cluster.ClusterStatusInActiveProcessor;
+import org.apache.stratos.autoscaler.status.processor.cluster.ClusterStatusInactiveProcessor;
import org.apache.stratos.autoscaler.status.processor.cluster.ClusterStatusTerminatedProcessor;
import org.apache.stratos.autoscaler.util.AutoScalerConstants;
import org.apache.stratos.autoscaler.util.AutoscalerUtil;
@@ -839,7 +839,7 @@ public class VMClusterMonitor extends AbstractClusterMonitor {
}
ServiceReferenceHolder.getInstance().getClusterStatusProcessorChain().process(
- ClusterStatusInActiveProcessor.class.getName(), clusterId, instanceId);
+ ClusterStatusInactiveProcessor.class.getName(), clusterId, instanceId);
}
@Override
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
index f111102..33bc4cb 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ParentComponentMonitor.java
@@ -292,8 +292,7 @@ public abstract class ParentComponentMonitor extends Monitor {
protected void onChildInactiveEvent(String childId, final String instanceId) {
List<ApplicationChildContext> terminationList;
terminationList = this.startupDependencyTree.getTerminationDependencies(childId);
-
- //Need to notify the parent about the status change from Active-->InActive
+ //Need to notify the parent about the status change from Active-->Inactive
// TODO to make app also inaction if (this.parent != null) {
ServiceReferenceHolder.getInstance().getGroupStatusProcessorChain().
process(id, appId, instanceId);
@@ -603,11 +602,11 @@ public abstract class ParentComponentMonitor extends Monitor {
return hasInDepChild;
}
- public Map<String, List<String>> getAliasToInActiveMonitorsMap() {
+ public Map<String, List<String>> getAliasToInactiveMonitorsMap() {
return this.inactiveInstancesMap;
}
- public void setAliasToInActiveMonitorsMap(Map<String, List<String>> inactiveMonitorsList) {
+ public void setAliasToInactiveMonitorsMap(Map<String, List<String>> inactiveMonitorsList) {
this.inactiveInstancesMap = inactiveMonitorsList;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/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 dc55c3b..852beb3 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
@@ -22,7 +22,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.autoscaler.context.AutoscalerContext;
import org.apache.stratos.autoscaler.context.cluster.ClusterInstanceContext;
-import org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionContext;
import org.apache.stratos.autoscaler.context.partition.network.ClusterLevelNetworkPartitionContext;
import org.apache.stratos.autoscaler.event.publisher.ClusterStatusEventPublisher;
import org.apache.stratos.autoscaler.monitor.cluster.VMClusterMonitor;
@@ -31,8 +30,8 @@ import org.apache.stratos.autoscaler.status.processor.StatusProcessor;
/**
* Cluster inactive checking processor
*/
-public class ClusterStatusInActiveProcessor extends ClusterStatusProcessor {
- private static final Log log = LogFactory.getLog(ClusterStatusInActiveProcessor.class);
+public class ClusterStatusInactiveProcessor extends ClusterStatusProcessor {
+ private static final Log log = LogFactory.getLog(ClusterStatusInactiveProcessor.class);
private ClusterStatusProcessor nextProcessor;
@Override
@@ -42,7 +41,7 @@ public class ClusterStatusInActiveProcessor extends ClusterStatusProcessor {
@Override
public boolean process(String type, String clusterId, String instanceId) {
boolean statusChanged;
- if (type == null || (ClusterStatusInActiveProcessor.class.getName().equals(type))) {
+ if (type == null || (ClusterStatusInactiveProcessor.class.getName().equals(type))) {
statusChanged = doProcess(clusterId, instanceId);
if (statusChanged) {
return statusChanged;
@@ -65,9 +64,9 @@ public class ClusterStatusInActiveProcessor extends ClusterStatusProcessor {
VMClusterMonitor monitor = (VMClusterMonitor) AutoscalerContext.getInstance().
getClusterMonitor(clusterId);
- boolean clusterInActive;
- clusterInActive = getClusterInactive(instanceId, monitor);
- if(clusterInActive) {
+ boolean clusterInactive;
+ clusterInactive = getClusterInactive(instanceId, monitor);
+ if(clusterInactive) {
//if the monitor is dependent, temporarily pausing it
if (monitor.hasStartupDependents()) {
monitor.setHasFaultyMember(true);
@@ -77,33 +76,33 @@ public class ClusterStatusInActiveProcessor extends ClusterStatusProcessor {
+ monitor.getAppId() + " [cluster]: " + clusterId);
}
//send cluster In-Active event to cluster status topic
- ClusterStatusEventPublisher.sendClusterInActivateEvent(monitor.getAppId(),
+ ClusterStatusEventPublisher.sendClusterInactivateEvent(monitor.getAppId(),
monitor.getServiceId(), clusterId, instanceId);
}
- return clusterInActive;
+ return clusterInactive;
}
private boolean getClusterInactive(String instanceId, VMClusterMonitor monitor) {
- boolean clusterInActive = false;
+ boolean clusterInactive = false;
for (ClusterLevelNetworkPartitionContext clusterLevelNetworkPartitionContext :
monitor.getAllNetworkPartitionCtxts().values()) {
ClusterInstanceContext instanceContext = clusterLevelNetworkPartitionContext.
getClusterInstanceContext(instanceId);
if(instanceContext != null) {
if(instanceContext.getActiveMembers() < instanceContext.getMinInstanceCount()) {
- clusterInActive = true;
+ clusterInactive = true;
break;
} else {
- clusterInActive = false;
+ clusterInactive = false;
break;
}
} else {
- clusterInActive = false;
+ clusterInactive = false;
break;
}
}
- return clusterInActive;
+ return clusterInactive;
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusProcessorChain.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusProcessorChain.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusProcessorChain.java
index 4787a6f..44ddbde 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusProcessorChain.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/cluster/ClusterStatusProcessorChain.java
@@ -25,7 +25,7 @@ import org.apache.stratos.autoscaler.status.processor.StatusProcessorChain;
*/
public class ClusterStatusProcessorChain extends StatusProcessorChain {
private ClusterStatusTerminatedProcessor clusterStatusTerminatedProcessor;
- private ClusterStatusInActiveProcessor clusterStatusInActiveProcessor;
+ private ClusterStatusInactiveProcessor clusterStatusInactiveProcessor;
private ClusterStatusActiveProcessor clusterStatusActiveProcessor;
@Override
@@ -33,8 +33,8 @@ public class ClusterStatusProcessorChain extends StatusProcessorChain {
clusterStatusTerminatedProcessor = new ClusterStatusTerminatedProcessor();
add(clusterStatusTerminatedProcessor);
- clusterStatusInActiveProcessor = new ClusterStatusInActiveProcessor();
- add(clusterStatusInActiveProcessor);
+ clusterStatusInactiveProcessor = new ClusterStatusInactiveProcessor();
+ add(clusterStatusInactiveProcessor);
clusterStatusActiveProcessor = new ClusterStatusActiveProcessor();
add(clusterStatusActiveProcessor);
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInActiveProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInActiveProcessor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInActiveProcessor.java
index e86be1c..37781a0 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInActiveProcessor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusInActiveProcessor.java
@@ -36,8 +36,8 @@ import java.util.Map;
/**
* Cluster active status processor
*/
-public class GroupStatusInActiveProcessor extends GroupStatusProcessor {
- private static final Log log = LogFactory.getLog(GroupStatusInActiveProcessor.class);
+public class GroupStatusInactiveProcessor extends GroupStatusProcessor {
+ private static final Log log = LogFactory.getLog(GroupStatusInactiveProcessor.class);
private GroupStatusProcessor nextProcessor;
@Override
@@ -91,8 +91,8 @@ public class GroupStatusInActiveProcessor extends GroupStatusProcessor {
clusterData = component.getClusterDataMap();
if (groups.isEmpty() && getAllClusterInactive(clusterData, instanceId) ||
- clusterData.isEmpty() && getAllGroupInActive(groups, instanceId) ||
- getAllClusterInactive(clusterData, instanceId) || getAllGroupInActive(groups, instanceId)) {
+ clusterData.isEmpty() && getAllGroupInactive(groups, instanceId) ||
+ getAllClusterInactive(clusterData, instanceId) || getAllGroupInactive(groups, instanceId)) {
//send the in activation event
if (component instanceof Application) {
//send application activated event
@@ -106,7 +106,7 @@ public class GroupStatusInActiveProcessor extends GroupStatusProcessor {
//send activation to the parent
if (((Group) component).getStatus(instanceId) != GroupStatus.Inactive) {
log.info("sending group inactive: " + component.getUniqueIdentifier());
- ApplicationBuilder.handleGroupInActivateEvent(appId, component.getUniqueIdentifier(), instanceId);
+ ApplicationBuilder.handleGroupInactivateEvent(appId, component.getUniqueIdentifier(), instanceId);
return true;
}
}
@@ -124,7 +124,7 @@ public class GroupStatusInActiveProcessor extends GroupStatusProcessor {
/**
- * Find out whether any of the clusters of a group in the InActive state
+ * Find out whether any of the clusters of a group in the Inactive state
*
* @param clusterData clusters of the group
* @return whether inactive or not
@@ -159,7 +159,7 @@ public class GroupStatusInActiveProcessor extends GroupStatusProcessor {
* @param groups groups of a group/application
* @return whether inactive or not
*/
- private boolean getAllGroupInActive(Map<String, Group> groups, String instanceId) {
+ private boolean getAllGroupInactive(Map<String, Group> groups, String instanceId) {
boolean groupStat = false;
for (Group group : groups.values()) {
GroupInstance context = group.getInstanceContexts(instanceId);
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessorChain.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessorChain.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessorChain.java
index 92c0951..d522738 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessorChain.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/processor/group/GroupStatusProcessorChain.java
@@ -31,7 +31,7 @@ public class GroupStatusProcessorChain extends StatusProcessorChain {
private GroupStatusActiveProcessor groupStatusActiveProcessor;
private GroupStatusTerminatedProcessor groupStatusTerminatedProcessor;
private GroupStatusTerminatingProcessor groupStatusTerminatingProcessor;
- private GroupStatusInActiveProcessor groupStatusInActiveProcessor;
+ private GroupStatusInactiveProcessor groupStatusInactiveProcessor;
@Override
public void initialize() {
@@ -44,8 +44,8 @@ public class GroupStatusProcessorChain extends StatusProcessorChain {
groupStatusTerminatingProcessor = new GroupStatusTerminatingProcessor();
add(groupStatusTerminatingProcessor);
- groupStatusInActiveProcessor = new GroupStatusInActiveProcessor();
- add(groupStatusInActiveProcessor);
+ groupStatusInactiveProcessor = new GroupStatusInactiveProcessor();
+ add(groupStatusInactiveProcessor);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java
index 6a5fd5a..e3cc7ba 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/messaging/receiver/cluster/status/ClusterStatusTopicReceiver.java
@@ -97,7 +97,7 @@ public class ClusterStatusTopicReceiver {
statusEventReceiver.addEventListener(new ClusterStatusClusterInactivateEventListener() {
@Override
protected void onEvent(Event event) {
- TopologyBuilder.handleClusterInActivateEvent((ClusterStatusClusterInactivateEvent) event);
+ TopologyBuilder.handleClusterInactivateEvent((ClusterStatusClusterInactivateEvent) event);
}
});
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/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 62ed682..c83662f 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
@@ -824,50 +824,50 @@ public class TopologyBuilder {
}
- public static void handleClusterInActivateEvent(
- ClusterStatusClusterInactivateEvent clusterInActivateEvent) {
+ public static void handleClusterInactivateEvent(
+ ClusterStatusClusterInactivateEvent clusterInactivateEvent) {
Topology topology = TopologyManager.getTopology();
- Service service = topology.getService(clusterInActivateEvent.getServiceName());
+ Service service = topology.getService(clusterInactivateEvent.getServiceName());
//update the status of the cluster
if (service == null) {
log.warn(String.format("Service %s does not exist",
- clusterInActivateEvent.getServiceName()));
+ clusterInactivateEvent.getServiceName()));
return;
}
- Cluster cluster = service.getCluster(clusterInActivateEvent.getClusterId());
+ Cluster cluster = service.getCluster(clusterInactivateEvent.getClusterId());
if (cluster == null) {
log.warn(String.format("Cluster %s does not exist",
- clusterInActivateEvent.getClusterId()));
+ clusterInactivateEvent.getClusterId()));
return;
}
- ClusterInstanceInactivateEvent clusterInActivatedEvent1 =
+ ClusterInstanceInactivateEvent clusterInactivatedEvent1 =
new ClusterInstanceInactivateEvent(
- clusterInActivateEvent.getAppId(),
- clusterInActivateEvent.getServiceName(),
- clusterInActivateEvent.getClusterId(),
- clusterInActivateEvent.getInstanceId());
+ clusterInactivateEvent.getAppId(),
+ clusterInactivateEvent.getServiceName(),
+ clusterInactivateEvent.getClusterId(),
+ clusterInactivateEvent.getInstanceId());
try {
TopologyManager.acquireWriteLock();
- ClusterInstance context = cluster.getInstanceContexts(clusterInActivateEvent.getInstanceId());
+ ClusterInstance context = cluster.getInstanceContexts(clusterInactivateEvent.getInstanceId());
if (context == null) {
log.warn("Cluster Instance Context is not found for [cluster] " +
- clusterInActivateEvent.getClusterId() + " [instance-id] " +
- clusterInActivateEvent.getInstanceId());
+ clusterInactivateEvent.getClusterId() + " [instance-id] " +
+ clusterInactivateEvent.getInstanceId());
return;
}
ClusterStatus status = ClusterStatus.Inactive;
if(context.isStateTransitionValid(status)) {
context.setStatus(status);
- log.info("Cluster InActive adding status started for" + cluster.getClusterId());
+ log.info("Cluster Inactive adding status started for" + cluster.getClusterId());
TopologyManager.updateTopology(topology);
//publishing data
- TopologyEventPublisher.sendClusterInactivateEvent(clusterInActivatedEvent1);
+ TopologyEventPublisher.sendClusterInactivateEvent(clusterInactivatedEvent1);
} else {
log.error(String.format("Cluster state transition is not valid: [cluster-id] %s " +
" [instance-id] %s [current-status] %s [status-requested] %s",
- clusterInActivateEvent.getClusterId(), clusterInActivateEvent.getInstanceId(),
+ clusterInactivateEvent.getClusterId(), clusterInactivateEvent.getInstanceId(),
context.getStatus(), status));
return;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/ClusterInstanceInActivateEventListener.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/ClusterInstanceInActivateEventListener.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/ClusterInstanceInActivateEventListener.java
index 888892d..e5b9ee3 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/ClusterInstanceInActivateEventListener.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/listener/topology/ClusterInstanceInActivateEventListener.java
@@ -20,5 +20,5 @@ package org.apache.stratos.messaging.listener.topology;
import org.apache.stratos.messaging.listener.EventListener;
-public abstract class ClusterInstanceInActivateEventListener extends EventListener {
+public abstract class ClusterInstanceInactivateEventListener extends EventListener {
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationsMessageProcessorChain.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationsMessageProcessorChain.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationsMessageProcessorChain.java
index 916a96a..2318c13 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationsMessageProcessorChain.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/ApplicationsMessageProcessorChain.java
@@ -33,7 +33,7 @@ public class ApplicationsMessageProcessorChain extends MessageProcessorChain {
private GroupInstanceCreatedProcessor groupCreatedMessageProcessor;
private GroupInstanceActivatedProcessor groupActivatedMessageProcessor;
- private GroupInstanceInActivateProcessor groupInActivateMessageProcessor;
+ private GroupInstanceInactivateProcessor groupInactivateMessageProcessor;
private GroupInstanceTerminatedProcessor groupTerminatedProcessor;
private GroupInstanceTerminatingProcessor groupTerminatingProcessor;
private ApplicationInstanceCreatedMessageProcessor applicationInstanceCreatedMessageProcessor;
@@ -54,8 +54,8 @@ public class ApplicationsMessageProcessorChain extends MessageProcessorChain {
groupActivatedMessageProcessor = new GroupInstanceActivatedProcessor();
add(groupActivatedMessageProcessor);
- groupInActivateMessageProcessor = new GroupInstanceInActivateProcessor();
- add(groupInActivateMessageProcessor);
+ groupInactivateMessageProcessor = new GroupInstanceInactivateProcessor();
+ add(groupInactivateMessageProcessor);
groupTerminatedProcessor = new GroupInstanceTerminatedProcessor();
add(groupTerminatedProcessor);
@@ -97,7 +97,7 @@ public class ApplicationsMessageProcessorChain extends MessageProcessorChain {
if (eventListener instanceof GroupInstanceCreatedEventListener) {
groupCreatedMessageProcessor.addEventListener(eventListener);
} else if (eventListener instanceof GroupInstanceInactivateEventListener) {
- groupInActivateMessageProcessor.addEventListener(eventListener);
+ groupInactivateMessageProcessor.addEventListener(eventListener);
} else if (eventListener instanceof GroupInstanceActivatedEventListener) {
groupActivatedMessageProcessor.addEventListener(eventListener);
} else if (eventListener instanceof GroupInstanceTerminatingEventListener) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupInstanceInActivateProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupInstanceInActivateProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupInstanceInActivateProcessor.java
index c1e00bf..df749ea 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupInstanceInActivateProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/applications/GroupInstanceInActivateProcessor.java
@@ -33,8 +33,8 @@ import org.apache.stratos.messaging.util.Util;
/**
* This processor will act upon the Group activation events
*/
-public class GroupInstanceInActivateProcessor extends MessageProcessor {
- private static final Log log = LogFactory.getLog(GroupInstanceInActivateProcessor.class);
+public class GroupInstanceInactivateProcessor extends MessageProcessor {
+ private static final Log log = LogFactory.getLog(GroupInstanceInactivateProcessor.class);
private MessageProcessor nextProcessor;
@Override
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceInActivateProcessor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceInActivateProcessor.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceInActivateProcessor.java
index 8483fe6..69dadfa 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceInActivateProcessor.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/ClusterInstanceInActivateProcessor.java
@@ -35,8 +35,8 @@ import org.apache.stratos.messaging.util.Util;
/**
* This processor will act upon the cluster activated event
*/
-public class ClusterInstanceInActivateProcessor extends MessageProcessor {
- private static final Log log = LogFactory.getLog(ClusterInstanceInActivateProcessor.class);
+public class ClusterInstanceInactivateProcessor extends MessageProcessor {
+ private static final Log log = LogFactory.getLog(ClusterInstanceInactivateProcessor.class);
private MessageProcessor nextProcessor;
@Override
http://git-wip-us.apache.org/repos/asf/stratos/blob/23087d1c/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java
index 184e2b9..eeb201f 100644
--- a/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java
+++ b/components/org.apache.stratos.messaging/src/main/java/org/apache/stratos/messaging/message/processor/topology/TopologyMessageProcessorChain.java
@@ -40,7 +40,7 @@ public class TopologyMessageProcessorChain extends MessageProcessorChain {
private ClusterCreatedMessageProcessor clusterCreatedMessageProcessor;
private ClusterResetMessageProcessor clusterResetMessageProcessor;
private ClusterInstanceActivatedProcessor clusterActivatedProcessor;
- private ClusterInstanceInActivateProcessor clusterInActivateProcessor;
+ private ClusterInstanceInactivateProcessor clusterInactivateProcessor;
private ClusterRemovedMessageProcessor clusterRemovedMessageProcessor;
private InstanceSpawnedMessageProcessor instanceSpawnedMessageProcessor;
private MemberStartedMessageProcessor memberStartedMessageProcessor;
@@ -76,8 +76,8 @@ public class TopologyMessageProcessorChain extends MessageProcessorChain {
clusterActivatedProcessor = new ClusterInstanceActivatedProcessor();
add(clusterActivatedProcessor);
- clusterInActivateProcessor = new ClusterInstanceInActivateProcessor();
- add(clusterInActivateProcessor);
+ clusterInactivateProcessor = new ClusterInstanceInactivateProcessor();
+ add(clusterInactivateProcessor);
clusterRemovedMessageProcessor = new ClusterRemovedMessageProcessor();
add(clusterRemovedMessageProcessor);
@@ -131,8 +131,8 @@ public class TopologyMessageProcessorChain extends MessageProcessorChain {
appClustersRemovedMessageProcessor.addEventListener(eventListener);
} else if (eventListener instanceof ClusterInstanceActivatedEventListener) {
clusterActivatedProcessor.addEventListener(eventListener);
- } else if (eventListener instanceof ClusterInstanceInActivateEventListener) {
- clusterInActivateProcessor.addEventListener(eventListener);
+ } else if (eventListener instanceof ClusterInstanceInactivateEventListener) {
+ clusterInactivateProcessor.addEventListener(eventListener);
} else if (eventListener instanceof ClusterRemovedEventListener) {
clusterRemovedMessageProcessor.addEventListener(eventListener);
} else if (eventListener instanceof ClusterInstanceCreatedEventListener) {