Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MAPREDUCE-7280. MiniMRYarnCluster has hard-coded timeout waiting to start history server, with no way to disable. #2065

Merged
merged 3 commits into from
Jun 30, 2020
Merged

MAPREDUCE-7280. MiniMRYarnCluster has hard-coded timeout waiting to start history server, with no way to disable. #2065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94feccf
MAPREDUCE-7280. MiniMRYarnCluster has hard-coded timeout waiting to s…
iwasakims Jun 10, 2020
01e77a7
addressed checkstyle warnings. avoiding to expose test only configura…
iwasakims Jun 11, 2020
915c4d3
assertion after starting minicluster should be more stable for future…
iwasakims Jun 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions ...-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRBringup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@

package org.apache.hadoop.mapred;

import java.io.IOException;

import org.junit.Assert;
import org.junit.Test;

import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapreduce.v2.MiniMRYarnCluster;

/**
* A Unit-test to test bringup and shutdown of Mini Map-Reduce Cluster.
Expand All @@ -36,5 +40,21 @@ public void testBringUp() throws IOException {
if (mr != null) { mr.shutdown(); }
}
}


@Test
public void testMiniMRYarnClusterWithoutJHS() throws IOException {
MiniMRYarnCluster mr = null;
try {
final Configuration conf = new Configuration();
conf.setBoolean(MiniMRYarnCluster.MR_HISTORY_MINICLUSTER_ENABLED, false);
mr = new MiniMRYarnCluster("testMiniMRYarnClusterWithoutJHS");
mr.init(conf);
mr.start();
Assert.assertEquals(null, mr.getHistoryServer());
} finally {
if (mr != null) {
mr.stop();
}
}
}
}
34 changes: 23 additions & 11 deletions ...duce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ public class MiniMRYarnCluster extends MiniYARNCluster {
private JobHistoryServer historyServer;
private JobHistoryServerWrapper historyServerWrapper;
private static final String TIMELINE_AUX_SERVICE_NAME = "timeline_collector";
public static final String MR_HISTORY_MINICLUSTER_ENABLED =
JHAdminConfig.MR_HISTORY_PREFIX + "minicluster.enabled";
public static final String MR_HISTORY_MINICLUSTER_LAUNCH_TIMEOUT_MS =
JHAdminConfig.MR_HISTORY_PREFIX + "minicluster.launch.timeout.ms";

public MiniMRYarnCluster(String testName) {
this(testName, 1);
Expand All @@ -77,11 +81,10 @@ public MiniMRYarnCluster(String testName) {
public MiniMRYarnCluster(String testName, int noOfNMs) {
this(testName, noOfNMs, false);
}

@Deprecated
public MiniMRYarnCluster(String testName, int noOfNMs, boolean enableAHS) {
super(testName, 1, noOfNMs, 4, 4, enableAHS);
historyServerWrapper = new JobHistoryServerWrapper();
addService(historyServerWrapper);
}

public static String getResolvedMRHistoryWebAppURLWithoutScheme(
Expand Down Expand Up @@ -118,6 +121,11 @@ public static String getResolvedMRHistoryWebAppURLWithoutScheme(

@Override
public void serviceInit(Configuration conf) throws Exception {
if (conf.getBoolean(MR_HISTORY_MINICLUSTER_ENABLED, true)) {
historyServerWrapper = new JobHistoryServerWrapper();
addService(historyServerWrapper);
}

conf.set(MRConfig.FRAMEWORK_NAME, MRConfig.YARN_FRAMEWORK_NAME);
String stagingDir = conf.get(MRJobConfig.MR_AM_STAGING_DIR);
if (stagingDir == null ||
Expand Down Expand Up @@ -212,11 +220,13 @@ public void serviceInit(Configuration conf) throws Exception {
protected void serviceStart() throws Exception {
super.serviceStart();

//need to do this because historyServer.init creates a new Configuration
getConfig().set(JHAdminConfig.MR_HISTORY_ADDRESS,
historyServer.getConfig().get(JHAdminConfig.MR_HISTORY_ADDRESS));
MRWebAppUtil.setJHSWebappURLWithoutScheme(getConfig(),
MRWebAppUtil.getJHSWebappURLWithoutScheme(historyServer.getConfig()));
if (historyServer != null) {
//need to do this because historyServer.init creates a new Configuration
getConfig().set(JHAdminConfig.MR_HISTORY_ADDRESS,
historyServer.getConfig().get(JHAdminConfig.MR_HISTORY_ADDRESS));
MRWebAppUtil.setJHSWebappURLWithoutScheme(getConfig(),
MRWebAppUtil.getJHSWebappURLWithoutScheme(historyServer.getConfig()));
}

LOG.info("MiniMRYARN ResourceManager address: " +
getConfig().get(YarnConfiguration.RM_ADDRESS));
Expand All @@ -233,7 +243,6 @@ private class JobHistoryServerWrapper extends AbstractService {
public JobHistoryServerWrapper() {
super(JobHistoryServerWrapper.class.getName());
}
private volatile boolean jhsStarted = false;

@Override
public synchronized void serviceStart() throws Exception {
Expand All @@ -255,12 +264,15 @@ public synchronized void serviceStart() throws Exception {
new Thread() {
public void run() {
historyServer.start();
jhsStarted = true;
};
}.start();
iwasakims marked this conversation as resolved.
Show resolved Hide resolved

GenericTestUtils.waitFor(() -> jhsStarted, 1500, 60_000);

final int launchTimeout = getConfig().getInt(
MR_HISTORY_MINICLUSTER_LAUNCH_TIMEOUT_MS, 60_000);
GenericTestUtils.waitFor(
() -> historyServer.getServiceState() == STATE.STARTED
|| historyServer.getServiceState() == STATE.STOPPED,
100, launchTimeout);
if (historyServer.getServiceState() != STATE.STARTED) {
throw new IOException("HistoryServer failed to start");
}
Expand Down