[11/50] [abbrv] hadoop git commit: YARN-5729. Bug fixes for the service Rest API. Contributed by Gour Saha
YARN-5729. Bug fixes for the service Rest API. Contributed by Gour Saha Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6d7d4f7f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6d7d4f7f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6d7d4f7f Branch: refs/heads/yarn-native-services Commit: 6d7d4f7feb7d873728e0bd161846c78789ec51af Parents: 2034e9b Author: Jian HeAuthored: Fri Oct 14 13:47:38 2016 -0700 Committer: Jian He Committed: Thu Feb 9 16:58:05 2017 -0800 -- .../services/api/impl/ApplicationApiService.java| 16 ++-- .../hadoop/yarn/services/resource/Application.java | 6 +++--- .../hadoop/yarn/services/resource/Artifact.java | 4 +++- .../hadoop/yarn/services/resource/Component.java| 4 +++- .../hadoop/yarn/services/resource/ConfigFile.java | 4 +++- .../yarn/services/resource/Configuration.java | 4 +++- .../hadoop/yarn/services/resource/Container.java| 6 +++--- .../yarn/services/resource/PlacementPolicy.java | 4 +++- .../yarn/services/resource/ReadinessCheck.java | 4 +++- .../hadoop/yarn/services/resource/Resource.java | 2 +- 10 files changed, 39 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6d7d4f7f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java index 0a62629..21cf113 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java @@ -276,7 +276,7 @@ public class ApplicationApiService implements ApplicationApi { // If it is a simple app with no components, then create a default component if (application.getComponents() == null) { - application.setComponents(getDefaultComponentAsList()); + application.setComponents(getDefaultComponentAsList(application)); } // Application lifetime if not specified, is set to unlimited lifetime @@ -1029,7 +1029,8 @@ public class ApplicationApiService implements ApplicationApi { // end-users point of view, is out of scope of the REST API. Also, this // readiness has nothing to do with readiness-check defined at the component // level (which is used for dependency resolution of component DAG). -if (totalNumberOfIpAssignedContainers == totalExpectedNumberOfRunningContainers) { +if (totalNumberOfIpAssignedContainers +.longValue() == totalExpectedNumberOfRunningContainers.longValue()) { app.setState(ApplicationState.READY); } logger.info("Application = {}", app); @@ -1389,6 +1390,17 @@ public class ApplicationApiService implements ApplicationApi { return Response.status(Status.NO_CONTENT).build(); } + // create default component and initialize with app level global values + private List getDefaultComponentAsList(Application app) { +List comps = getDefaultComponentAsList(); +Component comp = comps.get(0); +comp.setArtifact(app.getArtifact()); +comp.setResource(app.getResource()); +comp.setNumberOfContainers(app.getNumberOfContainers()); +comp.setLaunchCommand(app.getLaunchCommand()); +return comps; + } + private List getDefaultComponentAsList() { Component comp = new Component(); comp.setName(DEFAULT_COMPONENT_NAME); http://git-wip-us.apache.org/repos/asf/hadoop/blob/6d7d4f7f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java index 719bf95..ed65ad2 100644 ---
[19/51] [abbrv] hadoop git commit: YARN-5729. Bug fixes for the service Rest API. Contributed by Gour Saha
YARN-5729. Bug fixes for the service Rest API. Contributed by Gour Saha Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/39e18c16 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/39e18c16 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/39e18c16 Branch: refs/heads/yarn-native-services Commit: 39e18c1629119ddf8b4545f9736edca7cd43cd60 Parents: 3862e38 Author: Jian HeAuthored: Fri Oct 14 13:47:38 2016 -0700 Committer: Jian He Committed: Thu Dec 22 11:09:38 2016 -0800 -- .../services/api/impl/ApplicationApiService.java| 16 ++-- .../hadoop/yarn/services/resource/Application.java | 6 +++--- .../hadoop/yarn/services/resource/Artifact.java | 4 +++- .../hadoop/yarn/services/resource/Component.java| 4 +++- .../hadoop/yarn/services/resource/ConfigFile.java | 4 +++- .../yarn/services/resource/Configuration.java | 4 +++- .../hadoop/yarn/services/resource/Container.java| 6 +++--- .../yarn/services/resource/PlacementPolicy.java | 4 +++- .../yarn/services/resource/ReadinessCheck.java | 4 +++- .../hadoop/yarn/services/resource/Resource.java | 2 +- 10 files changed, 39 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/39e18c16/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java index 0a62629..21cf113 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java @@ -276,7 +276,7 @@ public class ApplicationApiService implements ApplicationApi { // If it is a simple app with no components, then create a default component if (application.getComponents() == null) { - application.setComponents(getDefaultComponentAsList()); + application.setComponents(getDefaultComponentAsList(application)); } // Application lifetime if not specified, is set to unlimited lifetime @@ -1029,7 +1029,8 @@ public class ApplicationApiService implements ApplicationApi { // end-users point of view, is out of scope of the REST API. Also, this // readiness has nothing to do with readiness-check defined at the component // level (which is used for dependency resolution of component DAG). -if (totalNumberOfIpAssignedContainers == totalExpectedNumberOfRunningContainers) { +if (totalNumberOfIpAssignedContainers +.longValue() == totalExpectedNumberOfRunningContainers.longValue()) { app.setState(ApplicationState.READY); } logger.info("Application = {}", app); @@ -1389,6 +1390,17 @@ public class ApplicationApiService implements ApplicationApi { return Response.status(Status.NO_CONTENT).build(); } + // create default component and initialize with app level global values + private List getDefaultComponentAsList(Application app) { +List comps = getDefaultComponentAsList(); +Component comp = comps.get(0); +comp.setArtifact(app.getArtifact()); +comp.setResource(app.getResource()); +comp.setNumberOfContainers(app.getNumberOfContainers()); +comp.setLaunchCommand(app.getLaunchCommand()); +return comps; + } + private List getDefaultComponentAsList() { Component comp = new Component(); comp.setName(DEFAULT_COMPONENT_NAME); http://git-wip-us.apache.org/repos/asf/hadoop/blob/39e18c16/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java index 719bf95..ed65ad2 100644 ---
[51/74] [abbrv] hadoop git commit: YARN-5729. Bug fixes for the service Rest API. Contributed by Gour Saha
YARN-5729. Bug fixes for the service Rest API. Contributed by Gour Saha Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/698989d4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/698989d4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/698989d4 Branch: refs/heads/yarn-native-services Commit: 698989d4d4556b8489dba757c1ec7ea615fffde1 Parents: 713018d Author: Jian HeAuthored: Fri Oct 14 13:47:38 2016 -0700 Committer: Jian He Committed: Tue Dec 13 14:46:44 2016 -0800 -- .../services/api/impl/ApplicationApiService.java| 16 ++-- .../hadoop/yarn/services/resource/Application.java | 6 +++--- .../hadoop/yarn/services/resource/Artifact.java | 4 +++- .../hadoop/yarn/services/resource/Component.java| 4 +++- .../hadoop/yarn/services/resource/ConfigFile.java | 4 +++- .../yarn/services/resource/Configuration.java | 4 +++- .../hadoop/yarn/services/resource/Container.java| 6 +++--- .../yarn/services/resource/PlacementPolicy.java | 4 +++- .../yarn/services/resource/ReadinessCheck.java | 4 +++- .../hadoop/yarn/services/resource/Resource.java | 2 +- 10 files changed, 39 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/698989d4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java index 0a62629..21cf113 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java @@ -276,7 +276,7 @@ public class ApplicationApiService implements ApplicationApi { // If it is a simple app with no components, then create a default component if (application.getComponents() == null) { - application.setComponents(getDefaultComponentAsList()); + application.setComponents(getDefaultComponentAsList(application)); } // Application lifetime if not specified, is set to unlimited lifetime @@ -1029,7 +1029,8 @@ public class ApplicationApiService implements ApplicationApi { // end-users point of view, is out of scope of the REST API. Also, this // readiness has nothing to do with readiness-check defined at the component // level (which is used for dependency resolution of component DAG). -if (totalNumberOfIpAssignedContainers == totalExpectedNumberOfRunningContainers) { +if (totalNumberOfIpAssignedContainers +.longValue() == totalExpectedNumberOfRunningContainers.longValue()) { app.setState(ApplicationState.READY); } logger.info("Application = {}", app); @@ -1389,6 +1390,17 @@ public class ApplicationApiService implements ApplicationApi { return Response.status(Status.NO_CONTENT).build(); } + // create default component and initialize with app level global values + private List getDefaultComponentAsList(Application app) { +List comps = getDefaultComponentAsList(); +Component comp = comps.get(0); +comp.setArtifact(app.getArtifact()); +comp.setResource(app.getResource()); +comp.setNumberOfContainers(app.getNumberOfContainers()); +comp.setLaunchCommand(app.getLaunchCommand()); +return comps; + } + private List getDefaultComponentAsList() { Component comp = new Component(); comp.setName(DEFAULT_COMPONENT_NAME); http://git-wip-us.apache.org/repos/asf/hadoop/blob/698989d4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java index 719bf95..ed65ad2 100644 ---
[68/76] [abbrv] hadoop git commit: YARN-5729. Bug fixes for the service Rest API. Contributed by Gour Saha
YARN-5729. Bug fixes for the service Rest API. Contributed by Gour Saha Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b279e669 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b279e669 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b279e669 Branch: refs/heads/yarn-native-services Commit: b279e669cf4e9b096130f290243d23864f86d880 Parents: 5b72893 Author: Jian HeAuthored: Fri Oct 14 13:47:38 2016 -0700 Committer: Jian He Committed: Wed Dec 7 13:00:06 2016 -0800 -- .../services/api/impl/ApplicationApiService.java| 16 ++-- .../hadoop/yarn/services/resource/Application.java | 6 +++--- .../hadoop/yarn/services/resource/Artifact.java | 4 +++- .../hadoop/yarn/services/resource/Component.java| 4 +++- .../hadoop/yarn/services/resource/ConfigFile.java | 4 +++- .../yarn/services/resource/Configuration.java | 4 +++- .../hadoop/yarn/services/resource/Container.java| 6 +++--- .../yarn/services/resource/PlacementPolicy.java | 4 +++- .../yarn/services/resource/ReadinessCheck.java | 4 +++- .../hadoop/yarn/services/resource/Resource.java | 2 +- 10 files changed, 39 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b279e669/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java index 0a62629..21cf113 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java @@ -276,7 +276,7 @@ public class ApplicationApiService implements ApplicationApi { // If it is a simple app with no components, then create a default component if (application.getComponents() == null) { - application.setComponents(getDefaultComponentAsList()); + application.setComponents(getDefaultComponentAsList(application)); } // Application lifetime if not specified, is set to unlimited lifetime @@ -1029,7 +1029,8 @@ public class ApplicationApiService implements ApplicationApi { // end-users point of view, is out of scope of the REST API. Also, this // readiness has nothing to do with readiness-check defined at the component // level (which is used for dependency resolution of component DAG). -if (totalNumberOfIpAssignedContainers == totalExpectedNumberOfRunningContainers) { +if (totalNumberOfIpAssignedContainers +.longValue() == totalExpectedNumberOfRunningContainers.longValue()) { app.setState(ApplicationState.READY); } logger.info("Application = {}", app); @@ -1389,6 +1390,17 @@ public class ApplicationApiService implements ApplicationApi { return Response.status(Status.NO_CONTENT).build(); } + // create default component and initialize with app level global values + private List getDefaultComponentAsList(Application app) { +List comps = getDefaultComponentAsList(); +Component comp = comps.get(0); +comp.setArtifact(app.getArtifact()); +comp.setResource(app.getResource()); +comp.setNumberOfContainers(app.getNumberOfContainers()); +comp.setLaunchCommand(app.getLaunchCommand()); +return comps; + } + private List getDefaultComponentAsList() { Component comp = new Component(); comp.setName(DEFAULT_COMPONENT_NAME); http://git-wip-us.apache.org/repos/asf/hadoop/blob/b279e669/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java index 719bf95..ed65ad2 100644 ---
[48/63] [abbrv] hadoop git commit: YARN-5729. Bug fixes for the service Rest API. Contributed by Gour Saha
YARN-5729. Bug fixes for the service Rest API. Contributed by Gour Saha Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fac85edc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fac85edc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fac85edc Branch: refs/heads/yarn-native-services Commit: fac85edc3aa7b2df48cf294374e792b0fc1575c3 Parents: ace62eb Author: Jian HeAuthored: Fri Oct 14 13:47:38 2016 -0700 Committer: Jian He Committed: Mon Nov 28 13:09:08 2016 -0800 -- .../services/api/impl/ApplicationApiService.java| 16 ++-- .../hadoop/yarn/services/resource/Application.java | 6 +++--- .../hadoop/yarn/services/resource/Artifact.java | 4 +++- .../hadoop/yarn/services/resource/Component.java| 4 +++- .../hadoop/yarn/services/resource/ConfigFile.java | 4 +++- .../yarn/services/resource/Configuration.java | 4 +++- .../hadoop/yarn/services/resource/Container.java| 6 +++--- .../yarn/services/resource/PlacementPolicy.java | 4 +++- .../yarn/services/resource/ReadinessCheck.java | 4 +++- .../hadoop/yarn/services/resource/Resource.java | 2 +- 10 files changed, 39 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fac85edc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java index 0a62629..21cf113 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java @@ -276,7 +276,7 @@ public class ApplicationApiService implements ApplicationApi { // If it is a simple app with no components, then create a default component if (application.getComponents() == null) { - application.setComponents(getDefaultComponentAsList()); + application.setComponents(getDefaultComponentAsList(application)); } // Application lifetime if not specified, is set to unlimited lifetime @@ -1029,7 +1029,8 @@ public class ApplicationApiService implements ApplicationApi { // end-users point of view, is out of scope of the REST API. Also, this // readiness has nothing to do with readiness-check defined at the component // level (which is used for dependency resolution of component DAG). -if (totalNumberOfIpAssignedContainers == totalExpectedNumberOfRunningContainers) { +if (totalNumberOfIpAssignedContainers +.longValue() == totalExpectedNumberOfRunningContainers.longValue()) { app.setState(ApplicationState.READY); } logger.info("Application = {}", app); @@ -1389,6 +1390,17 @@ public class ApplicationApiService implements ApplicationApi { return Response.status(Status.NO_CONTENT).build(); } + // create default component and initialize with app level global values + private List getDefaultComponentAsList(Application app) { +List comps = getDefaultComponentAsList(); +Component comp = comps.get(0); +comp.setArtifact(app.getArtifact()); +comp.setResource(app.getResource()); +comp.setNumberOfContainers(app.getNumberOfContainers()); +comp.setLaunchCommand(app.getLaunchCommand()); +return comps; + } + private List getDefaultComponentAsList() { Component comp = new Component(); comp.setName(DEFAULT_COMPONENT_NAME); http://git-wip-us.apache.org/repos/asf/hadoop/blob/fac85edc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java index 719bf95..ed65ad2 100644 ---
[60/66] [abbrv] hadoop git commit: YARN-5729. Bug fixes for the service Rest API. Contributed by Gour Saha
YARN-5729. Bug fixes for the service Rest API. Contributed by Gour Saha Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/913b242b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/913b242b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/913b242b Branch: refs/heads/yarn-native-services Commit: 913b242ba949e3a43591e9d6c652502c37d23431 Parents: f273d93 Author: Jian HeAuthored: Fri Oct 14 13:47:38 2016 -0700 Committer: Jian He Committed: Wed Nov 23 15:27:03 2016 -0800 -- .../services/api/impl/ApplicationApiService.java| 16 ++-- .../hadoop/yarn/services/resource/Application.java | 6 +++--- .../hadoop/yarn/services/resource/Artifact.java | 4 +++- .../hadoop/yarn/services/resource/Component.java| 4 +++- .../hadoop/yarn/services/resource/ConfigFile.java | 4 +++- .../yarn/services/resource/Configuration.java | 4 +++- .../hadoop/yarn/services/resource/Container.java| 6 +++--- .../yarn/services/resource/PlacementPolicy.java | 4 +++- .../yarn/services/resource/ReadinessCheck.java | 4 +++- .../hadoop/yarn/services/resource/Resource.java | 2 +- 10 files changed, 39 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/913b242b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java index 0a62629..21cf113 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java @@ -276,7 +276,7 @@ public class ApplicationApiService implements ApplicationApi { // If it is a simple app with no components, then create a default component if (application.getComponents() == null) { - application.setComponents(getDefaultComponentAsList()); + application.setComponents(getDefaultComponentAsList(application)); } // Application lifetime if not specified, is set to unlimited lifetime @@ -1029,7 +1029,8 @@ public class ApplicationApiService implements ApplicationApi { // end-users point of view, is out of scope of the REST API. Also, this // readiness has nothing to do with readiness-check defined at the component // level (which is used for dependency resolution of component DAG). -if (totalNumberOfIpAssignedContainers == totalExpectedNumberOfRunningContainers) { +if (totalNumberOfIpAssignedContainers +.longValue() == totalExpectedNumberOfRunningContainers.longValue()) { app.setState(ApplicationState.READY); } logger.info("Application = {}", app); @@ -1389,6 +1390,17 @@ public class ApplicationApiService implements ApplicationApi { return Response.status(Status.NO_CONTENT).build(); } + // create default component and initialize with app level global values + private List getDefaultComponentAsList(Application app) { +List comps = getDefaultComponentAsList(); +Component comp = comps.get(0); +comp.setArtifact(app.getArtifact()); +comp.setResource(app.getResource()); +comp.setNumberOfContainers(app.getNumberOfContainers()); +comp.setLaunchCommand(app.getLaunchCommand()); +return comps; + } + private List getDefaultComponentAsList() { Component comp = new Component(); comp.setName(DEFAULT_COMPONENT_NAME); http://git-wip-us.apache.org/repos/asf/hadoop/blob/913b242b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java index 719bf95..ed65ad2 100644 ---
hadoop git commit: YARN-5729. Bug fixes for the service Rest API. Contributed by Gour Saha
Repository: hadoop Updated Branches: refs/heads/yarn-native-services 1f40ba5bc -> ae71975af YARN-5729. Bug fixes for the service Rest API. Contributed by Gour Saha Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ae71975a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ae71975a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ae71975a Branch: refs/heads/yarn-native-services Commit: ae71975afd59d31c86f879353bf31cdae9790861 Parents: 1f40ba5 Author: Jian HeAuthored: Fri Oct 14 13:47:38 2016 -0700 Committer: Jian He Committed: Fri Oct 14 13:47:38 2016 -0700 -- .../services/api/impl/ApplicationApiService.java| 16 ++-- .../hadoop/yarn/services/resource/Application.java | 6 +++--- .../hadoop/yarn/services/resource/Artifact.java | 4 +++- .../hadoop/yarn/services/resource/Component.java| 4 +++- .../hadoop/yarn/services/resource/ConfigFile.java | 4 +++- .../yarn/services/resource/Configuration.java | 4 +++- .../hadoop/yarn/services/resource/Container.java| 6 +++--- .../yarn/services/resource/PlacementPolicy.java | 4 +++- .../yarn/services/resource/ReadinessCheck.java | 4 +++- .../hadoop/yarn/services/resource/Resource.java | 2 +- 10 files changed, 39 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ae71975a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java index 0a62629..21cf113 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/api/impl/ApplicationApiService.java @@ -276,7 +276,7 @@ public class ApplicationApiService implements ApplicationApi { // If it is a simple app with no components, then create a default component if (application.getComponents() == null) { - application.setComponents(getDefaultComponentAsList()); + application.setComponents(getDefaultComponentAsList(application)); } // Application lifetime if not specified, is set to unlimited lifetime @@ -1029,7 +1029,8 @@ public class ApplicationApiService implements ApplicationApi { // end-users point of view, is out of scope of the REST API. Also, this // readiness has nothing to do with readiness-check defined at the component // level (which is used for dependency resolution of component DAG). -if (totalNumberOfIpAssignedContainers == totalExpectedNumberOfRunningContainers) { +if (totalNumberOfIpAssignedContainers +.longValue() == totalExpectedNumberOfRunningContainers.longValue()) { app.setState(ApplicationState.READY); } logger.info("Application = {}", app); @@ -1389,6 +1390,17 @@ public class ApplicationApiService implements ApplicationApi { return Response.status(Status.NO_CONTENT).build(); } + // create default component and initialize with app level global values + private List getDefaultComponentAsList(Application app) { +List comps = getDefaultComponentAsList(); +Component comp = comps.get(0); +comp.setArtifact(app.getArtifact()); +comp.setResource(app.getResource()); +comp.setNumberOfContainers(app.getNumberOfContainers()); +comp.setLaunchCommand(app.getLaunchCommand()); +return comps; + } + private List getDefaultComponentAsList() { Component comp = new Component(); comp.setName(DEFAULT_COMPONENT_NAME); http://git-wip-us.apache.org/repos/asf/hadoop/blob/ae71975a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/services/resource/Application.java index 719bf95..ed65ad2 100644 ---