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 2015/04/24 12:48:38 UTC
[7/9] stratos git commit: Formatting autoscaler component
Formatting autoscaler component
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/82f81c78
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/82f81c78
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/82f81c78
Branch: refs/heads/master
Commit: 82f81c7824123e024ce10085b153054ec801f62e
Parents: e30dfbb
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri Apr 24 14:42:25 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri Apr 24 14:42:25 2015 +0530
----------------------------------------------------------------------
.../context/partition/PartitionContext.java | 10 ++++
.../internal/AutoscalerServiceComponent.java | 3 +-
.../monitor/component/GroupMonitor.java | 10 ++--
.../autoscaler/registry/RegistryManager.java | 2 +-
.../stratos/autoscaler/util/AutoscalerUtil.java | 60 ++++++++++----------
5 files changed, 47 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/82f81c78/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java
index 9849702..8e3d6c7 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/context/partition/PartitionContext.java
@@ -39,6 +39,7 @@ public abstract class PartitionContext implements Serializable {
private Partition partition;
private String deploymentPolicyId;
private String networkPartitionId;
+ private boolean isObsoletePartition = false;
// properties
private Properties properties;
@@ -98,4 +99,13 @@ public abstract class PartitionContext implements Serializable {
.getNetworkPartitionByNetworkPartitionId(networkPartitionId)
.getPartition(partitionId).getPartitionMax();
}
+
+ public void setIsObsoletePartition(boolean isObsoletePartition) {
+ this.isObsoletePartition = isObsoletePartition;
+ }
+
+ public boolean isObsoletePartition() {
+ return isObsoletePartition;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/82f81c78/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
index d161398..e3641b6 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/internal/AutoscalerServiceComponent.java
@@ -189,8 +189,7 @@ public class AutoscalerServiceComponent {
}
-
- // Add application policies to information model
+ // Add application policies to information model
List<ApplicationPolicy> applicationPolicies = RegistryManager.getInstance().
retrieveApplicationPolicies();
Iterator<ApplicationPolicy> applicationPolicyIterator = applicationPolicies.iterator();
http://git-wip-us.apache.org/repos/asf/stratos/blob/82f81c78/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 1de7e90..e8da232 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
@@ -142,13 +142,13 @@ public class GroupMonitor extends ParentComponentMonitor {
}
int nonTerminatedInstancesCount = networkPartitionContext.
- getNonTerminatedInstancesCount();
- int minInstances = ((GroupLevelNetworkPartitionContext)networkPartitionContext).
+ getNonTerminatedInstancesCount();
+ int minInstances = ((GroupLevelNetworkPartitionContext) networkPartitionContext).
getMinInstanceCount();
- if(nonTerminatedInstancesCount < minInstances) {
+ if (nonTerminatedInstancesCount < minInstances) {
int instancesToBeCreated = minInstances - nonTerminatedInstancesCount;
- for(int i = 0; i < instancesToBeCreated; i++) {
- for(InstanceContext parentInstanceContext : parent.
+ for (int i = 0; i < instancesToBeCreated; i++) {
+ for (InstanceContext parentInstanceContext : parent.
getNetworkPartitionContext(networkPartitionContext.getId()).
getInstanceIdToInstanceContextMap().values()) {
//Creating new group instance based on the existing parent instances
http://git-wip-us.apache.org/repos/asf/stratos/blob/82f81c78/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
index 771f362..2a64f25 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/registry/RegistryManager.java
@@ -401,7 +401,7 @@ public class RegistryManager {
* @return all the deployment policies
*/
public List<DeploymentPolicy> retrieveDeploymentPolicies() {
- try{
+ try {
startTenantFlow();
List<DeploymentPolicy> depPolicyList = new ArrayList<DeploymentPolicy>();
RegistryManager registryManager = RegistryManager.getInstance();
http://git-wip-us.apache.org/repos/asf/stratos/blob/82f81c78/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 1548e98..3e6c134 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
@@ -545,13 +545,13 @@ public class AutoscalerUtil {
aliasToDeploymentPolicyIdMap.put(groupContext.getAlias(), deploymentPolicyId);
if (groupContext.getCartridgeContexts() != null && groupContext.getCartridgeContexts().length != 0) {
setDeploymentPolicyIdToChildCartridgeContexts(aliasToDeploymentPolicyIdMap,
- deploymentPolicyId,
+ deploymentPolicyId,
groupContext.getCartridgeContexts());
}
if (groupContext.getGroupContexts() != null && groupContext.getGroupContexts().length != 0) {
setDeploymentPolicyIdToChildGroupContexts(aliasToDeploymentPolicyIdMap,
- deploymentPolicyId,
- groupContext.getGroupContexts());
+ deploymentPolicyId,
+ groupContext.getGroupContexts());
}
}
@@ -562,13 +562,13 @@ public class AutoscalerUtil {
private static void setDeploymentPolicyIdToChildCartridgeContexts(
Map<String, String> aliasToDeploymentPolicyIdMap, String deploymentPolicyId,
- CartridgeContext[] cartridgeContexts) {
+ CartridgeContext[] cartridgeContexts) {
if (cartridgeContexts != null && cartridgeContexts.length != 0) {
for (CartridgeContext cartridgeContext : cartridgeContexts) {
if (cartridgeContext != null) {
aliasToDeploymentPolicyIdMap.put(cartridgeContext.getSubscribableInfoContext().getAlias(),
- deploymentPolicyId);
+ deploymentPolicyId);
}
}
}
@@ -582,13 +582,13 @@ public class AutoscalerUtil {
if (groupContext != null) {
if (groupContext.getCartridgeContexts() != null && groupContext.getCartridgeContexts().length != 0) {
setDeploymentPolicyIdToChildCartridgeContexts(aliasToDeploymentPolicyIdMap,
- deploymentPolicyId,
- groupContext.getCartridgeContexts());
+ deploymentPolicyId,
+ groupContext.getCartridgeContexts());
}
if (groupContext.getGroupContexts() != null && groupContext.getGroupContexts().length != 0) {
setDeploymentPolicyIdToChildGroupContexts(aliasToDeploymentPolicyIdMap,
- deploymentPolicyId,
- groupContext.getGroupContexts());
+ deploymentPolicyId,
+ groupContext.getGroupContexts());
}
}
}
@@ -623,7 +623,7 @@ public class AutoscalerUtil {
String algorithm = applicationPolicy.getAlgorithm();
if (algorithm == null || StringUtils.isBlank(algorithm)) {
String msg = "Invalid Application Policy. Cause -> Network " +
- "partition algorithm is null or empty";
+ "partition algorithm is null or empty";
log.error(msg);
throw new InvalidApplicationPolicyException(msg);
}
@@ -662,9 +662,9 @@ public class AutoscalerUtil {
// network partitions should be added already
if (null == CloudControllerServiceClient.getInstance().
- getNetworkPartition(networkPartitionId)) {
+ getNetworkPartition(networkPartitionId)) {
String msg = String.format("Invalid Application Policy. "
- + "Cause -> Network partition not found for network-partition-id : %s",
+ + "Cause -> Network partition not found for network-partition-id : %s",
networkPartitionId);
log.error(msg);
throw new InvalidApplicationPolicyException(msg);
@@ -691,7 +691,7 @@ public class AutoscalerUtil {
// network-partition-id can't be null or empty
if (null == networkPartitionId || networkPartitionId.isEmpty()) {
String msg = String.format("Invalid Application Policy. "
- + "Cause -> Invalid network-partition-id : %s",
+ + "Cause -> Invalid network-partition-id : %s",
networkPartitionId);
log.error(msg);
throw new InvalidApplicationPolicyException(msg);
@@ -767,30 +767,30 @@ public class AutoscalerUtil {
}
public void updateApplicationsTopology(Application application)
- throws ApplicationDefinitionException{
+ throws ApplicationDefinitionException {
Application existingApplication = ApplicationHolder.getApplications().
- getApplication(application.getUniqueIdentifier());
+ getApplication(application.getUniqueIdentifier());
//Retrieve all the groups in order to update it
Set<Group> existingGroups = existingApplication.getAllGroupsRecursively();
//updating all the groups by traversing the existing application
- for(Group existingGroup : existingGroups) {
+ for (Group existingGroup : existingGroups) {
Group newGroup = application.getGroupRecursively(existingGroup.getUniqueIdentifier());
- if(newGroup != null) {
+ if (newGroup != null) {
//Finding the GroupMonitor based on ApplicationMonitor
GroupMonitor groupMonitor = (GroupMonitor) AutoscalerContext.getInstance().
getAppMonitor(application.getUniqueIdentifier()).
findGroupMonitorWithId(existingGroup.getUniqueIdentifier());
//Updating the GroupMonitor
- for(NetworkPartitionContext networkPartitionContext : groupMonitor.
+ for (NetworkPartitionContext networkPartitionContext : groupMonitor.
getNetworkPartitionCtxts().values()) {
- ((GroupLevelNetworkPartitionContext)networkPartitionContext).
+ ((GroupLevelNetworkPartitionContext) networkPartitionContext).
setMinInstanceCount(newGroup.getGroupMinInstances());
- ((GroupLevelNetworkPartitionContext)networkPartitionContext).
+ ((GroupLevelNetworkPartitionContext) networkPartitionContext).
setMaxInstanceCount(newGroup.getGroupMaxInstances());
}
- try{
+ try {
ApplicationHolder.acquireWriteLock();
//update the min and max of Group instances
existingGroup.setGroupMinInstances(newGroup.getGroupMinInstances());
@@ -810,24 +810,24 @@ public class AutoscalerUtil {
}
- public void updateClusterMonitor(Application application) throws ApplicationDefinitionException{
+ public void updateClusterMonitor(Application application) throws ApplicationDefinitionException {
Application existingApplication = ApplicationHolder.getApplications().
getApplication(application.getUniqueIdentifier());
Set<ClusterDataHolder> clusterDataHolders = application.getClusterDataRecursively();
- for(ClusterDataHolder clusterDataHolder : clusterDataHolders) {
+ for (ClusterDataHolder clusterDataHolder : clusterDataHolders) {
ClusterMonitor clusterMonitor = AutoscalerContext.getInstance().
- getClusterMonitor(clusterDataHolder.getClusterId());
- if(clusterMonitor != null) {
- for(ClusterLevelNetworkPartitionContext networkPartitionContext :
+ getClusterMonitor(clusterDataHolder.getClusterId());
+ if (clusterMonitor != null) {
+ for (ClusterLevelNetworkPartitionContext networkPartitionContext :
clusterMonitor.getNetworkPartitionCtxts()) {
- for(InstanceContext instanceContext :
+ for (InstanceContext instanceContext :
networkPartitionContext.getInstanceIdToInstanceContextMap().values()) {
//Updating the min and max instances of cluster instance context
- ((ClusterInstanceContext)instanceContext).
+ ((ClusterInstanceContext) instanceContext).
setMinInstanceCount(clusterDataHolder.getMinInstances());
- ((ClusterInstanceContext)instanceContext).
+ ((ClusterInstanceContext) instanceContext).
setMaxInstanceCount(clusterDataHolder.getMaxInstances());
try {
@@ -836,7 +836,7 @@ public class AutoscalerUtil {
ClusterDataHolder existingClusterDataHolder = existingApplication.
getClusterDataHolderRecursivelyByAlias(
AutoscalerUtil.getAliasFromClusterId(
- clusterDataHolder.getClusterId()));
+ clusterDataHolder.getClusterId()));
existingClusterDataHolder.setMinInstances(clusterDataHolder.
getMinInstances());
existingClusterDataHolder.setMaxInstances(clusterDataHolder.