You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/08/13 13:17:04 UTC
stratos git commit: Update forceful undeployment
Repository: stratos
Updated Branches:
refs/heads/tenant-isolation 9f84a07bc -> d819d1aae
Update forceful undeployment
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d819d1aa
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d819d1aa
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d819d1aa
Branch: refs/heads/tenant-isolation
Commit: d819d1aaea34dcee883a6bf69264e7dc02345cca
Parents: 9f84a07
Author: Gayan Gunarathne <ga...@wso2.com>
Authored: Thu Aug 13 16:42:28 2015 +0530
Committer: Gayan Gunarathne <ga...@wso2.com>
Committed: Thu Aug 13 16:42:28 2015 +0530
----------------------------------------------------------------------
.../services/impl/AutoscalerServiceImpl.java | 8 +-
.../src/test/resources/stratos-testing.xml | 102 ++++++++++---------
2 files changed, 56 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d819d1aa/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
index dc12881..b8e52c7 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/services/impl/AutoscalerServiceImpl.java
@@ -1170,15 +1170,15 @@ public class AutoscalerServiceImpl implements AutoscalerService {
Set<ClusterDataHolder> allClusters = application.getClusterDataRecursively();
for (ClusterDataHolder clusterDataHolder : allClusters) {
- String serviceType = clusterDataHolder.getServiceType();
+ String serviceUuid = clusterDataHolder.getServiceUuid();
String clusterId = clusterDataHolder.getClusterId();
Cluster cluster;
try {
- TopologyManager.acquireReadLockForCluster(serviceType, clusterId);
- cluster = TopologyManager.getTopology().getService(serviceType).getCluster(clusterId);
+ TopologyManager.acquireReadLockForCluster(serviceUuid, clusterId);
+ cluster = TopologyManager.getTopology().getService(serviceUuid).getCluster(clusterId);
} finally {
- TopologyManager.releaseReadLockForCluster(serviceType, clusterId);
+ TopologyManager.releaseReadLockForCluster(serviceUuid, clusterId);
}
//If there are no members in cluster Instance, send cluster Terminated Event
http://git-wip-us.apache.org/repos/asf/stratos/blob/d819d1aa/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
----------------------------------------------------------------------
diff --git a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
index c530c1c..31118dc 100644
--- a/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
+++ b/products/stratos/modules/integration/src/test/resources/stratos-testing.xml
@@ -21,60 +21,62 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
<suite name="StratosIntegrationSuite">
- <test name="CartridgeTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.group.CartridgeTest" />
- </classes>
- </test>
- <test name="CartridgeGroupTest" >
- <classes>
- <class name="org.apache.stratos.integration.tests.group.CartridgeGroupTest" />
- </classes>
- </test>
- <test name="NetworkPartitionTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.policies.NetworkPartitionTest" />
- </classes>
- </test>
- <test name="ApplicationPolicyTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.policies.ApplicationPolicyTest" />
- </classes>
- </test>
- <test name="DeploymentPolicyTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.policies.DeploymentPolicyTest" />
- </classes>
- </test>
- <test name="AutoscalingPolicyTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.policies.AutoscalingPolicyTest" />
- </classes>
- </test>
- <test name="SampleApplicationsTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.application.SampleApplicationsTest" />
- </classes>
- </test>
- <!-- <test name="ApplicationUpdateTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.application.ApplicationUpdateTest" />
- </classes>
- </test>
- <test name="SingleClusterScalingTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.application.SingleClusterScalingTest" />
- </classes>
- </test>
- <test name="PartitionRoundRobinClusterTest">
- <classes>
- <class name="org.apache.stratos.integration.tests.application.PartitionRoundRobinClusterTest" />
- </classes>
- </test> -->
+ <test name="CartridgeTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.group.CartridgeTest" />
+ </classes>
+ </test>
+ <test name="CartridgeGroupTest" >
+ <classes>
+ <class name="org.apache.stratos.integration.tests.group.CartridgeGroupTest" />
+ </classes>
+ </test>
+ <test name="NetworkPartitionTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.policies.NetworkPartitionTest" />
+ </classes>
+ </test>
+ <test name="ApplicationPolicyTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.policies.ApplicationPolicyTest" />
+ </classes>
+ </test>
+ <test name="DeploymentPolicyTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.policies.DeploymentPolicyTest" />
+ </classes>
+ </test>
+ <test name="AutoscalingPolicyTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.policies.AutoscalingPolicyTest" />
+ </classes>
+ </test>
+ <test name="SampleApplicationsTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.application.SampleApplicationsTest" />
+ </classes>
+ </test>
<test name="ApplicationBurstingTest">
<classes>
<class name="org.apache.stratos.integration.tests.application.ApplicationBurstingTest" />
</classes>
</test>
+ <!--
+ <test name="ApplicationUpdateTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.application.ApplicationUpdateTest" />
+ </classes>
+ </test>
+ <test name="SingleClusterScalingTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.application.SingleClusterScalingTest" />
+ </classes>
+ </test>
+ <test name="PartitionRoundRobinClusterTest">
+ <classes>
+ <class name="org.apache.stratos.integration.tests.application.PartitionRoundRobinClusterTest" />
+ </classes>
+ </test> -->
+
</suite>