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/11/09 11:35:22 UTC
[1/2] stratos git commit: Removing unused code
Repository: stratos
Updated Branches:
refs/heads/docker-grouping-merge 2e1ac8b2d -> b0ea84539
Removing unused code
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f3f074cc
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f3f074cc
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f3f074cc
Branch: refs/heads/docker-grouping-merge
Commit: f3f074cc404cb774b222be9f43b29c36b48246b0
Parents: 836d0c7
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Nov 9 16:04:14 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Nov 9 16:04:14 2014 +0530
----------------------------------------------------------------------
.../autoscaler/NetworkPartitionContext.java | 147 -------------------
1 file changed, 147 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f3f074cc/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
index c2b3bdf..1c92256 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/NetworkPartitionContext.java
@@ -39,17 +39,10 @@ public class NetworkPartitionContext implements Serializable{
private static final Log log = LogFactory.getLog(NetworkPartitionContext.class);
private static final long serialVersionUID = 572769304374110159L;
private final String id;
- private int scaleDownWaitCount = 5; //TODO get from a config
private int scaleDownRequestsCount = 0;
private float averageRequestsServedPerInstance;
private float requestsServedPerInstance;
-// private String defaultLbClusterId;
-//
-// private Map<String, String> serviceNameToLBClusterIdMap;
-//
-// private Map<String, String> clusterIdToLBClusterIdMap;
-
private final String partitionAlgorithm;
//boolean values to keep whether the requests in flight parameters are reset or not
@@ -75,7 +68,6 @@ public class NetworkPartitionContext implements Serializable{
//details required for partition selection algorithms
private int currentPartitionIndex;
-// private Map<String, Integer> partitionToMemberCountMap;
//partitions of this network partition
private final Map<String, PartitionContext> partitionCtxts;
@@ -90,9 +82,6 @@ public class NetworkPartitionContext implements Serializable{
} else {
this.partitions = Arrays.copyOf(partitions, partitions.length);
}
-// this.setServiceToLBClusterId(new HashMap<String, String>());
-// this.setClusterIdToLBClusterIdMap(new HashMap<String, String>());
-// partitionToMemberCountMap = new HashMap<String, Integer>();
partitionCtxts = new HashMap<String, PartitionContext>();
requestsInFlight = new RequestsInFlight();
loadAverage = new LoadAverage();
@@ -100,87 +89,6 @@ public class NetworkPartitionContext implements Serializable{
}
-// public String getDefaultLbClusterId() {
-//
-// return this.defaultLbClusterId;
-//
-// }
-//
-// public void setDefaultLbClusterId(final String defaultLbClusterId) {
-//
-// this.defaultLbClusterId = defaultLbClusterId;
-//
-// }
-
-// public String getLBClusterIdOfService(final String serviceName) {
-//
-// return (String) this.serviceNameToLBClusterIdMap.get(serviceName);
-//
-// }
-
-// public Map<String, String> getServiceToLBClusterId() {
-//
-// return this.serviceNameToLBClusterIdMap;
-//
-// }
-//
-// public void setServiceToLBClusterId(final Map<String, String> serviceToLBClusterId) {
-//
-// this.serviceNameToLBClusterIdMap = serviceToLBClusterId;
-//
-// }
-//
-// public void addServiceLB(final String serviceName, final String lbClusterId) {
-// this.serviceNameToLBClusterIdMap.put(serviceName, lbClusterId);
-// }
-
-// public String getLBClusterIdOfCluster(final String clusterId) {
-//
-// return (String) this.clusterIdToLBClusterIdMap.get(clusterId);
-//
-// }
-//
-// public Map<String, String> getClusterIdToLBClusterIdMap() {
-//
-// return this.clusterIdToLBClusterIdMap;
-//
-// }
-//
-// public void setClusterIdToLBClusterIdMap(final Map<String, String> clusterIdToLBClusterIdMap) {
-//
-// this.clusterIdToLBClusterIdMap = clusterIdToLBClusterIdMap;
-//
-// }
-
-
-// public boolean isLBExist(final String clusterId) {
-//
-// return clusterId != null &&
-// (clusterId.equals(this.defaultLbClusterId) ||
-// this.serviceNameToLBClusterIdMap.containsValue(clusterId) || this.clusterIdToLBClusterIdMap.containsValue(clusterId));
-//
-// }
-//
-// public boolean isDefaultLBExist() {
-//
-// return defaultLbClusterId != null;
-//
-// }
-//
-// public boolean isServiceLBExist(String serviceName) {
-//
-// return this.serviceNameToLBClusterIdMap.containsKey(serviceName) &&
-// this.serviceNameToLBClusterIdMap.get(serviceName) != null;
-//
-// }
-
-// public boolean isClusterLBExist(String clusterId) {
-//
-// return this.clusterIdToLBClusterIdMap.containsKey(clusterId) &&
-// this.clusterIdToLBClusterIdMap.get(clusterId) != null;
-//
-// }
-
public int getMinInstanceCount() {
return minInstanceCount;
}
@@ -229,8 +137,6 @@ public class NetworkPartitionContext implements Serializable{
return true;
}
-
-
@Override
public String toString() {
return "NetworkPartitionContext [id=" + id + "partitionAlgorithm=" + partitionAlgorithm + ", minInstanceCount=" +
@@ -445,43 +351,6 @@ public class NetworkPartitionContext implements Serializable{
return id;
}
-// public void increaseMemberCountOfPartition(String partitionId, int count){
-// if(!partitionCountExists(partitionId)){
-// addPartitionCount(partitionId, 1);
-// } else{
-// partitionToMemberCountMap.put(partitionId, getMemberCountOfPartition(partitionId) + count);
-// }
-// }
-
-// public void decreaseMemberCountOfPartition(String partitionId, int count){
-//
-// partitionToMemberCountMap.put(partitionId, getMemberCountOfPartition(partitionId) - count);
-// }
-//
-// public void addPartitionCount(String partitionId, int count){
-// partitionToMemberCountMap.put(partitionId, count);
-// }
-//
-// public void removePartitionCount(String partitionId){
-//
-// partitionToMemberCountMap.remove(partitionId);
-// }
-
-// public boolean partitionCountExists(String partitionId){
-// return partitionToMemberCountMap.containsKey(partitionId);
-// }
-
-// public int getMemberCountOfPartition(String partitionId){
-// if(partitionToMemberCountMap.containsKey(partitionId)) {
-// return partitionToMemberCountMap.get(partitionId);
-// }
-// return 0;
-// if(partitionCtxts.containsKey(partitionId)){
-// return getPartitionCtxt(partitionId).getTotalMemberCount();
-// }
-// return 0;
-// }
-
public Map<String, PartitionContext> getPartitionCtxts() {
return partitionCtxts;
}
@@ -516,10 +385,6 @@ public class NetworkPartitionContext implements Serializable{
return 0;
}
- public int getScaleDownWaitCount() {
- return scaleDownWaitCount;
- }
-
public int getScaleDownRequestsCount() {
return scaleDownRequestsCount;
}
@@ -531,16 +396,4 @@ public class NetworkPartitionContext implements Serializable{
this.scaleDownRequestsCount += 1;
}
-
-// public void setPartitions(Partition[] partitions) {
-// this.partitions = partitions;
-// for (Partition partition: partitions){
-// partitionToMemberCountMap.put(partition.getNetworkPartitionId(), 0);
-// }
-// }
-
-// public void setPartitionToMemberCountMap(Map<String, Integer> partitionToMemberCountMap) {
-// this.partitionToMemberCountMap = partitionToMemberCountMap;
-// }
-
}
\ No newline at end of file
[2/2] stratos git commit: Merge branch 'docker-grouping-merge' of
https://git-wip-us.apache.org/repos/asf/stratos into docker-grouping-merge
Posted by la...@apache.org.
Merge branch 'docker-grouping-merge' of https://git-wip-us.apache.org/repos/asf/stratos into docker-grouping-merge
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b0ea8453
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b0ea8453
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b0ea8453
Branch: refs/heads/docker-grouping-merge
Commit: b0ea84539628e89fea0e40b092e94ec1be3e0cfa
Parents: f3f074c 2e1ac8b
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Nov 9 16:04:41 2014 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Nov 9 16:04:41 2014 +0530
----------------------------------------------------------------------
tools/puppet3/modules/python_agent/manifests/init.pp | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------