Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-7941. Transitive dependencies for component are not resolved. Contributed by Billie Rinaldi. 

(cherry picked from commit c048711099)
This commit is contained in:
Rohith Sharma K S 2018-04-11 09:18:50 +05:30
parent 53abef4e30
commit c1b4c6adf4
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/component/Component.java
View File

@ -164,6 +164,7 @@ public class Component implements EventHandler<ComponentEvent> {
maxContainerFailurePerComp = componentSpec.getConfiguration() maxContainerFailurePerComp = componentSpec.getConfiguration()
.getPropertyInt(CONTAINER_FAILURE_THRESHOLD, 10); .getPropertyInt(CONTAINER_FAILURE_THRESHOLD, 10);
createNumCompInstances(component.getNumberOfContainers()); createNumCompInstances(component.getNumberOfContainers());
setDesiredContainers(component.getNumberOfContainers().intValue());
} }
private void createNumCompInstances(long count) { private void createNumCompInstances(long count) {

16
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestYarnNativeServices.java
View File

@ -137,7 +137,9 @@ public class TestYarnNativeServices extends ServiceTestUtils {
// Create compa with 2 containers // Create compa with 2 containers
// Create compb with 2 containers which depends on compa // Create compb with 2 containers which depends on compa
// Check containers for compa started before containers for compb // Create compc with 2 containers which depends on compb
// Check containers for compa started before containers for compb before
// containers for compc
@Test (timeout = 200000) @Test (timeout = 200000)
public void testComponentStartOrder() throws Exception { public void testComponentStartOrder() throws Exception {
setupInternal(NUM_NMS); setupInternal(NUM_NMS);
@ -146,17 +148,23 @@ public class TestYarnNativeServices extends ServiceTestUtils {
exampleApp.setName("teststartorder"); exampleApp.setName("teststartorder");
exampleApp.setVersion("v1"); exampleApp.setVersion("v1");
exampleApp.addComponent(createComponent("compa", 2, "sleep 1000")); exampleApp.addComponent(createComponent("compa", 2, "sleep 1000"));
Component compb = createComponent("compb", 2, "sleep 1000");
// Let compb depedends on compa; // Let compb depend on compa
Component compb = createComponent("compb", 2, "sleep 1000");
compb.setDependencies(Collections.singletonList("compa")); compb.setDependencies(Collections.singletonList("compa"));
exampleApp.addComponent(compb); exampleApp.addComponent(compb);
// Let compc depend on compb
Component compc = createComponent("compc", 2, "sleep 1000");
compc.setDependencies(Collections.singletonList("compb"));
exampleApp.addComponent(compc);
client.actionCreate(exampleApp); client.actionCreate(exampleApp);
waitForServiceToBeStable(client, exampleApp); waitForServiceToBeStable(client, exampleApp);
// check that containers for compa are launched before containers for compb // check that containers for compa are launched before containers for compb
checkContainerLaunchDependencies(client, exampleApp, "compa", "compb"); checkContainerLaunchDependencies(client, exampleApp, "compa", "compb",
"compc");
client.actionStop(exampleApp.getName(), true); client.actionStop(exampleApp.getName(), true);
client.actionDestroy(exampleApp.getName()); client.actionDestroy(exampleApp.getName());