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/21 21:39:09 UTC
[2/7] stratos git commit:
s/ScalingBeyondLimitEvent/ScalingUpBeyondMaxEvent in class usages
s/ScalingBeyondLimitEvent/ScalingUpBeyondMaxEvent in class usages
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/ca563c31
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/ca563c31
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/ca563c31
Branch: refs/heads/master
Commit: ca563c31a245c45832a325f4cb130a75fc9c827d
Parents: 3043d18
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Dec 22 01:54:47 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Dec 22 02:11:18 2014 +0530
----------------------------------------------------------------------
.../autoscaler/context/InstanceContext.java | 16 +++++++-------
.../autoscaler/monitor/EventHandler.java | 6 ++---
.../monitor/cluster/ClusterMonitor.java | 4 ++--
.../monitor/component/GroupMonitor.java | 4 ++--
.../component/ParentComponentMonitor.java | 23 +++++++++++---------
.../builder/MonitorStatusEventBuilder.java | 16 +++++++++-----
6 files changed, 38 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/ca563c31/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/InstanceContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/InstanceContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/InstanceContext.java
index a2c240b..74762b8 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/InstanceContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/InstanceContext.java
@@ -19,7 +19,7 @@
package org.apache.stratos.autoscaler.context;
import org.apache.stratos.autoscaler.monitor.events.ScalingEvent;
-import org.apache.stratos.autoscaler.monitor.events.ScalingBeyondLimitEvent;
+import org.apache.stratos.autoscaler.monitor.events.ScalingUpBeyondMaxEvent;
import java.util.HashMap;
import java.util.Map;
@@ -35,13 +35,13 @@ public abstract class InstanceContext {
//key=id of the child, value=ScalingEvent
private Map<String, ScalingEvent> idToScalingEvent;
//key=id of the child, value=MaxOutScalingEvent
- private Map<String, ScalingBeyondLimitEvent> idToScalingOverMaxEvent;
+ private Map<String, ScalingUpBeyondMaxEvent> idToScalingOverMaxEvent;
public InstanceContext(String id) {
this.id = id;
setIdToScalingEvent(new HashMap<String, ScalingEvent>());
- setIdToScalingOverMaxEvent(new HashMap<String, ScalingBeyondLimitEvent>());
+ setIdToScalingOverMaxEvent(new HashMap<String, ScalingUpBeyondMaxEvent>());
}
public String getId() {
@@ -68,11 +68,11 @@ public abstract class InstanceContext {
this.idToScalingEvent = idToScalingEvent;
}
- public Map<String, ScalingBeyondLimitEvent> getIdToScalingOverMaxEvent() {
+ public Map<String, ScalingUpBeyondMaxEvent> getIdToScalingOverMaxEvent() {
return idToScalingOverMaxEvent;
}
- public void setIdToScalingOverMaxEvent(Map<String, ScalingBeyondLimitEvent> idToScalingOverMaxEvent) {
+ public void setIdToScalingOverMaxEvent(Map<String, ScalingUpBeyondMaxEvent> idToScalingOverMaxEvent) {
this.idToScalingOverMaxEvent = idToScalingOverMaxEvent;
}
@@ -88,7 +88,7 @@ public abstract class InstanceContext {
return this.idToScalingEvent.get(id);
}
- public ScalingBeyondLimitEvent getScalingMaxEvent(String id) {
+ public ScalingUpBeyondMaxEvent getScalingMaxEvent(String id) {
return this.idToScalingOverMaxEvent.get(id);
}
@@ -96,8 +96,8 @@ public abstract class InstanceContext {
this.idToScalingOverMaxEvent.remove(id);
}
- public void addScalingOverMaxEvent(ScalingBeyondLimitEvent scalingBeyondLimitEvent) {
- this.idToScalingOverMaxEvent.put(scalingBeyondLimitEvent.getId(), scalingBeyondLimitEvent);
+ public void addScalingOverMaxEvent(ScalingUpBeyondMaxEvent scalingUpBeyondMaxEvent) {
+ this.idToScalingOverMaxEvent.put(scalingUpBeyondMaxEvent.getId(), scalingUpBeyondMaxEvent);
}
public boolean containsScalingEvent(String id) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/ca563c31/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/EventHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/EventHandler.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/EventHandler.java
index 444f585..3f27dba 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/EventHandler.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/EventHandler.java
@@ -21,7 +21,7 @@ package org.apache.stratos.autoscaler.monitor;
import org.apache.stratos.autoscaler.exception.application.MonitorNotFoundException;
import org.apache.stratos.autoscaler.monitor.events.ScalingEvent;
import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent;
-import org.apache.stratos.autoscaler.monitor.events.ScalingBeyondLimitEvent;
+import org.apache.stratos.autoscaler.monitor.events.ScalingUpBeyondMaxEvent;
/**
* Event Handler to notify the observer/to receive notification
@@ -52,9 +52,9 @@ public interface EventHandler {
/**
* Triggered when a scaling over max event is received from a child.
*
- * @param scalingBeyondLimitEvent
+ * @param scalingUpBeyondMaxEvent
*/
- public abstract void onChildScalingOverMaxEvent(ScalingBeyondLimitEvent scalingBeyondLimitEvent);
+ public abstract void onChildScalingOverMaxEvent(ScalingUpBeyondMaxEvent scalingUpBeyondMaxEvent);
/**
* Triggered when a scaling event is received from the parent.
http://git-wip-us.apache.org/repos/asf/stratos/blob/ca563c31/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
index ec1df53..f4032c6 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/cluster/ClusterMonitor.java
@@ -37,7 +37,7 @@ import org.apache.stratos.autoscaler.exception.partition.PartitionValidationExce
import org.apache.stratos.autoscaler.exception.policy.PolicyValidationException;
import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent;
import org.apache.stratos.autoscaler.monitor.events.ScalingEvent;
-import org.apache.stratos.autoscaler.monitor.events.ScalingBeyondLimitEvent;
+import org.apache.stratos.autoscaler.monitor.events.ScalingUpBeyondMaxEvent;
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;
@@ -385,7 +385,7 @@ public class ClusterMonitor extends AbstractClusterMonitor {
}
@Override
- public void onChildScalingOverMaxEvent(ScalingBeyondLimitEvent scalingBeyondLimitEvent) {
+ public void onChildScalingOverMaxEvent(ScalingUpBeyondMaxEvent scalingUpBeyondMaxEvent) {
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ca563c31/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java
index 2f6dc72..a9e0962 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/GroupMonitor.java
@@ -37,7 +37,7 @@ import org.apache.stratos.autoscaler.monitor.cluster.ClusterMonitor;
import org.apache.stratos.autoscaler.monitor.events.GroupStatusEvent;
import org.apache.stratos.autoscaler.monitor.events.MonitorStatusEvent;
import org.apache.stratos.autoscaler.monitor.events.ScalingEvent;
-import org.apache.stratos.autoscaler.monitor.events.ScalingBeyondLimitEvent;
+import org.apache.stratos.autoscaler.monitor.events.ScalingUpBeyondMaxEvent;
import org.apache.stratos.autoscaler.monitor.events.builder.MonitorStatusEventBuilder;
import org.apache.stratos.autoscaler.pojo.policy.PolicyManager;
import org.apache.stratos.autoscaler.pojo.policy.deployment.ChildPolicy;
@@ -164,7 +164,7 @@ public class GroupMonitor extends ParentComponentMonitor {
}
//Resetting the max events
instanceContext.setIdToScalingOverMaxEvent(
- new HashMap<String, ScalingBeyondLimitEvent>());
+ new HashMap<String, ScalingUpBeyondMaxEvent>());
} else {
handleDependentScaling(instanceContext, networkPartitionContext);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/ca563c31/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 c0a68c4..73766e2 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
@@ -41,8 +41,9 @@ import org.apache.stratos.autoscaler.monitor.Monitor;
import org.apache.stratos.autoscaler.monitor.MonitorFactory;
import org.apache.stratos.autoscaler.monitor.cluster.AbstractClusterMonitor;
import org.apache.stratos.autoscaler.monitor.cluster.ClusterMonitor;
+import org.apache.stratos.autoscaler.monitor.events.ScalingDownBeyondMinEvent;
import org.apache.stratos.autoscaler.monitor.events.ScalingEvent;
-import org.apache.stratos.autoscaler.monitor.events.ScalingBeyondLimitEvent;
+import org.apache.stratos.autoscaler.monitor.events.ScalingUpBeyondMaxEvent;
import org.apache.stratos.autoscaler.util.ServiceReferenceHolder;
import org.apache.stratos.common.threading.StratosThreadPool;
import org.apache.stratos.messaging.domain.applications.GroupStatus;
@@ -287,17 +288,17 @@ public abstract class ParentComponentMonitor extends Monitor implements Runnable
}
@Override
- public void onChildScalingOverMaxEvent(ScalingBeyondLimitEvent scalingBeyondLimitEvent) {
+ public void onChildScalingOverMaxEvent(ScalingUpBeyondMaxEvent scalingUpBeyondMaxEvent) {
if (log.isDebugEnabled()) {
log.debug("Child Scaling max out event received to [group]: " + this.getId()
- + ", [network partition]: " + scalingBeyondLimitEvent.getNetworkPartitionId()
- + ", [event] " + scalingBeyondLimitEvent.getId() + ", " +
- "[group instance] " + scalingBeyondLimitEvent.getInstanceId());
+ + ", [network partition]: " + scalingUpBeyondMaxEvent.getNetworkPartitionId()
+ + ", [event] " + scalingUpBeyondMaxEvent.getId() + ", " +
+ "[group instance] " + scalingUpBeyondMaxEvent.getInstanceId());
}
//adding the scaling over max event to group instance Context
- String networkPartitionId = scalingBeyondLimitEvent.getNetworkPartitionId();
- String instanceId = scalingBeyondLimitEvent.getInstanceId();
- String id = scalingBeyondLimitEvent.getId();
+ String networkPartitionId = scalingUpBeyondMaxEvent.getNetworkPartitionId();
+ String instanceId = scalingUpBeyondMaxEvent.getInstanceId();
+ String id = scalingUpBeyondMaxEvent.getId();
NetworkPartitionContext networkPartitionContext =
this.networkPartitionCtxts.get(networkPartitionId);
if (networkPartitionContext != null) {
@@ -306,9 +307,9 @@ public abstract class ParentComponentMonitor extends Monitor implements Runnable
if (instanceContext != null) {
if (instanceContext.containsScalingEvent(id)) {
instanceContext.removeScalingOverMaxEvent(id);
- instanceContext.addScalingOverMaxEvent(scalingBeyondLimitEvent);
+ instanceContext.addScalingOverMaxEvent(scalingUpBeyondMaxEvent);
} else {
- instanceContext.addScalingOverMaxEvent(scalingBeyondLimitEvent);
+ instanceContext.addScalingOverMaxEvent(scalingUpBeyondMaxEvent);
}
}
}
@@ -771,6 +772,8 @@ public abstract class ParentComponentMonitor extends Monitor implements Runnable
return scalingDependencies;
}
+ public abstract void onChildScalingDownBeyondMinEvent(ScalingDownBeyondMinEvent scalingDownBeyondMinEvent);
+
private class MonitorAdder implements Runnable {
private ApplicationChildContext context;
private ParentComponentMonitor parent;
http://git-wip-us.apache.org/repos/asf/stratos/blob/ca563c31/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/builder/MonitorStatusEventBuilder.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/builder/MonitorStatusEventBuilder.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/builder/MonitorStatusEventBuilder.java
index 3b58ae5..ed8fe40 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/builder/MonitorStatusEventBuilder.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/events/builder/MonitorStatusEventBuilder.java
@@ -66,18 +66,18 @@ public class MonitorStatusEventBuilder {
String appId) {
//Send notifications to parent of the cluster monitor
- ScalingBeyondLimitEvent scalingBeyondLimitEvent = new ScalingBeyondLimitEvent(appId, networkPartitionId,
+ ScalingUpBeyondMaxEvent scalingUpBeyondMaxEvent = new ScalingUpBeyondMaxEvent(appId, networkPartitionId,
instanceId) ;
- notifyParent(parent, scalingBeyondLimitEvent);
+ notifyParent(parent, scalingUpBeyondMaxEvent);
}
public static void handleScalingDownBeyondMinEvent(ParentComponentMonitor parent, String networkPartitionId,
String instanceId, String appId) {
//Send notifications to parent of the cluster monitor
- ScalingBeyondLimitEvent scalingBeyondLimitEvent = new ScalingBeyondLimitEvent(appId, networkPartitionId,
+ ScalingDownBeyondMinEvent scalingDownBeyondMinEvent = new ScalingDownBeyondMinEvent(appId, networkPartitionId,
instanceId) ;
- notifyParent(parent, scalingBeyondLimitEvent);
+ notifyParent(parent, scalingDownBeyondMinEvent);
}
private static void notifyParent(ParentComponentMonitor parent, MonitorStatusEvent statusEvent) {
parent.onChildStatusEvent(statusEvent);
@@ -117,8 +117,12 @@ public class MonitorStatusEventBuilder {
parent.onChildScalingEvent(scalingEvent);
}
- private static void notifyParent(ParentComponentMonitor parent, ScalingBeyondLimitEvent scalingBeyondLimitEvent) {
- parent.onChildScalingOverMaxEvent(scalingBeyondLimitEvent);
+ private static void notifyParent(ParentComponentMonitor parent, ScalingDownBeyondMinEvent scalingDownBeyondMinEvent) {
+ parent.onChildScalingDownBeyondMinEvent(scalingDownBeyondMinEvent);
+ }
+
+ private static void notifyParent(ParentComponentMonitor parent, ScalingUpBeyondMaxEvent scalingUpBeyondMaxEvent) {
+ parent.onChildScalingOverMaxEvent(scalingUpBeyondMaxEvent);
}
public static void notifyChildren (ParentComponentMonitor componentMonitor, ScalingEvent scalingEvent) {