Author: zjshen
Date: Thu Jul 24 03:14:37 2014
New Revision: 1612982
URL: http://svn.apache.org/r1612982
Log:
YARN-2300. Improved the documentation of the sample requests for RM REST API -
submitting an app. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1612981 ../../trunk/
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1612982&r1=1612981&r2=1612982&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Thu Jul 24
03:14:37 2014
@@ -285,6 +285,9 @@ Release 2.5.0 - UNRELEASED
YARN-1408 Preemption caused Invalid State Event: ACQUIRED at KILLED and
caused
a task timeout for 30mins. (Sunil G via mayank)
+ YARN-2300. Improved the documentation of the sample requests for RM REST
API -
+ submitting an app. (Varun Vasudev via zjshen)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm?rev=1612982&r1=1612981&r2=1612982&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
(original)
+++
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ResourceManagerRest.apt.vm
Thu Jul 24 03:14:37 2014
@@ -2228,68 +2228,48 @@ _01_000001</amContainerLogs>
{
"application-id":"application_1404203615263_0001",
"application-name":"test",
- "queue":"testqueue",
- "priority":"3",
"am-container-spec":
{
"local-resources":
{
"entry":
- {
- "key":"example",
- "value":
+ [
{
- "resource":"http://www.test.com/file.txt";,
- "type":"FILE",
- "visibility":"APPLICATION",
- "size":"100",
- "timestamp":"1404203616003"
+ "key":"AppMaster.jar",
+ "value":
+ {
+
"resource":"hdfs://hdfs-namenode:9000/user/testuser/DistributedShell/demo-app/AppMaster.jar",
+ "type":"FILE",
+ "visibility":"APPLICATION",
+ "size": "43004",
+ "timestamp": "1405452071209"
+ }
}
- }
- },
- "environment":
- {
- "entry":
- {
- "key":"APP_VAR",
- "value":"ENV_SETTING"
- }
+ ]
},
"commands":
{
- "command":"/bin/sleep 5"
- },
- "service-data":
- {
- "entry":
- {
- "key":"test",
- "value":"dmFsdWUxMg"
- }
- },
- "credentials":
- {
- "tokens":null,
- "secrets":
- {
- "entry":
- {
- "key":"secret1",
- "value":"c2VjcmV0MQ"
- }
- }
+ "command":"{{JAVA_HOME}}/bin/java -Xmx10m
org.apache.hadoop.yarn.applications.distributedshell.ApplicationMaster
--container_memory 10 --container_vcores 1 --num_containers 1 --priority 0
1><LOG_DIR>/AppMaster.stdout 2><LOG_DIR>/AppMaster.stderr"
},
- "application-acls":
+ "environment":
{
"entry":
[
{
- "key":"VIEW_APP",
- "value":"testuser3, testuser4"
+ "key": "DISTRIBUTEDSHELLSCRIPTTIMESTAMP",
+ "value": "1405459400754"
+ },
+ {
+ "key": "CLASSPATH",
+ "value":
"{{CLASSPATH}}<CPS>./*<CPS>{{HADOOP_CONF_DIR}}<CPS>{{HADOOP_COMMON_HOME}}/share/hadoop/common/*<CPS>{{HADOOP_COMMON_HOME}}/share/hadoop/common/lib/*<CPS>{{HADOOP_HDFS_HOME}}/share/hadoop/hdfs/*<CPS>{{HADOOP_HDFS_HOME}}/share/hadoop/hdfs/lib/*<CPS>{{HADOOP_YARN_HOME}}/share/hadoop/yarn/*<CPS>{{HADOOP_YARN_HOME}}/share/hadoop/yarn/lib/*<CPS>./log4j.properties"
},
{
- "key":"MODIFY_APP",
- "value":"testuser1, testuser2"
+ "key": "DISTRIBUTEDSHELLSCRIPTLEN",
+ "value": "6"
+ },
+ {
+ "key": "DISTRIBUTEDSHELLSCRIPTLOCATION",
+ "value":
"hdfs://hdfs-namenode:9000/user/testuser/demo-app/shellCommands"
}
]
}
@@ -2302,16 +2282,9 @@ _01_000001</amContainerLogs>
"vCores":"1"
},
"application-type":"YARN",
- "keep-containers-across-application-attempts":"false",
- "application-tags":
- {
- "tag":
- [
- "tag 2",
- "tag1"
- ]
- }
+ "keep-containers-across-application-attempts":"false"
}
+
+---+
Response Header:
@@ -2349,22 +2322,34 @@ _01_000001</amContainerLogs>
<entry>
<key>example</key>
<value>
- <resource>http://www.test.com/file.txt</resource>
+
<resource>hdfs://hdfs-namenode:9000/user/testuser/DistributedShell/demo-app/AppMaster.jar</resource>
<type>FILE</type>
<visibility>APPLICATION</visibility>
- <size>100</size>
- <timestamp>1404204892877</timestamp>
+ <size>43004</size>
+ <timestamp>1405452071209</timestamp>
</value>
</entry>
</local-resources>
<environment>
<entry>
- <key>APP_VAR</key>
- <value>ENV_SETTING</value>
+ <key>DISTRIBUTEDSHELLSCRIPTTIMESTAMP</key>
+ <value>1405459400754</value>
+ </entry>
+ <entry>
+ <key>CLASSPATH</key>
+
<value>{{CLASSPATH}}<CPS>./*<CPS>{{HADOOP_CONF_DIR}}<CPS>{{HADOOP_COMMON_HOME}}/share/hadoop/common/*<CPS>{{HADOOP_COMMON_HOME}}/share/hadoop/common/lib/*<CPS>{{HADOOP_HDFS_HOME}}/share/hadoop/hdfs/*<CPS>{{HADOOP_HDFS_HOME}}/share/hadoop/hdfs/lib/*<CPS>{{HADOOP_YARN_HOME}}/share/hadoop/yarn/*<CPS>{{HADOOP_YARN_HOME}}/share/hadoop/yarn/lib/*<CPS>./log4j.properties</value>
+ </entry>
+ <entry>
+ <key>DISTRIBUTEDSHELLSCRIPTLEN</key>
+ <value>6</value>
+ </entry>
+ <entry>
+ <key>DISTRIBUTEDSHELLSCRIPTLOCATION</key>
+
<value>hdfs://hdfs-namenode:9000/user/testuser/demo-app/shellCommands</value>
</entry>
</environment>
<commands>
- <command>/bin/sleep 5</command>
+ <command>{{JAVA_HOME}}/bin/java -Xmx10m
org.apache.hadoop.yarn.applications.distributedshell.ApplicationMaster
--container_memory 10 --container_vcores 1 --num_containers 1 --priority 0
1><LOG_DIR>/AppMaster.stdout
2><LOG_DIR>/AppMaster.stderr</command>
</commands>
<service-data>
<entry>
