adding member count validation for cluster when cartridge min/max is updated
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/23c543de Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/23c543de Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/23c543de Branch: refs/heads/master Commit: 23c543deda188cb3b721581f64f8dd63004847a0 Parents: 874a220 Author: reka <[email protected]> Authored: Mon Aug 3 18:29:34 2015 +0530 Committer: reka <[email protected]> Committed: Tue Aug 4 15:02:12 2015 +0530 ---------------------------------------------------------------------- .../tests/SampleApplicationsTest.java | 86 ++++++++++++++++++-- .../src/test/resources/JMSOutputAdaptor.xml | 2 +- 2 files changed, 78 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/23c543de/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java index c98e8f9..b3fd793 100644 --- a/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java +++ b/products/stratos/modules/integration/src/test/java/org/apache/stratos/integration/tests/SampleApplicationsTest.java @@ -112,15 +112,16 @@ public class SampleApplicationsTest extends StratosTestServerManager { @Test public void testAutoscalingPolicy() { try { - boolean added = autoscalingPolicyTest.addAutoscalingPolicy("autoscaling-policy-c0.json", + String policyId = "autoscaling-policy-c0"; + boolean added = autoscalingPolicyTest.addAutoscalingPolicy(policyId + ".json", endpoint, restClient); - assertEquals(added, true); - AutoscalePolicyBean bean = autoscalingPolicyTest.getAutoscalingPolicy("autoscaling-policy-c0", endpoint, + assertEquals(String.format("Autoscaling policy did not added: [autoscaling-policy-id] %s", policyId), added, true); + AutoscalePolicyBean bean = autoscalingPolicyTest.getAutoscalingPolicy(policyId, endpoint, restClient); - assertEquals(bean.getId(), "autoscaling-policy-c0"); - assertEquals(bean.getLoadThresholds().getRequestsInFlight().getThreshold(), 35.0, 0.0); - assertEquals(bean.getLoadThresholds().getMemoryConsumption().getThreshold(), 45.0, 0.0); - assertEquals(bean.getLoadThresholds().getLoadAverage().getThreshold(), 25.0, 0.0); + assertEquals(String.format("[autoscaling-policy-id] %s RIF is not correct", bean.getId()),bean.getId(), policyId); + assertEquals(String.format("[autoscaling-policy-id] %s RIF is not correct", policyId), bean.getLoadThresholds().getRequestsInFlight().getThreshold(), 35.0, 0.0); + assertEquals(String.format("[autoscaling-policy-id] %s Memory is not correct", policyId),bean.getLoadThresholds().getMemoryConsumption().getThreshold(), 45.0, 0.0); + assertEquals(String.format("[autoscaling-policy-id] %s Load is not correct", policyId),bean.getLoadThresholds().getLoadAverage().getThreshold(), 25.0, 0.0); boolean updated = autoscalingPolicyTest.updateAutoscalingPolicy("autoscaling-policy-c0.json", endpoint, restClient); @@ -450,6 +451,9 @@ public class SampleApplicationsTest extends StratosTestServerManager { assertEquals(updated, true); assertGroupInstanceCount(bean.getApplicationId(), "group3", 2); + + assertClusterMinMemberCount(bean.getApplicationId(), 2); + ApplicationBean updatedBean = applicationTest.getApplication("g-sc-G123-1", endpoint, restClient); assertEquals(updatedBean.getApplicationId(), "g-sc-G123-1"); @@ -849,7 +853,7 @@ public class SampleApplicationsTest extends StratosTestServerManager { applicationName), application); Collection<Group> groups = application.getAllGroupsRecursively(); - for(Group group : groups) { + for (Group group : groups) { assertEquals(group.getInstanceContextCount() >= group.getGroupMinInstances(), true); } } @@ -865,7 +869,7 @@ public class SampleApplicationsTest extends StratosTestServerManager { applicationName), application); Set<ClusterDataHolder> clusterDataHolderSet = application.getClusterDataRecursively(); - for(ClusterDataHolder clusterDataHolder : clusterDataHolderSet) { + for (ClusterDataHolder clusterDataHolder : clusterDataHolderSet) { String serviceName = clusterDataHolder.getServiceType(); String clusterId = clusterDataHolder.getClusterId(); Service service = TopologyManager.getTopology().getService(serviceName); @@ -898,6 +902,70 @@ public class SampleApplicationsTest extends StratosTestServerManager { } + private void assertClusterMinMemberCount(String applicationName, int minMembers) { + long startTime = System.currentTimeMillis(); + + Application application = ApplicationManager.getApplications().getApplication(applicationName); + assertNotNull(String.format("Application is not found: [application-id] %s", + applicationName), application); + + Set<ClusterDataHolder> clusterDataHolderSet = application.getClusterDataRecursively(); + for (ClusterDataHolder clusterDataHolder : clusterDataHolderSet) { + String serviceName = clusterDataHolder.getServiceType(); + String clusterId = clusterDataHolder.getClusterId(); + Service service = TopologyManager.getTopology().getService(serviceName); + assertNotNull(String.format("Service is not found: [application-id] %s [service] %s", + applicationName, serviceName), service); + + Cluster cluster = service.getCluster(clusterId); + assertNotNull(String.format("Cluster is not found: [application-id] %s [service] %s [cluster-id] %s", + applicationName, serviceName, clusterId), cluster); + boolean clusterActive = false; + + for (ClusterInstance instance : cluster.getInstanceIdToInstanceContextMap().values()) { + int activeInstances = 0; + for (Member member : cluster.getMembers()) { + if (member.getClusterInstanceId().equals(instance.getInstanceId())) { + if (member.getStatus().equals(MemberStatus.Active)) { + activeInstances++; + } + } + } + clusterActive = activeInstances >= minMembers; + + while (!clusterActive) { + try { + Thread.sleep(1000); + } catch (InterruptedException ignore) { + } + service = TopologyManager.getTopology().getService(serviceName); + assertNotNull(String.format("Service is not found: [application-id] %s [service] %s", + applicationName, serviceName), service); + + cluster = service.getCluster(clusterId); + activeInstances = 0; + for (Member member : cluster.getMembers()) { + if (member.getClusterInstanceId().equals(instance.getInstanceId())) { + if (member.getStatus().equals(MemberStatus.Active)) { + activeInstances++; + } + } + } + clusterActive = activeInstances >= minMembers; + assertNotNull(String.format("Cluster is not found: [application-id] %s [service] %s [cluster-id] %s", + applicationName, serviceName, clusterId), cluster); + + if ((System.currentTimeMillis() - startTime) > APPLICATION_ACTIVATION_TIMEOUT) { + break; + } + } + } + assertEquals(String.format("Cluster status did not change to active: [cluster-id] %s", clusterId), + clusterActive, true); + } + + } + /** * Assert application activation http://git-wip-us.apache.org/repos/asf/stratos/blob/23c543de/products/stratos/modules/integration/src/test/resources/JMSOutputAdaptor.xml ---------------------------------------------------------------------- diff --git a/products/stratos/modules/integration/src/test/resources/JMSOutputAdaptor.xml b/products/stratos/modules/integration/src/test/resources/JMSOutputAdaptor.xml index 59c3653..a6a2cff 100755 --- a/products/stratos/modules/integration/src/test/resources/JMSOutputAdaptor.xml +++ b/products/stratos/modules/integration/src/test/resources/JMSOutputAdaptor.xml @@ -23,7 +23,7 @@ <outputEventAdaptor name="JMSOutputAdaptor" statistics="disable" trace="enable" type="jms" xmlns="http://wso2.org/carbon/eventadaptormanager";> <!--property name="java.naming.provider.url">CEP_HOME/repository/conf/jndi.properties</property--> - <property name="java.naming.provider.url">tcp://localhost:61616</property> + <property name="java.naming.provider.url">tcp://localhost:61617</property> <property name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</property> <property name="transport.jms.ConnectionFactoryJNDIName">TopicConnectionFactory</property> <property name="transport.jms.DestinationType">topic</property>
