diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/AllocateResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/AllocateResponse.java index 98346ce861f..3412b95d437 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/AllocateResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/AllocateResponse.java @@ -376,7 +376,7 @@ public void setUpdateErrors(List updateErrors) { * Get the list of running containers as viewed by * ResourceManager from previous application attempts which * have not been reported to the Application Master yet. - *
+ *

* These containers were recovered by the RM after the application master * had already registered. This may happen after RM restart when some NMs get * delayed in connecting to the RM and reporting the active containers. @@ -394,7 +394,7 @@ public void setUpdateErrors(List updateErrors) { * Set the list of running containers as viewed by * ResourceManager from previous application attempts which have * not been reported to the Application Master yet. - *
+ *

* These containers were recovered by the RM after the application master * had already registered. This may happen after RM restart when some NMs get * delayed in connecting to the RM and reporting the active containers. diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/AbstractFpgaVendorPlugin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/AbstractFpgaVendorPlugin.java index 60ea57c89ab..4db97291c25 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/AbstractFpgaVendorPlugin.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/AbstractFpgaVendorPlugin.java @@ -77,7 +77,7 @@ /** * The vendor plugin configure an IP file to a device * @param ipPath The absolute path of the IP file - * @param majorMinorNumber The device in format + * @param majorMinorNumber The device in format <major:minor> * @return configure device ok or not * */ boolean configureIP(String ipPath, String majorMinorNumber); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/IntelFpgaOpenclPlugin.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/IntelFpgaOpenclPlugin.java index f2e82b8961c..16fc148171b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/IntelFpgaOpenclPlugin.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/fpga/IntelFpgaOpenclPlugin.java @@ -221,26 +221,27 @@ public String runDiagnose(String binary, int timeout) { * While per Intel's guide, the output(should be outdated or prior SDK version's) is as below: * * " - * aocl diagnose: Running diagnostic from ALTERAOCLSDKROOT/board// - * /libexec + * aocl diagnose: Running diagnostic from + * ALTERAOCLSDKROOT/board/<board_name>/<platform>/libexec * Verified that the kernel mode driver is installed on the host machine. - * Using board package from vendor: + * Using board package from vendor: <board_vendor_name> * Querying information for all supported devices that are installed on the host * machine ... * * device_name Status Information * - * acl0 Passed - * PCIe dev_id = , bus:slot.func = 02:00.00, + * acl0 Passed <descriptive_board_name> + * PCIe dev_id = <device_ID>, bus:slot.func = 02:00.00, * at Gen 2 with 8 lanes. * FPGA temperature=43.0 degrees C. - * acl1 Passed - * PCIe dev_id = , bus:slot.func = 03:00.00, + * acl1 Passed <descriptive_board_name> + * PCIe dev_id = <device_ID>, bus:slot.func = 03:00.00, * at Gen 2 with 8 lanes. * FPGA temperature = 35.0 degrees C. * * Found 2 active device(s) installed on the host machine, to perform a full - * diagnostic on a specific device, please run aocl diagnose + * diagnostic on a specific device, please run aocl diagnose + * <device_name> * * DIAGNOSTIC_PASSED * "