Repository: hadoop Updated Branches: refs/heads/branch-2.8 cf366a0fd -> e27fbcb50
MAPREDUCE-6804. Add timeout when starting JobHistoryServer in MiniMRYarnCluster. Contributed by Andras Bokor (cherry picked from commit 41f8275c50b34c919cca26510d505775d676ebb4) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e27fbcb5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e27fbcb5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e27fbcb5 Branch: refs/heads/branch-2.8 Commit: e27fbcb50cffa7e3c23236c0a7bcc4a19fe74e6d Parents: cf366a0 Author: Jason Lowe <jl...@apache.org> Authored: Wed Nov 16 15:26:19 2016 +0000 Committer: Jason Lowe <jl...@apache.org> Committed: Wed Nov 16 15:27:32 2016 +0000 ---------------------------------------------------------------------- .../apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e27fbcb5/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java index 3521834..7465d7c 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java @@ -24,6 +24,7 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.UnknownHostException; +import com.google.common.base.Supplier; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; @@ -45,6 +46,7 @@ import org.apache.hadoop.mapreduce.v2.util.MRWebAppUtil; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.service.AbstractService; import org.apache.hadoop.service.Service; +import org.apache.hadoop.test.GenericTestUtils; import org.apache.hadoop.util.JarFinder; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; @@ -216,11 +218,13 @@ public class MiniMRYarnCluster extends MiniYARNCluster { }; }.start(); - while (!jhsStarted) { - LOG.info("Waiting for HistoryServer to start..."); - Thread.sleep(1500); - } - //TODO Add a timeout. State.STOPPED check ? + GenericTestUtils.waitFor(new Supplier<Boolean>() { + @Override + public Boolean get() { + return jhsStarted; + } + }, 1500, 60_000); + if (historyServer.getServiceState() != STATE.STARTED) { throw new IOException("HistoryServer failed to start"); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
