Repository: stratos Updated Branches: refs/heads/master 5277c1544 -> 2a3bfc436
Fixing the typo InActive Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2a3bfc43 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2a3bfc43 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2a3bfc43 Branch: refs/heads/master Commit: 2a3bfc436e27c08719dc58592e7c6fa259e714db Parents: 5277c15 Author: Lahiru Sandaruwan <[email protected]> Authored: Mon Nov 10 12:56:30 2014 +0530 Committer: Lahiru Sandaruwan <[email protected]> Committed: Mon Nov 10 12:56:30 2014 +0530 ---------------------------------------------------------------------- .../stratos/autoscaler/monitor/Monitor.java | 6 ++--- .../monitor/ParentComponentMonitor.java | 24 ++++++++++---------- .../monitor/application/ApplicationMonitor.java | 8 +++---- .../autoscaler/monitor/group/GroupMonitor.java | 10 ++++---- .../status/checker/StatusChecker.java | 10 ++++---- .../controller/topology/TopologyBuilder.java | 2 +- .../topology/TopologyEventPublisher.java | 6 ++--- 7 files changed, 33 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2a3bfc43/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java index 9ef7d73..791f7a0 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/Monitor.java @@ -33,7 +33,7 @@ public abstract class Monitor implements EventHandler { //monitors map, key=GroupAlias/clusterId and value=GroupMonitor/AbstractClusterMonitor protected Map<String, Monitor> aliasToActiveMonitorsMap; //monitors map, stopped monitors - protected Map<String, Monitor> aliasToInActiveMonitorsMap; + protected Map<String, Monitor> aliasToInactiveMonitorsMap; //flag will get set to true in MonitorTerminateAllEvent when termination of // this monitor decided by its parent protected boolean terminateChildren = false; @@ -76,7 +76,7 @@ public abstract class Monitor implements EventHandler { public boolean hasActiveMonitors() { boolean hasMonitor = false; if ((this.aliasToActiveMonitorsMap != null && !this.aliasToActiveMonitorsMap.isEmpty()) || - (this.aliasToInActiveMonitorsMap != null && !this.aliasToInActiveMonitorsMap.isEmpty())) { + (this.aliasToInactiveMonitorsMap != null && !this.aliasToInactiveMonitorsMap.isEmpty())) { hasMonitor = true; } return hasMonitor; @@ -84,7 +84,7 @@ public abstract class Monitor implements EventHandler { public boolean hasMonitors() { - return this.aliasToActiveMonitorsMap != null || this.aliasToInActiveMonitorsMap != null; + return this.aliasToActiveMonitorsMap != null || this.aliasToInactiveMonitorsMap != null; } public boolean isDependent() { http://git-wip-us.apache.org/repos/asf/stratos/blob/2a3bfc43/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java index 7d0ac8f..c900f49 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/ParentComponentMonitor.java @@ -49,7 +49,7 @@ public abstract class ParentComponentMonitor extends Monitor { public ParentComponentMonitor(ParentComponent component) throws DependencyBuilderException { aliasToActiveMonitorsMap = new HashMap<String, Monitor>(); - aliasToInActiveMonitorsMap = new HashMap<String, Monitor>(); + aliasToInactiveMonitorsMap = new HashMap<String, Monitor>(); //clusterIdToClusterMonitorsMap = new HashMap<String, AbstractClusterMonitor>(); this.id = component.getUniqueIdentifier(); //Building the dependency for this monitor within the immediate children @@ -64,8 +64,8 @@ public abstract class ParentComponentMonitor extends Monitor { protected void onChildActivatedEvent(String idOfEvent) { try { //if the activated monitor is in in_active map move it to active map - if (this.aliasToInActiveMonitorsMap.containsKey(idOfEvent)) { - this.aliasToActiveMonitorsMap.put(id, this.aliasToInActiveMonitorsMap.remove(idOfEvent)); + if (this.aliasToInactiveMonitorsMap.containsKey(idOfEvent)) { + this.aliasToActiveMonitorsMap.put(id, this.aliasToInactiveMonitorsMap.remove(idOfEvent)); } boolean startDep = startDependency(idOfEvent); if (log.isDebugEnabled()) { @@ -84,11 +84,11 @@ public abstract class ParentComponentMonitor extends Monitor { /*protected void onChildTerminatingEvent(String idOfEvent) { //Check whether hasDependent true - if (!this.aliasToInActiveMonitorsMap.containsKey(idOfEvent)) { - this.aliasToInActiveMonitorsMap.put(idOfEvent, this.aliasToActiveMonitorsMap.remove(idOfEvent)); + if (!this.aliasToInactiveMonitorsMap.containsKey(idOfEvent)) { + this.aliasToInactiveMonitorsMap.put(idOfEvent, this.aliasToActiveMonitorsMap.remove(idOfEvent)); } - Monitor monitor = this.aliasToInActiveMonitorsMap.get(idOfEvent); + Monitor monitor = this.aliasToInactiveMonitorsMap.get(idOfEvent); if (monitor != null) { // check if aliasToActiveMonitors are null (in case of a Cluster Monitor) if (monitor.getAliasToActiveMonitorsMap() != null) { @@ -109,8 +109,8 @@ public abstract class ParentComponentMonitor extends Monitor { // move to inactive monitors list to use in the Terminated event protected synchronized void markMonitorAsInactive(String monitorKey) { - if (!this.aliasToInActiveMonitorsMap.containsKey(monitorKey)) { - this.aliasToInActiveMonitorsMap.put(monitorKey, + if (!this.aliasToInactiveMonitorsMap.containsKey(monitorKey)) { + this.aliasToInactiveMonitorsMap.put(monitorKey, this.aliasToActiveMonitorsMap.remove(monitorKey)); } } @@ -118,7 +118,7 @@ public abstract class ParentComponentMonitor extends Monitor { /** * @param idOfEvent */ - protected void onChildInActiveEvent(String idOfEvent) { + protected void onChildInactiveEvent(String idOfEvent) { List<ApplicationContext> terminationList; Monitor monitor; @@ -129,7 +129,7 @@ public abstract class ParentComponentMonitor extends Monitor { terminationList = this.dependencyTree.getTerminationDependencies(idOfEvent); //Checking whether all children are to be terminated. if (terminationList.size() == - (this.aliasToActiveMonitorsMap.size() + this.aliasToInActiveMonitorsMap.size())) { + (this.aliasToActiveMonitorsMap.size() + this.aliasToInactiveMonitorsMap.size())) { if (this.parent != null) { ApplicationBuilder.handleGroupTerminatingEvent(this.appId, this.id); } @@ -225,7 +225,7 @@ public abstract class ParentComponentMonitor extends Monitor { log.warn("Dependent [monitor] " + context1.getId() + " not in the correct state"); allDependentTerminated = false; return allDependentTerminated; - } else if (this.aliasToInActiveMonitorsMap.containsKey(context1.getId())) { + } else if (this.aliasToInactiveMonitorsMap.containsKey(context1.getId())) { log.info("Waiting for the [dependent] " + context1.getId() + " to be terminated..."); allDependentTerminated = false; return allDependentTerminated; @@ -240,7 +240,7 @@ public abstract class ParentComponentMonitor extends Monitor { private boolean allParentTerminated(List<ApplicationContext> parentContexts) { boolean parentsTerminated = false; for (ApplicationContext context1 : parentContexts) { - if (this.aliasToInActiveMonitorsMap.containsKey(context1.getId())) { + if (this.aliasToInactiveMonitorsMap.containsKey(context1.getId())) { log.info("Waiting for the [Parent Monitor] " + context1.getId() + " to be terminated"); parentsTerminated = false; http://git-wip-us.apache.org/repos/asf/stratos/blob/2a3bfc43/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java index cd686e7..abe64ba 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/application/ApplicationMonitor.java @@ -109,7 +109,7 @@ public class ApplicationMonitor extends ParentComponentMonitor { Monitor monitor; monitor = findGroupMonitor(groupId, aliasToActiveMonitorsMap.values()); if (monitor == null) { - monitor = findGroupMonitor(groupId, aliasToInActiveMonitorsMap.values()); + monitor = findGroupMonitor(groupId, aliasToInactiveMonitorsMap.values()); } return monitor; } @@ -160,7 +160,7 @@ public class ApplicationMonitor extends ParentComponentMonitor { onChildActivatedEvent(id); } else if (status1 == ClusterStatus.Inactive || status1 == GroupStatus.Inactive) { - onChildInActiveEvent(id); + onChildInactiveEvent(id); } else if (status1 == ClusterStatus.Terminating || status1 == GroupStatus.Terminating) { //mark the child monitor as inActive in the map @@ -168,8 +168,8 @@ public class ApplicationMonitor extends ParentComponentMonitor { } else if (status1 == ClusterStatus.Terminated || status1 == GroupStatus.Terminated) { //Check whether all dependent goes Terminated and then start them in parallel. - if(this.aliasToInActiveMonitorsMap.containsKey(id)) { - this.aliasToInActiveMonitorsMap.remove(id); + if(this.aliasToInactiveMonitorsMap.containsKey(id)) { + this.aliasToInactiveMonitorsMap.remove(id); } else { log.warn("[monitor] " + id + " cannot be found in the inActive monitors list"); } http://git-wip-us.apache.org/repos/asf/stratos/blob/2a3bfc43/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java index e3324a8..8f355af 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/group/GroupMonitor.java @@ -70,11 +70,11 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler onChildActivatedEvent(id); } else if (status1 == ClusterStatus.Inactive || status1 == GroupStatus.Inactive) { - onChildInActiveEvent(id); + onChildInactiveEvent(id); } else if (status1 == ClusterStatus.Created || status1 == GroupStatus.Created) { - if (this.aliasToInActiveMonitorsMap.containsKey(id)) { - this.aliasToInActiveMonitorsMap.remove(id); + if (this.aliasToInactiveMonitorsMap.containsKey(id)) { + this.aliasToInactiveMonitorsMap.remove(id); } if (this.status == GroupStatus.Terminating) { StatusChecker.getInstance().onChildStatusChange(id, this.id, this.appId); @@ -87,8 +87,8 @@ public class GroupMonitor extends ParentComponentMonitor implements EventHandler } else if (status1 == ClusterStatus.Terminated || status1 == GroupStatus.Terminated) { //Check whether all dependent goes Terminated and then start them in parallel. - if (this.aliasToInActiveMonitorsMap.containsKey(id)) { - this.aliasToInActiveMonitorsMap.remove(id); + if (this.aliasToInactiveMonitorsMap.containsKey(id)) { + this.aliasToInactiveMonitorsMap.remove(id); } else { log.warn("[monitor] " + id + " cannot be found in the inActive monitors list"); } http://git-wip-us.apache.org/repos/asf/stratos/blob/2a3bfc43/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java index e07c946..04cd443 100644 --- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java +++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/status/checker/StatusChecker.java @@ -196,7 +196,7 @@ public class StatusChecker { Runnable group = new Runnable() { public void run() { VMClusterMonitor monitor = (VMClusterMonitor) AutoscalerContext.getInstance().getClusterMonitor(clusterId); - boolean clusterInActive = getClusterInActive(monitor, partitionId); + boolean clusterInActive = getClusterInactive(monitor, partitionId); String appId = monitor.getAppId(); if (clusterInActive) { //if the monitor is dependent, temporarily pausing it @@ -219,7 +219,7 @@ public class StatusChecker { groupThread.start(); } - private boolean getClusterInActive(VMClusterMonitor monitor, String partitionId) { + private boolean getClusterInactive(VMClusterMonitor monitor, String partitionId) { boolean clusterInActive = false; for (NetworkPartitionContext networkPartitionContext : monitor.getNetworkPartitionCtxts().values()) { for (PartitionContext partition : networkPartitionContext.getPartitionCtxts().values()) { @@ -346,9 +346,9 @@ public class StatusChecker { log.info("sending group created : " + parent.getUniqueIdentifier()); ApplicationBuilder.handleGroupCreatedEvent(appId, parent.getUniqueIdentifier()); } - } else if (groups.isEmpty() && getAllClusterInActive(clusterData) || + } else if (groups.isEmpty() && getAllClusterInactive(clusterData) || clusterData.isEmpty() && getAllGroupInActive(groups) || - getAllClusterInActive(clusterData) && getAllGroupInActive(groups)) { + getAllClusterInactive(clusterData) && getAllGroupInActive(groups)) { //send the in activation event if (parent instanceof Application) { //send application activated event @@ -402,7 +402,7 @@ public class StatusChecker { } - private boolean getAllClusterInActive(Map<String, ClusterDataHolder> clusterData) { + private boolean getAllClusterInactive(Map<String, ClusterDataHolder> clusterData) { boolean clusterStat = false; for (Map.Entry<String, ClusterDataHolder> clusterDataHolderEntry : clusterData.entrySet()) { Service service = TopologyManager.getTopology().getService(clusterDataHolderEntry.getValue().getServiceType()); http://git-wip-us.apache.org/repos/asf/stratos/blob/2a3bfc43/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 4d95397..7880584 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 @@ -738,7 +738,7 @@ public class TopologyBuilder { TopologyManager.releaseWriteLock(); } //publishing data - TopologyEventPublisher.sendClusterInActivateEvent(clusterActivatedEvent1); + TopologyEventPublisher.sendClusterInactivateEvent(clusterActivatedEvent1); } http://git-wip-us.apache.org/repos/asf/stratos/blob/2a3bfc43/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 05ed171..385813a 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 @@ -228,12 +228,12 @@ public class TopologyEventPublisher { publishEvent(clusterActivatedEvent); } - public static void sendClusterInActivateEvent(ClusterInactivateEvent clusterInActiveEvent) { + public static void sendClusterInactivateEvent(ClusterInactivateEvent clusterInactiveEvent) { if (log.isInfoEnabled()) { log.info(String.format("Publishing cluster in-active event: [service] %s [cluster] %s [appId] %s", - clusterInActiveEvent.getServiceName(), clusterInActiveEvent.getClusterId(), clusterInActiveEvent.getAppId())); + clusterInactiveEvent.getServiceName(), clusterInactiveEvent.getClusterId(), clusterInactiveEvent.getAppId())); } - publishEvent(clusterInActiveEvent); + publishEvent(clusterInactiveEvent); }
