[01/49] hadoop git commit: YARN-7218. Decouple YARN Services REST API namespace from RM. (Contributed by Eric Yang) [Forced Update!]
Repository: hadoop Updated Branches: refs/heads/YARN-5881 d0af8b829 -> 85fc1b517 (forced update) YARN-7218. Decouple YARN Services REST API namespace from RM. (Contributed by Eric Yang) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0940e4f6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0940e4f6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0940e4f6 Branch: refs/heads/YARN-5881 Commit: 0940e4f692441f16e742666ac925f71a083eab27 Parents: 5f0b238 Author: Eric YangAuthored: Fri Nov 17 12:28:12 2017 -0500 Committer: Eric Yang Committed: Fri Nov 17 12:28:12 2017 -0500 -- .../hadoop/yarn/service/TestApiServer.java | 4 +- .../yarn/service/api/records/Component.java | 51 +--- .../service/api/records/ReadinessCheck.java | 14 +- .../yarn/service/api/records/Service.java | 15 +++--- .../yarn/service/conf/RestApiConstants.java | 2 +- .../org/apache/hadoop/yarn/webapp/WebApps.java | 10 +++- .../server/resourcemanager/ResourceManager.java | 14 +- .../server/resourcemanager/webapp/RMWebApp.java | 15 -- 8 files changed, 77 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0940e4f6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java index 2b22474..896b2f6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java @@ -62,8 +62,8 @@ public class TestApiServer { this.apiServer.getClass().isAnnotationPresent(Path.class)); final Path path = this.apiServer.getClass() .getAnnotation(Path.class); -assertEquals("The path has /ws/v1 annotation", path.value(), -"/ws/v1"); +assertEquals("The path has /v1 annotation", path.value(), +"/v1"); } @Test http://git-wip-us.apache.org/repos/asf/hadoop/blob/0940e4f6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java index fe9c043..ce0e0cf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java @@ -26,6 +26,8 @@ import java.util.Collections; import java.util.List; import java.util.Objects; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -46,22 +48,53 @@ import org.apache.hadoop.classification.InterfaceStability; @ApiModel(description = "One or more components of the service. If the service is HBase say, then the component can be a simple role like master or regionserver. If the service is a complex business webapp then a component can be other services say Kafka or Storm. Thereby it opens up the support for complex and nested services.") @javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-02T08:15:05.615-07:00") @XmlRootElement +@XmlAccessorType(XmlAccessType.FIELD) @JsonInclude(JsonInclude.Include.NON_NULL) public class Component implements Serializable { private static final long serialVersionUID = -8430058381509087805L; + @JsonProperty("name") private String name = null; + + @JsonProperty("dependencies") private List dependencies = new ArrayList(); +
[15/29] hadoop git commit: YARN-7218. Decouple YARN Services REST API namespace from RM. (Contributed by Eric Yang)
YARN-7218. Decouple YARN Services REST API namespace from RM. (Contributed by Eric Yang) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0940e4f6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0940e4f6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0940e4f6 Branch: refs/heads/HDFS-7240 Commit: 0940e4f692441f16e742666ac925f71a083eab27 Parents: 5f0b238 Author: Eric YangAuthored: Fri Nov 17 12:28:12 2017 -0500 Committer: Eric Yang Committed: Fri Nov 17 12:28:12 2017 -0500 -- .../hadoop/yarn/service/TestApiServer.java | 4 +- .../yarn/service/api/records/Component.java | 51 +--- .../service/api/records/ReadinessCheck.java | 14 +- .../yarn/service/api/records/Service.java | 15 +++--- .../yarn/service/conf/RestApiConstants.java | 2 +- .../org/apache/hadoop/yarn/webapp/WebApps.java | 10 +++- .../server/resourcemanager/ResourceManager.java | 14 +- .../server/resourcemanager/webapp/RMWebApp.java | 15 -- 8 files changed, 77 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0940e4f6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java index 2b22474..896b2f6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java @@ -62,8 +62,8 @@ public class TestApiServer { this.apiServer.getClass().isAnnotationPresent(Path.class)); final Path path = this.apiServer.getClass() .getAnnotation(Path.class); -assertEquals("The path has /ws/v1 annotation", path.value(), -"/ws/v1"); +assertEquals("The path has /v1 annotation", path.value(), +"/v1"); } @Test http://git-wip-us.apache.org/repos/asf/hadoop/blob/0940e4f6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java index fe9c043..ce0e0cf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java @@ -26,6 +26,8 @@ import java.util.Collections; import java.util.List; import java.util.Objects; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -46,22 +48,53 @@ import org.apache.hadoop.classification.InterfaceStability; @ApiModel(description = "One or more components of the service. If the service is HBase say, then the component can be a simple role like master or regionserver. If the service is a complex business webapp then a component can be other services say Kafka or Storm. Thereby it opens up the support for complex and nested services.") @javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-02T08:15:05.615-07:00") @XmlRootElement +@XmlAccessorType(XmlAccessType.FIELD) @JsonInclude(JsonInclude.Include.NON_NULL) public class Component implements Serializable { private static final long serialVersionUID = -8430058381509087805L; + @JsonProperty("name") private String name = null; + + @JsonProperty("dependencies") private List dependencies = new ArrayList(); + + @JsonProperty("readiness_check") + @XmlElement(name = "readiness_check") private
[15/19] hadoop git commit: YARN-7218. Decouple YARN Services REST API namespace from RM. (Contributed by Eric Yang)
YARN-7218. Decouple YARN Services REST API namespace from RM. (Contributed by Eric Yang) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0940e4f6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0940e4f6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0940e4f6 Branch: refs/heads/YARN-6592 Commit: 0940e4f692441f16e742666ac925f71a083eab27 Parents: 5f0b238 Author: Eric YangAuthored: Fri Nov 17 12:28:12 2017 -0500 Committer: Eric Yang Committed: Fri Nov 17 12:28:12 2017 -0500 -- .../hadoop/yarn/service/TestApiServer.java | 4 +- .../yarn/service/api/records/Component.java | 51 +--- .../service/api/records/ReadinessCheck.java | 14 +- .../yarn/service/api/records/Service.java | 15 +++--- .../yarn/service/conf/RestApiConstants.java | 2 +- .../org/apache/hadoop/yarn/webapp/WebApps.java | 10 +++- .../server/resourcemanager/ResourceManager.java | 14 +- .../server/resourcemanager/webapp/RMWebApp.java | 15 -- 8 files changed, 77 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0940e4f6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java index 2b22474..896b2f6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java @@ -62,8 +62,8 @@ public class TestApiServer { this.apiServer.getClass().isAnnotationPresent(Path.class)); final Path path = this.apiServer.getClass() .getAnnotation(Path.class); -assertEquals("The path has /ws/v1 annotation", path.value(), -"/ws/v1"); +assertEquals("The path has /v1 annotation", path.value(), +"/v1"); } @Test http://git-wip-us.apache.org/repos/asf/hadoop/blob/0940e4f6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java index fe9c043..ce0e0cf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java @@ -26,6 +26,8 @@ import java.util.Collections; import java.util.List; import java.util.Objects; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -46,22 +48,53 @@ import org.apache.hadoop.classification.InterfaceStability; @ApiModel(description = "One or more components of the service. If the service is HBase say, then the component can be a simple role like master or regionserver. If the service is a complex business webapp then a component can be other services say Kafka or Storm. Thereby it opens up the support for complex and nested services.") @javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-02T08:15:05.615-07:00") @XmlRootElement +@XmlAccessorType(XmlAccessType.FIELD) @JsonInclude(JsonInclude.Include.NON_NULL) public class Component implements Serializable { private static final long serialVersionUID = -8430058381509087805L; + @JsonProperty("name") private String name = null; + + @JsonProperty("dependencies") private List dependencies = new ArrayList(); + + @JsonProperty("readiness_check") + @XmlElement(name = "readiness_check") private
hadoop git commit: YARN-7218. Decouple YARN Services REST API namespace from RM. (Contributed by Eric Yang)
Repository: hadoop Updated Branches: refs/heads/trunk 5f0b238a1 -> 0940e4f69 YARN-7218. Decouple YARN Services REST API namespace from RM. (Contributed by Eric Yang) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0940e4f6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0940e4f6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0940e4f6 Branch: refs/heads/trunk Commit: 0940e4f692441f16e742666ac925f71a083eab27 Parents: 5f0b238 Author: Eric YangAuthored: Fri Nov 17 12:28:12 2017 -0500 Committer: Eric Yang Committed: Fri Nov 17 12:28:12 2017 -0500 -- .../hadoop/yarn/service/TestApiServer.java | 4 +- .../yarn/service/api/records/Component.java | 51 +--- .../service/api/records/ReadinessCheck.java | 14 +- .../yarn/service/api/records/Service.java | 15 +++--- .../yarn/service/conf/RestApiConstants.java | 2 +- .../org/apache/hadoop/yarn/webapp/WebApps.java | 10 +++- .../server/resourcemanager/ResourceManager.java | 14 +- .../server/resourcemanager/webapp/RMWebApp.java | 15 -- 8 files changed, 77 insertions(+), 48 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0940e4f6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java index 2b22474..896b2f6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java @@ -62,8 +62,8 @@ public class TestApiServer { this.apiServer.getClass().isAnnotationPresent(Path.class)); final Path path = this.apiServer.getClass() .getAnnotation(Path.class); -assertEquals("The path has /ws/v1 annotation", path.value(), -"/ws/v1"); +assertEquals("The path has /v1 annotation", path.value(), +"/v1"); } @Test http://git-wip-us.apache.org/repos/asf/hadoop/blob/0940e4f6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java -- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java index fe9c043..ce0e0cf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/api/records/Component.java @@ -26,6 +26,8 @@ import java.util.Collections; import java.util.List; import java.util.Objects; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -46,22 +48,53 @@ import org.apache.hadoop.classification.InterfaceStability; @ApiModel(description = "One or more components of the service. If the service is HBase say, then the component can be a simple role like master or regionserver. If the service is a complex business webapp then a component can be other services say Kafka or Storm. Thereby it opens up the support for complex and nested services.") @javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-06-02T08:15:05.615-07:00") @XmlRootElement +@XmlAccessorType(XmlAccessType.FIELD) @JsonInclude(JsonInclude.Include.NON_NULL) public class Component implements Serializable { private static final long serialVersionUID = -8430058381509087805L; + @JsonProperty("name") private String name = null; + + @JsonProperty("dependencies") private List dependencies = new ArrayList(); + +