Skip to content

[AMBARI-22854] Fix running service checks with new mpack definitions - UT fix (dsen) #495

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
d0zen1 merged 2 commits into from
Feb 28, 2018
Merged

[AMBARI-22854] Fix running service checks with new mpack definitions - UT fix (dsen) #495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c60da0a
[AMBARI-22854] Fix running service checks with new mpack definitions …
d0zen1 Feb 28, 2018
6133225
[AMBARI-22854] Fix running service checks with new mpack definitions …
d0zen1 Feb 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion ...ver/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5228,6 +5228,7 @@ public void testClientServiceSmokeTests() throws Exception {
createService(cluster1, serviceGroupName, serviceName, repositoryVersion01, null);
String componentName1 = "PIG";
createServiceComponent(cluster1, serviceGroupName, serviceName, componentName1, State.INIT);
createServiceComponent(cluster1, serviceGroupName, serviceName, "SOME_CLIENT_FOR_SERVICE_CHECK", State.INIT);

String host1 = getUniqueName();
String host2 = getUniqueName();
Expand All @@ -5243,6 +5244,8 @@ public void testClientServiceSmokeTests() throws Exception {
host1, null);
createServiceComponentHost(cluster1, serviceGroupName, null, componentName1,
host2, null);
createServiceComponentHost(cluster1, serviceGroupName, null, "SOME_CLIENT_FOR_SERVICE_CHECK",
host2, null);

ServiceRequest r = new ServiceRequest(cluster1, serviceGroupName, serviceName, repositoryVersion01.getId(),
State.INSTALLED.toString(), null);
Expand All @@ -5266,7 +5269,7 @@ public void testClientServiceSmokeTests() throws Exception {
}

List<ShortTaskStatus> taskStatuses = trackAction.getTasks();
Assert.assertEquals(2, taskStatuses.size());
Assert.assertEquals(3, taskStatuses.size());

List<Stage> stages = actionDB.getAllStages(trackAction.getRequestId());
Assert.assertEquals(1, stages.size());
Expand Down Expand Up @@ -5326,9 +5329,11 @@ public void testSkipTaskOnUnhealthyHosts() throws Exception {
createService(cluster1, serviceGroupName, serviceName, null);
String componentName1 = "NAMENODE";
String componentName2 = "DATANODE";
String componentName3 = "HDFS_CLIENT";

createServiceComponent(cluster1, serviceGroupName, serviceName, componentName1, State.INIT);
createServiceComponent(cluster1, serviceGroupName, serviceName, componentName2, State.INIT);
createServiceComponent(cluster1, serviceGroupName, serviceName, componentName3, State.INIT);

String host1 = getUniqueName();
String host2 = getUniqueName();
Expand All @@ -5344,6 +5349,8 @@ public void testSkipTaskOnUnhealthyHosts() throws Exception {
host2, null);
createServiceComponentHost(cluster1, serviceGroupName, serviceName, componentName2,
host3, null);
createServiceComponentHost(cluster1, serviceGroupName, serviceName, componentName3,
host2, null);

// Install
installService(cluster1, serviceGroupName, serviceName, false, false);
Expand Down Expand Up @@ -6018,6 +6025,9 @@ public void testResourceFiltersWithCustomCommands() throws Exception {
ServiceGroup serviceGroup = cluster.addServiceGroup("CORE", "HDP-2.0.6");
Service hdfs = cluster.addService(serviceGroup, "HDFS", "HDFS", repositoryVersion);
Service mapred = cluster.addService(serviceGroup, "YARN", "YARN", repositoryVersion);
Service hadoop_clients = cluster.addService(serviceGroup, "HADOOP_CLIENTS", "HADOOP_CLIENTS", repositoryVersion);

hdfs = cluster.addDependencyToService("CORE", "HDFS", hadoop_clients.getServiceId());

hdfs.addServiceComponent(Role.HDFS_CLIENT.name());
hdfs.addServiceComponent(Role.NAMENODE.name());
Expand Down Expand Up @@ -6116,6 +6126,11 @@ public void testResourceFiltersWithCustomCommands() throws Exception {
}

// Test service checks - specific host

hadoop_clients.addServiceComponent("SOME_CLIENT_FOR_SERVICE_CHECK");
hadoop_clients.getServiceComponent("SOME_CLIENT_FOR_SERVICE_CHECK").addServiceComponentHost(host1);
hadoop_clients.getServiceComponent("SOME_CLIENT_FOR_SERVICE_CHECK").addServiceComponentHost(host2);

resourceFilters.clear();
resourceFilter = new RequestResourceFilter("CORE", "HDFS", null,
Arrays.asList(host1));
Expand Down Expand Up @@ -8580,9 +8595,11 @@ public void testScheduleSmokeTest() throws Exception {
serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, serviceGroupName, "HDFS", "NAMENODE", null));
serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, serviceGroupName, "HDFS", "SECONDARY_NAMENODE", null));
serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, serviceGroupName, "HDFS", "DATANODE", null));
serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, serviceGroupName, "HDFS", "HDFS_CLIENT", null));
serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, serviceGroupName, "MAPREDUCE2", "HISTORYSERVER", null));
serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, serviceGroupName, "YARN", "RESOURCEMANAGER", null));
serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, serviceGroupName, "YARN", "NODEMANAGER", null));
serviceComponentRequests.add(new ServiceComponentRequest(CLUSTER_NAME, serviceGroupName, "YARN", "YARN_CLIENT", null));

ComponentResourceProviderTest.createComponents(amc, serviceComponentRequests);

Expand All @@ -8594,10 +8611,12 @@ public void testScheduleSmokeTest() throws Exception {
Set<ServiceComponentHostRequest> componentHostRequests = new HashSet<>();
componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, serviceGroupName, null, "DATANODE", HOST1, null));
componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, serviceGroupName, null, "NAMENODE", HOST1, null));
componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, serviceGroupName, null, "HDFS_CLIENT", HOST1, null));
componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, serviceGroupName, null, "SECONDARY_NAMENODE", HOST1, null));
componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, serviceGroupName, null, "HISTORYSERVER", HOST1, null));
componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, serviceGroupName, null, "RESOURCEMANAGER", HOST1, null));
componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, serviceGroupName, null, "NODEMANAGER", HOST1, null));
componentHostRequests.add(new ServiceComponentHostRequest(CLUSTER_NAME, serviceGroupName, null, "YARN_CLIENT", HOST1, null));

amc.createHostComponents(componentHostRequests);

Expand Down
2 changes: 1 addition & 1 deletion ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ public void testGetStack() {
assertEquals("1.0", pigService.getVersion());
assertEquals("This is comment for PIG service", pigService.getComment());
components = pigService.getComponents();
assertEquals(1, components.size());
assertEquals(2, components.size());
CommandScriptDefinition commandScript = pigService.getCommandScript();
assertEquals("scripts/service_check.py", commandScript.getScript());
assertEquals(CommandScriptDefinition.Type.PYTHON, commandScript.getScriptType());
Expand Down
10 changes: 10 additions & 0 deletions ambari-server/src/test/resources/stacks/HDP/0.1/services/PIG/metainfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,16 @@
<timeout>600</timeout>
</commandScript>
</component>
<component>
<name>SOME_CLIENT_FOR_SERVICE_CHECK</name>
Copy link
Contributor

@adoroszlai adoroszlai Feb 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This extra component should be accounted for in this assertion:

ambari/ambari-server/src/test/java/org/apache/ambari/server/stack/StackManagerTest.java

Line 246 in 04110f7

assertEquals(1, components.size());

Copy link
Contributor Author

@d0zen1 d0zen1 Feb 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for noticing

<category>CLIENT</category>
<cardinality>0+</cardinality>
<commandScript>
<script>scripts/pig_client.py</script>
<scriptType>PYTHON</scriptType>
<timeout>600</timeout>
</commandScript>
</component>
</components>
<osSpecifics>
<osSpecific>
Expand Down