Repository: hadoop Updated Branches: refs/heads/branch-3.1 bad5d81ac -> c11d2341a
YARN-8908. Fix errors in yarn-default.xml related to GPU/FPGA. (Zhankun Tang via wangda) Change-Id: I46f511a9b51b65b069e15d5b827530110c41edab (cherry picked from commit 071b9e19aa2c17bb9fa046c6ddabd6b8f0cc6d14) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c11d2341 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c11d2341 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c11d2341 Branch: refs/heads/branch-3.1 Commit: c11d2341afe1da8a98c1d0f048147dc664fc8ab3 Parents: bad5d81 Author: Wangda Tan <[email protected]> Authored: Fri Oct 19 09:44:00 2018 -0700 Committer: Wangda Tan <[email protected]> Committed: Fri Oct 19 09:55:27 2018 -0700 ---------------------------------------------------------------------- .../hadoop-yarn-common/src/main/resources/yarn-default.xml | 5 +++-- .../hadoop-yarn/hadoop-yarn-site/src/site/markdown/UsingFPGA.md | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c11d2341/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml index 412fd02..fd68804 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml @@ -3634,7 +3634,7 @@ <description> Enable additional discovery/isolation of resources on the NodeManager, split by comma. By default, this is empty. - Acceptable values: { "yarn-io/gpu", "yarn-io/fpga"}. + Acceptable values: { "yarn.io/gpu", "yarn.io/fpga"}. </description> <name>yarn.nodemanager.resource-plugins</name> <value></value> @@ -3715,9 +3715,10 @@ At present, since we can only configure one major number in c-e.cfg, FPGA device is identified by their minor device number. A common approach to get minor device number of FPGA is using "aocl diagnose" and check uevent with device name. + A sample manual value for this is like "0,1" </description> <name>yarn.nodemanager.resource-plugins.fpga.allowed-fpga-devices</name> - <value>0,1</value> + <value>auto</value> </property> <property> http://git-wip-us.apache.org/repos/asf/hadoop/blob/c11d2341/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/UsingFPGA.md ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/UsingFPGA.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/UsingFPGA.md index d98bb15..bc0589a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/UsingFPGA.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/UsingFPGA.md @@ -53,7 +53,7 @@ Use following property to configure `DominantResourceCalculator` (In `capacity-s ``` <property> <name>yarn.nodemanager.resource-plugins</name> - <value>yarn-io/fpga</value> + <value>yarn.io/fpga</value> </property> ``` --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
