diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 74a74217c56..e55e66aaf06 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -692,6 +692,9 @@ Release 2.7.0 - UNRELEASED YARN-3300. Outstanding_resource_requests table should not be shown in AHS. (Xuan Gong via jianhe) + YARN-3295. Fix documentation nits found in markdown conversion. + (Masatake Iwasaki via ozawa) + Release 2.6.0 - 2014-11-18 INCOMPATIBLE CHANGES diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRestart.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRestart.md index e516afbde70..d23505d7a20 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRestart.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceManagerRestart.md @@ -141,12 +141,10 @@ Notes ----- ContainerId string format is changed if RM restarts with work-preserving recovery enabled. It used to be such format: - - Container_{clusterTimestamp}_{appId}_{attemptId}_{containerId}, e.g. Container_1410901177871_0001_01_000005. +`Container_{clusterTimestamp}_{appId}_{attemptId}_{containerId}`, e.g. `Container_1410901177871_0001_01_000005`. It is now changed to: - - Container_e{epoch}_{clusterTimestamp}_{appId}_{attemptId}_{containerId}, e.g. Container_e17_1410901177871_0001_01_000005. +`Container_`**e{epoch}**`_{clusterTimestamp}_{appId}_{attemptId}_{containerId}`, e.g. `Container_`**e17**`_1410901177871_0001_01_000005`. Here, the additional epoch number is a monotonically increasing integer which starts from 0 and is increased by 1 each time RM restarts. If epoch number is 0, it is omitted and the containerId string format stays the same as before. diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnCommands.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnCommands.md index d34ed316bd4..db8201a8923 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnCommands.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/YarnCommands.md @@ -63,11 +63,11 @@ Usage: `yarn application [options] ` | COMMAND\_OPTIONS | Description | |:---- |:---- | -| -appStates States | Works with -list to filter applications based on input comma-separated list of application states. The valid application state can be one of the following:  ALL, NEW, NEW\_SAVING, SUBMITTED, ACCEPTED, RUNNING, FINISHED, FAILED, KILLED | -| -appTypes Types | Works with -list to filter applications based on input comma-separated list of application types. | +| -appStates \ | Works with -list to filter applications based on input comma-separated list of application states. The valid application state can be one of the following:  ALL, NEW, NEW\_SAVING, SUBMITTED, ACCEPTED, RUNNING, FINISHED, FAILED, KILLED | +| -appTypes \ | Works with -list to filter applications based on input comma-separated list of application types. | | -list | Lists applications from the RM. Supports optional use of -appTypes to filter applications based on application type, and -appStates to filter applications based on application state. | -| -kill ApplicationId | Kills the application. | -| -status ApplicationId | Prints the status of the application. | +| -kill \ | Kills the application. | +| -status \ | Prints the status of the application. | Prints application(s) report/kill application @@ -78,8 +78,8 @@ Usage: `yarn applicationattempt [options] ` | COMMAND\_OPTIONS | Description | |:---- |:---- | | -help | Help | -| -list ApplicationId | Lists applications attempts from the RM | -| -status Application Attempt Id | Prints the status of the application attempt. | +| -list \ | Lists applications attempts for the given application. | +| -status \ | Prints the status of the application attempt. | prints applicationattempt(s) report @@ -96,8 +96,8 @@ Usage: `yarn container [options] ` | COMMAND\_OPTIONS | Description | |:---- |:---- | | -help | Help | -| -list ApplicationId | Lists containers for the application attempt. | -| -status ContainerId | Prints the status of the container. | +| -list \ | Lists containers for the application attempt. | +| -status \ | Prints the status of the container. | prints container(s) report @@ -114,10 +114,10 @@ Usage: `yarn logs -applicationId [options] ` | COMMAND\_OPTIONS | Description | |:---- |:---- | | -applicationId \ | Specifies an application id | -| -appOwner AppOwner | AppOwner (assumed to be current user if not specified) | -| -containerId ContainerId | ContainerId (must be specified if node address is specified) | +| -appOwner \ | AppOwner (assumed to be current user if not specified) | +| -containerId \ | ContainerId (must be specified if node address is specified) | | -help | Help | -| -nodeAddress NodeAddress | NodeAddress in the format nodename:port (must be specified if container id is specified) | +| -nodeAddress \ | NodeAddress in the format nodename:port (must be specified if container id is specified) | Dump the container logs @@ -129,8 +129,8 @@ Usage: `yarn node [options] ` |:---- |:---- | | -all | Works with -list to list all nodes. | | -list | Lists all running nodes. Supports optional use of -states to filter nodes based on node state, and -all to list all nodes. | -| -states States | Works with -list to filter nodes based on input comma-separated list of node states. | -| -status NodeId | Prints the status report of the node. | +| -states \ | Works with -list to filter nodes based on input comma-separated list of node states. | +| -status \ | Prints the status report of the node. | Prints node report(s) @@ -141,7 +141,7 @@ Usage: `yarn queue [options] ` | COMMAND\_OPTIONS | Description | |:---- |:---- | | -help | Help | -| -status QueueName | Prints the status of the queue. | +| -status \ | Prints the status of the queue. | Prints queue information