You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ar...@apache.org on 2018/03/13 22:29:07 UTC
[15/50] hadoop git commit: YARN-8000. Yarn Service component instance
name shows up as component name in container record. Contributed by Chandni
Singh
YARN-8000. Yarn Service component instance name shows up as component name in container record. Contributed by Chandni Singh
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4f395063
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4f395063
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4f395063
Branch: refs/heads/HDFS-12996
Commit: 4f395063bbae1636d4c59bc962916d78694b50d3
Parents: 32fa3a6
Author: Billie Rinaldi <bi...@apache.org>
Authored: Fri Mar 9 08:50:28 2018 -0800
Committer: Billie Rinaldi <bi...@apache.org>
Committed: Fri Mar 9 08:50:28 2018 -0800
----------------------------------------------------------------------
.../main/resources/definition/YARN-Services-Examples.md | 4 ++--
.../hadoop/yarn/service/api/records/Container.java | 12 ++++++------
.../src/site/markdown/yarn-service/YarnServiceAPI.md | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4f395063/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Services-Examples.md
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Services-Examples.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Services-Examples.md
index 00b21dd..e4cdc7b 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Services-Examples.md
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Services-Examples.md
@@ -72,7 +72,7 @@ Note, lifetime value of -1 means unlimited lifetime.
"state": "READY",
"launch_time": 1504051512412,
"bare_host": "10.22.8.143",
- "component_name": "hello-0"
+ "component_instance_name": "hello-0"
},
{
"id": "container_e03_1503963985568_0002_01_000002",
@@ -81,7 +81,7 @@ Note, lifetime value of -1 means unlimited lifetime.
"state": "READY",
"launch_time": 1504051536450,
"bare_host": "10.22.8.143",
- "component_name": "hello-1"
+ "component_instance_name": "hello-1"
}
],
"launch_command": "./start_nginx.sh",
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4f395063/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/Container.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/Container.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/Container.java
index af06542..1ffd85f 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/Container.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/Container.java
@@ -173,20 +173,20 @@ public class Container extends BaseResource {
}
/**
- * Name of the component that this container instance belongs to.
+ * Name of the component instance that this container instance belongs to.
**/
- public Container componentName(String componentName) {
- this.componentInstanceName = componentName;
+ public Container componentInstanceName(String componentInstanceName) {
+ this.componentInstanceName = componentInstanceName;
return this;
}
- @ApiModelProperty(example = "null", value = "Name of the component that this container instance belongs to.")
- @JsonProperty("component_name")
+ @ApiModelProperty(example = "null", value = "Name of the component instance that this container instance belongs to.")
+ @JsonProperty("component_instance_name")
public String getComponentInstanceName() {
return componentInstanceName;
}
- @XmlElement(name = "component_name")
+ @XmlElement(name = "component_instance_name")
public void setComponentInstanceName(String componentInstanceName) {
this.componentInstanceName = componentInstanceName;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4f395063/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/YarnServiceAPI.md
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/YarnServiceAPI.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/YarnServiceAPI.md
index 6c38680..990f8fd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/YarnServiceAPI.md
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/yarn-service/YarnServiceAPI.md
@@ -441,7 +441,7 @@ Note, lifetime value of -1 means unlimited lifetime.
"state": "READY",
"launch_time": 1504051512412,
"bare_host": "10.22.8.143",
- "component_name": "hello-0"
+ "component_instance_name": "hello-0"
},
{
"id": "container_e03_1503963985568_0002_01_000002",
@@ -450,7 +450,7 @@ Note, lifetime value of -1 means unlimited lifetime.
"state": "READY",
"launch_time": 1504051536450,
"bare_host": "10.22.8.143",
- "component_name": "hello-1"
+ "component_instance_name": "hello-1"
}
],
"launch_command": "./start_nginx.sh",
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org