Revert "YARN-2890. MiniYARNCluster should start the timeline server based on the configuration. Contributed by Mit Desai."
This reverts commit51af8d367d
. Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commita4f2995b9e
)
This commit is contained in:
parent
282b5ed8ec
commit
d2356a552a
|
@ -453,7 +453,7 @@ public class TestJobHistoryEventHandler {
|
|||
long currentTime = System.currentTimeMillis();
|
||||
try {
|
||||
yarnCluster = new MiniYARNCluster(
|
||||
TestJobHistoryEventHandler.class.getSimpleName(), 1, 1, 1, 1);
|
||||
TestJobHistoryEventHandler.class.getSimpleName(), 1, 1, 1, 1, true);
|
||||
yarnCluster.init(conf);
|
||||
yarnCluster.start();
|
||||
jheh.start();
|
||||
|
|
|
@ -34,58 +34,6 @@ import org.junit.Test;
|
|||
|
||||
public class TestMRTimelineEventHandling {
|
||||
|
||||
@Test
|
||||
public void testTimelineServiceStartInMiniCluster() throws Exception {
|
||||
Configuration conf = new YarnConfiguration();
|
||||
|
||||
/*
|
||||
* Timeline service should not start if the config is set to false
|
||||
* Regardless to the value of MAPREDUCE_JOB_EMIT_TIMELINE_DATA
|
||||
*/
|
||||
conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, false);
|
||||
conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_EMIT_TIMELINE_DATA, true);
|
||||
MiniMRYarnCluster cluster = null;
|
||||
try {
|
||||
cluster = new MiniMRYarnCluster(
|
||||
TestJobHistoryEventHandler.class.getSimpleName(), 1);
|
||||
cluster.init(conf);
|
||||
cluster.start();
|
||||
|
||||
//verify that the timeline service is not started.
|
||||
Assert.assertNull("Timeline Service should not have been started",
|
||||
cluster.getApplicationHistoryServer());
|
||||
|
||||
//Run a MR job and verify it succeeds
|
||||
Path inDir = new Path("input");
|
||||
Path outDir = new Path("output");
|
||||
RunningJob job =
|
||||
UtilsForTests.runJobSucceed(new JobConf(conf), inDir, outDir);
|
||||
Assert.assertEquals(JobStatus.SUCCEEDED,
|
||||
job.getJobStatus().getState().getValue());
|
||||
}
|
||||
finally {
|
||||
if(cluster != null) {
|
||||
cluster.stop();
|
||||
}
|
||||
}
|
||||
conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, false);
|
||||
conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_EMIT_TIMELINE_DATA, false);
|
||||
cluster = null;
|
||||
try {
|
||||
cluster = new MiniMRYarnCluster(
|
||||
TestJobHistoryEventHandler.class.getSimpleName(), 1);
|
||||
cluster.init(conf);
|
||||
cluster.start();
|
||||
Assert.assertNull("Timeline Service should not have been started",
|
||||
cluster.getApplicationHistoryServer());
|
||||
}
|
||||
finally {
|
||||
if(cluster != null) {
|
||||
cluster.stop();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testMRTimelineEventHandling() throws Exception {
|
||||
Configuration conf = new YarnConfiguration();
|
||||
|
@ -94,7 +42,7 @@ public class TestMRTimelineEventHandling {
|
|||
MiniMRYarnCluster cluster = null;
|
||||
try {
|
||||
cluster = new MiniMRYarnCluster(
|
||||
TestJobHistoryEventHandler.class.getSimpleName(), 1);
|
||||
TestJobHistoryEventHandler.class.getSimpleName(), 1, true);
|
||||
cluster.init(conf);
|
||||
cluster.start();
|
||||
TimelineStore ts = cluster.getApplicationHistoryServer()
|
||||
|
@ -148,7 +96,7 @@ public class TestMRTimelineEventHandling {
|
|||
MiniMRYarnCluster cluster = null;
|
||||
try {
|
||||
cluster = new MiniMRYarnCluster(
|
||||
TestJobHistoryEventHandler.class.getSimpleName(), 1);
|
||||
TestJobHistoryEventHandler.class.getSimpleName(), 1, true);
|
||||
cluster.init(conf);
|
||||
cluster.start();
|
||||
TimelineStore ts = cluster.getApplicationHistoryServer()
|
||||
|
@ -185,7 +133,7 @@ public class TestMRTimelineEventHandling {
|
|||
cluster = null;
|
||||
try {
|
||||
cluster = new MiniMRYarnCluster(
|
||||
TestJobHistoryEventHandler.class.getSimpleName(), 1);
|
||||
TestJobHistoryEventHandler.class.getSimpleName(), 1, true);
|
||||
cluster.init(conf);
|
||||
cluster.start();
|
||||
TimelineStore ts = cluster.getApplicationHistoryServer()
|
||||
|
|
|
@ -72,7 +72,11 @@ public class MiniMRYarnCluster extends MiniYARNCluster {
|
|||
}
|
||||
|
||||
public MiniMRYarnCluster(String testName, int noOfNMs) {
|
||||
super(testName, 1, noOfNMs, 4, 4);
|
||||
this(testName, noOfNMs, false);
|
||||
}
|
||||
|
||||
public MiniMRYarnCluster(String testName, int noOfNMs, boolean enableAHS) {
|
||||
super(testName, 1, noOfNMs, 4, 4, enableAHS);
|
||||
historyServerWrapper = new JobHistoryServerWrapper();
|
||||
addService(historyServerWrapper);
|
||||
}
|
||||
|
|
|
@ -155,9 +155,6 @@ Release 2.7.0 - UNRELEASED
|
|||
YARN-2905. AggregatedLogsBlock page can infinitely loop if the aggregated
|
||||
log file is corrupted (Varun Saxena via jlowe)
|
||||
|
||||
YARN-2890. MiniYARNCluster should start the timeline server based on the
|
||||
configuration. (Mit Desai via zjshen)
|
||||
|
||||
YARN-2894. Fixed a bug regarding application view acl when RM fails over.
|
||||
(Rohith Sharmaks via jianhe)
|
||||
|
||||
|
|
|
@ -84,7 +84,7 @@ public class TestDistributedShell {
|
|||
if (yarnCluster == null) {
|
||||
yarnCluster =
|
||||
new MiniYARNCluster(TestDistributedShell.class.getSimpleName(), 1,
|
||||
numNodeManager, 1, 1);
|
||||
numNodeManager, 1, 1, true);
|
||||
yarnCluster.init(conf);
|
||||
|
||||
yarnCluster.start();
|
||||
|
|
|
@ -295,7 +295,7 @@ public abstract class ProtocolHATestBase extends ClientBaseWithFixes {
|
|||
conf.setBoolean(YarnConfiguration.AUTO_FAILOVER_ENABLED, false);
|
||||
cluster =
|
||||
new MiniYARNClusterForHATesting(TestRMFailover.class.getName(), 2,
|
||||
numOfNMs, 1, 1, overrideClientRMService, overrideRTS,
|
||||
numOfNMs, 1, 1, false, overrideClientRMService, overrideRTS,
|
||||
overrideApplicationMasterService);
|
||||
cluster.resetStartFailoverFlag(false);
|
||||
cluster.init(conf);
|
||||
|
@ -326,10 +326,10 @@ public abstract class ProtocolHATestBase extends ClientBaseWithFixes {
|
|||
|
||||
public MiniYARNClusterForHATesting(String testName,
|
||||
int numResourceManagers, int numNodeManagers, int numLocalDirs,
|
||||
int numLogDirs, boolean overrideClientRMService,
|
||||
int numLogDirs, boolean enableAHS, boolean overrideClientRMService,
|
||||
boolean overrideRTS, boolean overrideApplicationMasterService) {
|
||||
super(testName, numResourceManagers, numNodeManagers, numLocalDirs,
|
||||
numLogDirs);
|
||||
numLogDirs, enableAHS);
|
||||
this.overrideClientRMService = overrideClientRMService;
|
||||
this.overrideRTS = overrideRTS;
|
||||
this.overrideApplicationMasterService = overrideApplicationMasterService;
|
||||
|
|
|
@ -57,6 +57,7 @@ import org.apache.hadoop.yarn.server.api.protocolrecords.RegisterNodeManagerResp
|
|||
import org.apache.hadoop.yarn.server.applicationhistoryservice.ApplicationHistoryServer;
|
||||
import org.apache.hadoop.yarn.server.applicationhistoryservice.ApplicationHistoryStore;
|
||||
import org.apache.hadoop.yarn.server.applicationhistoryservice.MemoryApplicationHistoryStore;
|
||||
import org.apache.hadoop.yarn.server.applicationhistoryservice.webapp.AHSWebApp;
|
||||
import org.apache.hadoop.yarn.server.nodemanager.Context;
|
||||
import org.apache.hadoop.yarn.server.nodemanager.NodeHealthCheckerService;
|
||||
import org.apache.hadoop.yarn.server.nodemanager.NodeManager;
|
||||
|
@ -119,6 +120,7 @@ public class MiniYARNCluster extends CompositeService {
|
|||
private int numLocalDirs;
|
||||
// Number of nm-log-dirs per nodemanager
|
||||
private int numLogDirs;
|
||||
private boolean enableAHS;
|
||||
|
||||
/**
|
||||
* @param testName name of the test
|
||||
|
@ -126,13 +128,15 @@ public class MiniYARNCluster extends CompositeService {
|
|||
* @param numNodeManagers the number of node managers in the cluster
|
||||
* @param numLocalDirs the number of nm-local-dirs per nodemanager
|
||||
* @param numLogDirs the number of nm-log-dirs per nodemanager
|
||||
* @param enableAHS enable ApplicationHistoryServer or not
|
||||
*/
|
||||
public MiniYARNCluster(
|
||||
String testName, int numResourceManagers, int numNodeManagers,
|
||||
int numLocalDirs, int numLogDirs) {
|
||||
int numLocalDirs, int numLogDirs, boolean enableAHS) {
|
||||
super(testName.replace("$", ""));
|
||||
this.numLocalDirs = numLocalDirs;
|
||||
this.numLogDirs = numLogDirs;
|
||||
this.enableAHS = enableAHS;
|
||||
String testSubDir = testName.replace("$", "");
|
||||
File targetWorkDir = new File("target", testSubDir);
|
||||
try {
|
||||
|
@ -182,6 +186,20 @@ public class MiniYARNCluster extends CompositeService {
|
|||
nodeManagers = new NodeManager[numNodeManagers];
|
||||
}
|
||||
|
||||
/**
|
||||
* @param testName name of the test
|
||||
* @param numResourceManagers the number of resource managers in the cluster
|
||||
* @param numNodeManagers the number of node managers in the cluster
|
||||
* @param numLocalDirs the number of nm-local-dirs per nodemanager
|
||||
* @param numLogDirs the number of nm-log-dirs per nodemanager
|
||||
*/
|
||||
public MiniYARNCluster(
|
||||
String testName, int numResourceManagers, int numNodeManagers,
|
||||
int numLocalDirs, int numLogDirs) {
|
||||
this(testName, numResourceManagers, numNodeManagers, numLocalDirs,
|
||||
numLogDirs, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param testName name of the test
|
||||
* @param numNodeManagers the number of node managers in the cluster
|
||||
|
@ -242,7 +260,7 @@ public class MiniYARNCluster extends CompositeService {
|
|||
addService(new NodeManagerWrapper(index));
|
||||
}
|
||||
|
||||
if(conf.getBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, false)) {
|
||||
if (enableAHS) {
|
||||
addService(new ApplicationHistoryServerWrapper());
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue