Explorar o código

YARN-8908. Fix errors in yarn-default.xml related to GPU/FPGA. (Zhankun Tang via wangda)

Change-Id: I46f511a9b51b65b069e15d5b827530110c41edab
(cherry picked from commit 071b9e19aa2c17bb9fa046c6ddabd6b8f0cc6d14)
Wangda Tan %!s(int64=6) %!d(string=hai) anos
pai
achega
c11d2341af

+ 3 - 2
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>

+ 1 - 1
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>
 
 ```