You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/05/12 10:32:25 UTC
[3/3] stratos git commit: Fixing spelling mistake
Fixing spelling mistake
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7d932cd9
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7d932cd9
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7d932cd9
Branch: refs/heads/master
Commit: 7d932cd92af62201d96915224244b9ea3754e967
Parents: 3da25af
Author: reka <rt...@gmail.com>
Authored: Mon May 11 14:00:53 2015 +0530
Committer: reka <rt...@gmail.com>
Committed: Tue May 12 14:02:03 2015 +0530
----------------------------------------------------------------------
.../monitor/component/ApplicationMonitor.java | 6 +++---
.../autoscaler/monitor/component/GroupMonitor.java | 10 +++++-----
.../monitor/component/ParentComponentMonitor.java | 16 ++++++++--------
.../stratos/autoscaler/util/AutoscalerUtil.java | 2 +-
4 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d932cd9/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
index 940ae04..8183ea8 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/monitor/component/ApplicationMonitor.java
@@ -105,7 +105,7 @@ public class ApplicationMonitor extends ParentComponentMonitor {
*/
public synchronized void monitor() {
final Collection<NetworkPartitionContext> networkPartitionContexts =
- this.getNetworkPartitionCtxts().values();
+ this.getNetworkPartitionContextsMap().values();
Runnable monitoringRunnable = new Runnable() {
@Override
@@ -457,7 +457,7 @@ public class ApplicationMonitor extends ParentComponentMonitor {
//adding to instance map
this.instanceIdToInstanceMap.put(instanceId, instance);
//adding ApplicationLevelNetworkPartitionContext to networkPartitionContexts map
- this.getNetworkPartitionCtxts().put(context.getId(), context);
+ this.getNetworkPartitionContextsMap().put(context.getId(), context);
return instanceId;
}
@@ -525,7 +525,7 @@ public class ApplicationMonitor extends ParentComponentMonitor {
}
for (String networkPartitionId : nextNetworkPartitions) {
- if (!this.getNetworkPartitionCtxts().containsKey(networkPartitionId)) {
+ if (!this.getNetworkPartitionContextsMap().containsKey(networkPartitionId)) {
String instanceId;
ApplicationLevelNetworkPartitionContext context = new
ApplicationLevelNetworkPartitionContext(networkPartitionId);
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d932cd9/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 cd9d924..4f0f09b 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
@@ -114,7 +114,7 @@ public class GroupMonitor extends ParentComponentMonitor {
*/
public synchronized void monitor() {
final Collection<NetworkPartitionContext> networkPartitionContexts =
- this.getNetworkPartitionCtxts().values();
+ this.getNetworkPartitionContextsMap().values();
Runnable monitoringRunnable = new Runnable() {
@Override
@@ -555,7 +555,7 @@ public class GroupMonitor extends ParentComponentMonitor {
//Parent notification always brings up new group instances in order to keep the ratio.
String networkPartitionId = scalingEvent.getNetworkPartitionId();
final String parentInstanceId = scalingEvent.getInstanceId();
- final NetworkPartitionContext networkPartitionContext = this.getNetworkPartitionCtxts().
+ final NetworkPartitionContext networkPartitionContext = this.getNetworkPartitionContextsMap().
get(networkPartitionId);
float factor = scalingEvent.getFactor();
@@ -637,8 +637,8 @@ public class GroupMonitor extends ParentComponentMonitor {
DeploymentPolicy deploymentPolicy = PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyId);
String networkPartitionId = parentInstanceContext.getNetworkPartitionId();
- if (this.getNetworkPartitionCtxts().containsKey(networkPartitionId)) {
- groupLevelNetworkPartitionContext = (GroupLevelNetworkPartitionContext) this.getNetworkPartitionCtxts().
+ if (this.getNetworkPartitionContextsMap().containsKey(networkPartitionId)) {
+ groupLevelNetworkPartitionContext = (GroupLevelNetworkPartitionContext) this.getNetworkPartitionContextsMap().
get(networkPartitionId);
} else {
if (deploymentPolicy != null) {
@@ -984,7 +984,7 @@ public class GroupMonitor extends ParentComponentMonitor {
*/
public void addNetworkPartitionContext(GroupLevelNetworkPartitionContext
groupLevelNetworkPartitionContext) {
- this.getNetworkPartitionCtxts().put(groupLevelNetworkPartitionContext.getId(),
+ this.getNetworkPartitionContextsMap().put(groupLevelNetworkPartitionContext.getId(),
groupLevelNetworkPartitionContext);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d932cd9/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 97beb56..9b252be 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
@@ -84,7 +84,7 @@ public abstract class ParentComponentMonitor extends Monitor {
//terminating map, key=alias, value instanceIds
protected Map<String, List<String>> terminatingInstancesMap;
//network partition contexts
- protected Map<String, NetworkPartitionContext> networkPartitionCtxts;
+ protected Map<String, NetworkPartitionContext> networkPartitionContextsMap;
//Executor service to maintain the thread pool
private ExecutorService executorService;
@@ -110,7 +110,7 @@ public abstract class ParentComponentMonitor extends Monitor {
// Create the executor service with identifier and thread pool size
executorService = StratosThreadPool.getExecutorService(AutoscalerConstants.AUTOSCALER_THREAD_POOL_ID,
AutoscalerConstants.AUTOSCALER_THREAD_POOL_SIZE);
- networkPartitionCtxts = new ConcurrentHashMap<String, NetworkPartitionContext>();
+ networkPartitionContextsMap = new ConcurrentHashMap<String, NetworkPartitionContext>();
}
/**
@@ -251,7 +251,7 @@ public abstract class ParentComponentMonitor extends Monitor {
String instanceId = scalingEvent.getInstanceId();
String id = scalingEvent.getId();
NetworkPartitionContext networkPartitionContext =
- this.getNetworkPartitionCtxts().get(networkPartitionId);
+ this.getNetworkPartitionContextsMap().get(networkPartitionId);
if (networkPartitionContext != null) {
InstanceContext instanceContext = networkPartitionContext.
getInstanceContext(instanceId);
@@ -296,7 +296,7 @@ public abstract class ParentComponentMonitor extends Monitor {
String instanceId = scalingUpBeyondMaxEvent.getInstanceId();
String id = scalingUpBeyondMaxEvent.getId();
NetworkPartitionContext networkPartitionContext =
- this.getNetworkPartitionCtxts().get(networkPartitionId);
+ this.getNetworkPartitionContextsMap().get(networkPartitionId);
if (networkPartitionContext != null) {
InstanceContext instanceContext = networkPartitionContext.
getInstanceContext(instanceId);
@@ -315,7 +315,7 @@ public abstract class ParentComponentMonitor extends Monitor {
}
public NetworkPartitionContext getNetworkPartitionContext(String networkPartitionId) {
- return this.getNetworkPartitionCtxts().get(networkPartitionId);
+ return this.getNetworkPartitionContextsMap().get(networkPartitionId);
}
@@ -619,7 +619,7 @@ public abstract class ParentComponentMonitor extends Monitor {
if (!groupInstances.isEmpty()) {
GroupLevelNetworkPartitionContext networkPartitionContext =
(GroupLevelNetworkPartitionContext) ((GroupMonitor) monitor).
- getNetworkPartitionCtxts().get(networkPartitionId);
+ getNetworkPartitionContextsMap().get(networkPartitionId);
int minInstances = networkPartitionContext.getMinInstanceCount();
//if terminated all the instances in this instances map should be in terminated state
if (noOfInstancesOfRequiredStatus == this.inactiveInstancesMap.size() &&
@@ -874,8 +874,8 @@ public abstract class ParentComponentMonitor extends Monitor {
* This will give the network partitions used by this monitor
* @return network-partition-contexts
*/
- public Map<String, NetworkPartitionContext> getNetworkPartitionCtxts() {
- return networkPartitionCtxts;
+ public Map<String, NetworkPartitionContext> getNetworkPartitionContextsMap() {
+ return networkPartitionContextsMap;
}
/**
http://git-wip-us.apache.org/repos/asf/stratos/blob/7d932cd9/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
index b38b6b5..5968b1b 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
@@ -780,7 +780,7 @@ public class AutoscalerUtil {
findGroupMonitorWithId(existingGroup.getUniqueIdentifier());
//Updating the GroupMonitor
for (NetworkPartitionContext networkPartitionContext : groupMonitor.
- getNetworkPartitionCtxts().values()) {
+ getNetworkPartitionContextsMap().values()) {
((GroupLevelNetworkPartitionContext) networkPartitionContext).
setMinInstanceCount(newGroup.getGroupMinInstances());
((GroupLevelNetworkPartitionContext) networkPartitionContext).