From 2f7857baeaf3d07f00f3bdcf700e1849abcb663b Mon Sep 17 00:00:00 2001
From: Akira Ajisaka <aajisaka@apache.org>
Date: Thu, 14 Jul 2016 10:43:43 -0700
Subject: [PATCH] YARN-5159. Wrong Javadoc tag in MiniYarnCluster. Contributed
 by Andras Bokor.

(cherry picked from commit 6cf017558a3d06240b95d1b56c953591ece97c92)
(cherry picked from commit 66640777275bccfdff417670d84706e3d722d113)
---
 .../hadoop/yarn/server/MiniYARNCluster.java   | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
index 1e9a8261c42..0dd0aa18dcf 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
@@ -93,16 +93,20 @@ import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
 import com.google.common.annotations.VisibleForTesting;
 
 /**
+ * <p>
  * Embedded Yarn minicluster for testcases that need to interact with a cluster.
- * <p/>
+ * </p>
+ * <p>
  * In a real cluster, resource request matching is done using the hostname, and
  * by default Yarn minicluster works in the exact same way as a real cluster.
- * <p/>
- * If a testcase needs to use multiple nodes and exercise resource request 
+ * </p>
+ * <p>
+ * If a testcase needs to use multiple nodes and exercise resource request
  * matching to a specific node, then the property 
- * {@YarnConfiguration.RM_SCHEDULER_INCLUDE_PORT_IN_NODE_NAME} should be set
- * <code>true</code> in the configuration used to initialize the minicluster.
- * <p/>
+ * {@value org.apache.hadoop.yarn.conf.YarnConfiguration#RM_SCHEDULER_INCLUDE_PORT_IN_NODE_NAME}
+ * should be set <code>true</code> in the configuration used to initialize
+ * the minicluster.
+ * </p>
  * With this property set to <code>true</code>, the matching will be done using
  * the <code>hostname:port</code> of the namenodes. In such case, the AM must
  * do resource request using <code>hostname:port</code> as the location.
@@ -723,8 +727,9 @@ public class MiniYARNCluster extends CompositeService {
    * @param timeout Time to wait (sleeps in 10 ms intervals) in milliseconds.
    * @return true if all NodeManagers connect to the (Active)
    * ResourceManager, false otherwise.
-   * @throws YarnException
-   * @throws InterruptedException
+   * @throws YarnException if there is no active RM
+   * @throws InterruptedException if any thread has interrupted
+   * the current thread
    */
   public boolean waitForNodeManagersToConnect(long timeout)
       throws YarnException, InterruptedException {