YARN-8332. Incorrect min/max allocation property name in resource types doc. (Weiwei Yang via wangda)
Change-Id: If74f1ceed9c045a2cb2d6593741278b65ac44a9f Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/83f53e5c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/83f53e5c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/83f53e5c Branch: refs/heads/HDDS-48 Commit: 83f53e5c6236de30c213dc41878cebfb02597e26 Parents: bd15d23 Author: Wangda Tan <wan...@apache.org> Authored: Tue May 22 13:29:21 2018 -0700 Committer: Wangda Tan <wan...@apache.org> Committed: Tue May 22 13:33:33 2018 -0700 ---------------------------------------------------------------------- .../hadoop-yarn-site/src/site/markdown/ResourceModel.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/83f53e5c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceModel.md ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceModel.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceModel.md index f968b5f..ac16d53 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceModel.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/ResourceModel.md @@ -49,8 +49,8 @@ The following configuration properties are supported. See below for details. |:---- |:---- | | `yarn.resource-types` | Comma-separated list of additional resources. May not include `memory`, `memory-mb`, or `vcores` | | `yarn.resource-types.<resource>.units` | Default unit for the specified resource type | -| `yarn.resource-types.<resource>.minimum` | The minimum request for the specified resource type | -| `yarn.resource-types.<resource>.maximum` | The maximum request for the specified resource type | +| `yarn.resource-types.<resource>.minimum-allocation` | The minimum request for the specified resource type | +| `yarn.resource-types.<resource>.maximum-allocation` | The maximum request for the specified resource type | `node-resources.xml` @@ -127,8 +127,8 @@ set the default unit for the resource type. Valid values are: The property must be named `yarn.resource-types.<resource>.units`. Each defined resource may also have optional minimum and maximum properties. The properties -must be named `yarn.resource-types.<resource>.minimum` and -`yarn.resource-types.<resource>.maximum`. +must be named `yarn.resource-types.<resource>.minimum-allocation` and +`yarn.resource-types.<resource>.maximum-allocation`. The `yarn.resource-types` property and any unit, mimimum, or maximum properties may be defined in either the usual `yarn-site.xml` file or in a file named @@ -147,12 +147,12 @@ may be defined in either the usual `yarn-site.xml` file or in a file named </property> <property> - <name>yarn.resource-types.resource2.minimum</name> + <name>yarn.resource-types.resource2.minimum-allocation</name> <value>1</value> </property> <property> - <name>yarn.resource-types.resource2.maximum</name> + <name>yarn.resource-types.resource2.maximum-allocation</name> <value>1024</value> </property> </configuration> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org