From c11d2341afe1da8a98c1d0f048147dc664fc8ab3 Mon Sep 17 00:00:00 2001
From: Wangda Tan <wangda@apache.org>
Date: Fri, 19 Oct 2018 09:44:00 -0700
Subject: [PATCH] YARN-8908. Fix errors in yarn-default.xml related to
 GPU/FPGA. (Zhankun Tang via wangda)

Change-Id: I46f511a9b51b65b069e15d5b827530110c41edab
(cherry picked from commit 071b9e19aa2c17bb9fa046c6ddabd6b8f0cc6d14)
---
 .../hadoop-yarn-common/src/main/resources/yarn-default.xml   | 5 +++--
 .../hadoop-yarn-site/src/site/markdown/UsingFPGA.md          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

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 412fd022e07..fd68804d026 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>
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 d98bb15bdd1..bc0589ae7e9 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>
 
 ```