You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sj...@apache.org on 2016/07/16 03:36:23 UTC
[02/50] [abbrv] hadoop git commit: YARN-5159. Wrong Javadoc tag in
MiniYarnCluster. Contributed by Andras Bokor.
YARN-5159. Wrong Javadoc tag in MiniYarnCluster. Contributed by Andras Bokor.
(cherry picked from commit 6cf017558a3d06240b95d1b56c953591ece97c92)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/66640777
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/66640777
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/66640777
Branch: refs/heads/YARN-5355-branch-2
Commit: 66640777275bccfdff417670d84706e3d722d113
Parents: 58088d2
Author: Akira Ajisaka <aa...@apache.org>
Authored: Thu Jul 14 10:43:43 2016 -0700
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Thu Jul 14 10:45:39 2016 -0700
----------------------------------------------------------------------
.../hadoop/yarn/server/MiniYARNCluster.java | 21 ++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/66640777/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
----------------------------------------------------------------------
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 de4e22d..0f239c0 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
@@ -96,16 +96,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.
@@ -733,8 +737,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 {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org