You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/11/28 10:13:56 UTC
[1/2] stratos git commit: adding the NW Partition context -> Cluster
Instance Context -> Partition Context hierarchy to VMClusterMonitor
Repository: stratos
Updated Branches:
refs/heads/master c9bcd6ef5 -> dd1be219e
adding the NW Partition context -> Cluster Instance Context -> Partition Context hierarchy to VMClusterMonitor
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dd1be219
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dd1be219
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dd1be219
Branch: refs/heads/master
Commit: dd1be219e25eaa4968b42163323afeb54bbf414c
Parents: f5dc44c
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Fri Nov 28 14:43:27 2014 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Fri Nov 28 14:43:39 2014 +0530
----------------------------------------------------------------------
.../context/cluster/ClusterInstanceContext.java | 3 +++
.../ClusterLevelNetworkPartitionContext.java | 19 ++++++++++---------
2 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/dd1be219/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java
index 1e5ad12..d2be1c8 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/cluster/ClusterInstanceContext.java
@@ -77,4 +77,7 @@ public class ClusterInstanceContext {
return null;
}
+ public String getClusterInstanceId() {
+ return clusterInstanceId;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/dd1be219/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ClusterLevelNetworkPartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ClusterLevelNetworkPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ClusterLevelNetworkPartitionContext.java
index 34c62e8..10492f3 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ClusterLevelNetworkPartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/network/ClusterLevelNetworkPartitionContext.java
@@ -20,6 +20,7 @@ package org.apache.stratos.autoscaler.context.partition.network;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.autoscaler.context.cluster.ClusterInstanceContext;
import org.apache.stratos.autoscaler.context.partition.ClusterLevelPartitionContext;
import org.apache.stratos.autoscaler.policy.model.LoadAverage;
import org.apache.stratos.autoscaler.policy.model.MemoryConsumption;
@@ -49,7 +50,7 @@ public class ClusterLevelNetworkPartitionContext extends NetworkPartitionContext
private int requiredInstanceCountBasedOnStats;
private int requiredInstanceCountBasedOnDependencies;
- private Map<String, Instance> instanceIdToInstanceContextMap;
+ private Map<String, ClusterInstanceContext> instanceIdToClusterInstanceContextMap;
private final String partitionAlgorithm;
@@ -98,7 +99,7 @@ public class ClusterLevelNetworkPartitionContext extends NetworkPartitionContext
}
requiredInstanceCountBasedOnStats = minInstanceCount;
requiredInstanceCountBasedOnDependencies = minInstanceCount;
- instanceIdToInstanceContextMap = new HashMap<String, Instance>();
+ instanceIdToClusterInstanceContextMap = new HashMap<String, ClusterInstanceContext>();
}
@@ -428,17 +429,17 @@ public class ClusterLevelNetworkPartitionContext extends NetworkPartitionContext
this.requiredInstanceCountBasedOnDependencies = requiredInstanceCountBasedOnDependencies;
}
- public Map<String, Instance> getInstanceIdToInstanceContextMap() {
- return instanceIdToInstanceContextMap;
+ public Map<String, ClusterInstanceContext> getClusterInstanceContextMap() {
+ return instanceIdToClusterInstanceContextMap;
}
- public void setInstanceIdToInstanceContextMap(Map<String, Instance> instanceIdToInstanceContextMap) {
- this.instanceIdToInstanceContextMap = instanceIdToInstanceContextMap;
+ public void addClusterInstanceContext (ClusterInstanceContext clusterInstanceContext) {
+ instanceIdToClusterInstanceContextMap.put(clusterInstanceContext.getClusterInstanceId(),
+ clusterInstanceContext);
}
- public void addInstanceContext(Instance context) {
- this.instanceIdToInstanceContextMap.put(context.getInstanceId(), context);
-
+ public ClusterInstanceContext getClusterInstanceContext (String clusterInstanceId) {
+ return instanceIdToClusterInstanceContextMap.get(clusterInstanceId);
}
}
\ No newline at end of file
[2/2] stratos git commit: adding a map for Cluster Level Network
Partition Context in VMClusterMonitor
Posted by is...@apache.org.
adding a map for Cluster Level Network Partition Context in VMClusterMonitor
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f5dc44cd
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f5dc44cd
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f5dc44cd
Branch: refs/heads/master
Commit: f5dc44cd604c01314ac4f95a4aad2c7670e5f7d0
Parents: c9bcd6e
Author: Isuru Haththotuwa <is...@apache.org>
Authored: Fri Nov 28 14:21:45 2014 +0530
Committer: Isuru Haththotuwa <is...@apache.org>
Committed: Fri Nov 28 14:43:39 2014 +0530
----------------------------------------------------------------------
.../autoscaler/monitor/cluster/VMClusterMonitor.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f5dc44cd/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 2a59f02..3bc84f4 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
@@ -55,10 +55,19 @@ import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
abstract public class VMClusterMonitor extends AbstractClusterMonitor {
private static final Log log = LogFactory.getLog(VMClusterMonitor.class);
+ private Map<String, ClusterLevelNetworkPartitionContext> networkPartitionIdToClusterLevelNetworkPartitionCtxts;
protected VMClusterMonitor(String serviceType, String clusterId, AutoscalerRuleEvaluator autoscalerRuleEvaluator) {
super(serviceType, clusterId, autoscalerRuleEvaluator);
+ this.networkPartitionIdToClusterLevelNetworkPartitionCtxts = new HashMap<String, ClusterLevelNetworkPartitionContext>();
+ }
+
+ public void addClusterLevelNWPartitionContext (ClusterLevelNetworkPartitionContext clusterLevelNWPartitionCtxt) {
+ networkPartitionIdToClusterLevelNetworkPartitionCtxts.put(clusterLevelNWPartitionCtxt.getId(), clusterLevelNWPartitionCtxt);
+ }
+ public ClusterLevelNetworkPartitionContext getClusterLevelNWPartitionContext (String nwPartitionId) {
+ return networkPartitionIdToClusterLevelNetworkPartitionCtxts.get(nwPartitionId);
}
@Override