Revert "MAPREDUCE-5875. Make Counter limits consistent across JobClient,
MRAppMaster, and YarnChild. (Gera Shegalov via kasha)"
This reverts commit 7bfd9e068d205f752c05d51778a4a4702329d31e.
Conflicts:
hadoop-mapreduce-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ec123abd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ec123abd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ec123abd
Branch: refs/heads/branch-2.7
Commit: ec123abdc9dfd42b1b960f3f1f5e4958296735a8
Parents: 1c050bd
Author: Vinod Kumar Vavilapalli <[email protected]>
Authored: Tue Mar 31 11:30:04 2015 -0700
Committer: Vinod Kumar Vavilapalli <[email protected]>
Committed: Tue Mar 31 11:30:04 2015 -0700
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 4 -
.../hadoop/mapreduce/v2/app/MRAppMaster.java | 3 -
.../org/apache/hadoop/mapreduce/Cluster.java | 16 ++--
.../apache/hadoop/mapreduce/JobSubmitter.java | 2 -
.../hadoop/mapreduce/counters/Limits.java | 5 --
.../mapreduce/jobhistory/HistoryViewer.java | 18 +---
.../hadoop/mapreduce/v2/hs/CompletedJob.java | 15 ----
.../apache/hadoop/mapreduce/v2/TestMRJobs.java | 87 +++-----------------
8 files changed, 22 insertions(+), 128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec123abd/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt
b/hadoop-mapreduce-project/CHANGES.txt
index 9513b50..9f52c49 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -405,9 +405,6 @@ Release 2.6.0 - 2014-11-18
MAPREDUCE-6123. TestCombineFileInputFormat incorrectly starts 2
MiniDFSCluster instances. (cnauroth)
- MAPREDUCE-5875. Make Counter limits consistent across JobClient,
- MRAppMaster, and YarnChild. (Gera Shegalov via kasha)
-
MAPREDUCE-6125. TestContainerLauncherImpl sometimes fails (Mit Desai via
jlowe)
@@ -453,7 +450,6 @@ Release 2.5.2 - 2014-11-19
BUG FIXES
-
Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec123abd/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
----------------------------------------------------------------------
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
index f484935..8f63882 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
@@ -54,7 +54,6 @@ import org.apache.hadoop.mapreduce.OutputFormat;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.hadoop.mapreduce.TaskAttemptID;
import org.apache.hadoop.mapreduce.TypeConverter;
-import org.apache.hadoop.mapreduce.counters.Limits;
import org.apache.hadoop.mapreduce.jobhistory.AMStartedEvent;
import org.apache.hadoop.mapreduce.jobhistory.EventReader;
import org.apache.hadoop.mapreduce.jobhistory.EventType;
@@ -1090,8 +1089,6 @@ public class MRAppMaster extends CompositeService {
// finally set the job classloader
MRApps.setClassLoader(jobClassLoader, getConfig());
- // set job classloader if configured
- Limits.init(getConfig());
if (initFailed) {
JobEvent initFailedEvent = new JobEvent(job.getID(),
JobEventType.JOB_INIT_FAILED);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec123abd/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Cluster.java
----------------------------------------------------------------------
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Cluster.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Cluster.java
index 34353ac..a92e648 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Cluster.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Cluster.java
@@ -183,15 +183,15 @@ public class Cluster {
public Job getJob(JobID jobId) throws IOException, InterruptedException {
JobStatus status = client.getJobStatus(jobId);
if (status != null) {
- final JobConf conf = new JobConf();
- final Path jobPath = new Path(client.getFilesystemName(),
- status.getJobFile());
- final FileSystem fs = FileSystem.get(jobPath.toUri(), getConf());
+ JobConf conf;
try {
- conf.addResource(fs.open(jobPath), jobPath.toString());
- } catch (FileNotFoundException fnf) {
- if (LOG.isWarnEnabled()) {
- LOG.warn("Job conf missing on cluster", fnf);
+ conf = new JobConf(status.getJobFile());
+ } catch (RuntimeException ex) {
+ // If job file doesn't exist it means we can't find the job
+ if (ex.getCause() instanceof FileNotFoundException) {
+ return null;
+ } else {
+ throw ex;
}
}
return Job.getInstance(this, status, conf);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec123abd/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java
----------------------------------------------------------------------
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java
index 30a87c7..31a3e2a 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobSubmitter.java
@@ -51,7 +51,6 @@ import org.apache.hadoop.mapred.QueueACL;
import static org.apache.hadoop.mapred.QueueManager.toFullPropertyName;
-import org.apache.hadoop.mapreduce.counters.Limits;
import org.apache.hadoop.mapreduce.filecache.ClientDistributedCacheManager;
import org.apache.hadoop.mapreduce.filecache.DistributedCache;
import org.apache.hadoop.mapreduce.protocol.ClientProtocol;
@@ -236,7 +235,6 @@ class JobSubmitter {
// Write job file to submit dir
writeConf(conf, submitJobFile);
- Limits.reset(conf);
//
// Now, actually submit the job (using the submit name)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec123abd/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/Limits.java
----------------------------------------------------------------------
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/Limits.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/Limits.java
index 3821694..34b0fae 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/Limits.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/counters/Limits.java
@@ -123,9 +123,4 @@ public class Limits {
public synchronized LimitExceededException violation() {
return firstViolation;
}
-
- public static synchronized void reset(Configuration conf) {
- isInited = false;
- init(conf);
- }
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec123abd/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/HistoryViewer.java
----------------------------------------------------------------------
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/HistoryViewer.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/HistoryViewer.java
index 43b2df2..eaeadea 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/HistoryViewer.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/jobhistory/HistoryViewer.java
@@ -17,7 +17,6 @@
*/
package org.apache.hadoop.mapreduce.jobhistory;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.text.DecimalFormat;
import java.text.Format;
@@ -30,8 +29,6 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
@@ -44,7 +41,6 @@ import org.apache.hadoop.mapreduce.Counters;
import org.apache.hadoop.mapreduce.TaskAttemptID;
import org.apache.hadoop.mapreduce.TaskID;
import org.apache.hadoop.mapreduce.TaskType;
-import org.apache.hadoop.mapreduce.counters.Limits;
import org.apache.hadoop.mapreduce.jobhistory.JobHistoryParser.JobInfo;
import org.apache.hadoop.mapreduce.jobhistory.JobHistoryParser.TaskInfo;
import org.apache.hadoop.mapreduce.util.HostUtil;
@@ -58,8 +54,7 @@ import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
@InterfaceAudience.Private
@InterfaceStability.Unstable
public class HistoryViewer {
- private static final Log LOG = LogFactory.getLog(HistoryViewer.class);
- private static final SimpleDateFormat dateFormat =
+ private static SimpleDateFormat dateFormat =
new SimpleDateFormat("d-MMM-yyyy HH:mm:ss");
private FileSystem fs;
private JobInfo job;
@@ -88,17 +83,6 @@ public class HistoryViewer {
System.err.println("Ignore unrecognized file: " + jobFile.getName());
throw new IOException(errorMsg);
}
- final Path jobConfPath = new Path(jobFile.getParent(), jobDetails[0]
- + "_" + jobDetails[1] + "_" + jobDetails[2] + "_conf.xml");
- final Configuration jobConf = new Configuration(conf);
- try {
- jobConf.addResource(fs.open(jobConfPath), jobConfPath.toString());
- Limits.reset(conf);
- } catch (FileNotFoundException fnf) {
- if (LOG.isWarnEnabled()) {
- LOG.warn("Missing job conf in history", fnf);
- }
- }
JobHistoryParser parser = new JobHistoryParser(fs, jobFile);
job = parser.parse();
jobId = job.getJobId().toString();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec123abd/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
----------------------------------------------------------------------
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
index 1cf63d4..d19fc58 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/CompletedJob.java
@@ -18,7 +18,6 @@
package org.apache.hadoop.mapreduce.v2.hs;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.UnknownHostException;
import java.util.ArrayList;
@@ -35,7 +34,6 @@ import java.util.concurrent.locks.ReentrantLock;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.JobACLsManager;
import org.apache.hadoop.mapred.TaskCompletionEvent;
@@ -43,7 +41,6 @@ import org.apache.hadoop.mapreduce.Counters;
import org.apache.hadoop.mapreduce.JobACL;
import org.apache.hadoop.mapreduce.TaskID;
import org.apache.hadoop.mapreduce.TypeConverter;
-import org.apache.hadoop.mapreduce.counters.Limits;
import org.apache.hadoop.mapreduce.jobhistory.JobHistoryParser;
import org.apache.hadoop.mapreduce.jobhistory.JobHistoryParser.JobInfo;
import org.apache.hadoop.mapreduce.jobhistory.JobHistoryParser.TaskInfo;
@@ -344,21 +341,9 @@ public class CompletedJob implements
org.apache.hadoop.mapreduce.v2.app.job.Job
if (historyFileAbsolute != null) {
JobHistoryParser parser = null;
try {
- final FileSystem fs = historyFileAbsolute.getFileSystem(conf);
parser =
new JobHistoryParser(historyFileAbsolute.getFileSystem(conf),
historyFileAbsolute);
- final Path jobConfPath = new Path(historyFileAbsolute.getParent(),
- JobHistoryUtils.getIntermediateConfFileName(jobId));
- final Configuration conf = new Configuration();
- try {
- conf.addResource(fs.open(jobConfPath), jobConfPath.toString());
- Limits.reset(conf);
- } catch (FileNotFoundException fnf) {
- if (LOG.isWarnEnabled()) {
- LOG.warn("Missing job conf in history", fnf);
- }
- }
this.jobInfo = parser.parse();
} catch (IOException e) {
throw new YarnRuntimeException("Could not load history file "
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec123abd/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java
----------------------------------------------------------------------
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java
index 60e5638..d6e8e38 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestMRJobs.java
@@ -54,14 +54,10 @@ import org.apache.hadoop.fs.RemoteIterator;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.io.IOUtils;
-import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.NullWritable;
import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapred.JobClient;
import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.JobID;
-import org.apache.hadoop.mapred.RunningJob;
import org.apache.hadoop.mapred.TaskLog;
import org.apache.hadoop.mapreduce.Counters;
import org.apache.hadoop.mapreduce.Job;
@@ -112,7 +108,6 @@ public class TestMRJobs {
EnumSet.of(RMAppState.FINISHED, RMAppState.FAILED, RMAppState.KILLED);
private static final int NUM_NODE_MGRS = 3;
private static final String TEST_IO_SORT_MB = "11";
- private static final String TEST_GROUP_MAX = "200";
private static final int DEFAULT_REDUCES = 2;
protected int numSleepReducers = DEFAULT_REDUCES;
@@ -243,58 +238,31 @@ public class TestMRJobs {
}
@Test(timeout = 300000)
- public void testConfVerificationWithClassloader() throws Exception {
- testConfVerification(true, false, false, false);
- }
-
- @Test(timeout = 300000)
- public void testConfVerificationWithClassloaderCustomClasses()
- throws Exception {
- testConfVerification(true, true, false, false);
- }
-
- @Test(timeout = 300000)
- public void testConfVerificationWithOutClassloader() throws Exception {
- testConfVerification(false, false, false, false);
- }
-
- @Test(timeout = 300000)
- public void testConfVerificationWithJobClient() throws Exception {
- testConfVerification(false, false, true, false);
+ public void testJobClassloader() throws IOException, InterruptedException,
+ ClassNotFoundException {
+ testJobClassloader(false);
}
@Test(timeout = 300000)
- public void testConfVerificationWithJobClientLocal() throws Exception {
- testConfVerification(false, false, true, true);
+ public void testJobClassloaderWithCustomClasses() throws IOException,
+ InterruptedException, ClassNotFoundException {
+ testJobClassloader(true);
}
- private void testConfVerification(boolean useJobClassLoader,
- boolean useCustomClasses, boolean useJobClientForMonitring,
- boolean useLocal) throws Exception {
- LOG.info("\n\n\nStarting testConfVerification()"
- + " jobClassloader=" + useJobClassLoader
- + " customClasses=" + useCustomClasses
- + " jobClient=" + useJobClientForMonitring
- + " localMode=" + useLocal);
+ private void testJobClassloader(boolean useCustomClasses) throws IOException,
+ InterruptedException, ClassNotFoundException {
+ LOG.info("\n\n\nStarting testJobClassloader()"
+ + " useCustomClasses=" + useCustomClasses);
if (!(new File(MiniMRYarnCluster.APPJAR)).exists()) {
LOG.info("MRAppJar " + MiniMRYarnCluster.APPJAR
+ " not found. Not running test.");
return;
}
- final Configuration clusterConfig;
- if (useLocal) {
- clusterConfig = new Configuration();
- conf.set(MRConfig.FRAMEWORK_NAME, MRConfig.LOCAL_FRAMEWORK_NAME);
- } else {
- clusterConfig = mrCluster.getConfig();
- }
- final JobClient jc = new JobClient(clusterConfig);
- final Configuration sleepConf = new Configuration(clusterConfig);
+ final Configuration sleepConf = new Configuration(mrCluster.getConfig());
// set master address to local to test that local mode applied iff
framework == local
sleepConf.set(MRConfig.MASTER_ADDRESS, "local");
- sleepConf.setBoolean(MRJobConfig.MAPREDUCE_JOB_CLASSLOADER,
- useJobClassLoader);
+ sleepConf.setBoolean(MRJobConfig.MAPREDUCE_JOB_CLASSLOADER, true);
if (useCustomClasses) {
// to test AM loading user classes such as output format class, we want
// to blacklist them from the system classes (they need to be prepended
@@ -312,7 +280,6 @@ public class TestMRJobs {
sleepConf.set(MRJobConfig.MAP_LOG_LEVEL, Level.ALL.toString());
sleepConf.set(MRJobConfig.REDUCE_LOG_LEVEL, Level.ALL.toString());
sleepConf.set(MRJobConfig.MAP_JAVA_OPTS, "-verbose:class");
- sleepConf.set(MRJobConfig.COUNTER_GROUPS_MAX_KEY, TEST_GROUP_MAX);
final SleepJob sleepJob = new SleepJob();
sleepJob.setConf(sleepConf);
final Job job = sleepJob.createJob(1, 1, 10, 1, 10, 1);
@@ -330,26 +297,7 @@ public class TestMRJobs {
jobConf.setBoolean(MRJobConfig.MAP_SPECULATIVE, true);
}
job.submit();
- final boolean succeeded;
- if (useJobClientForMonitring && !useLocal) {
- // We can't use getJobID in useLocal case because JobClient and Job
- // point to different instances of LocalJobRunner
- //
- final JobID mapredJobID = JobID.downgrade(job.getJobID());
- RunningJob runningJob = null;
- do {
- Thread.sleep(10);
- runningJob = jc.getJob(mapredJobID);
- } while (runningJob == null);
- Assert.assertEquals("Unexpected RunningJob's "
- + MRJobConfig.COUNTER_GROUPS_MAX_KEY,
- TEST_GROUP_MAX, runningJob.getConfiguration()
- .get(MRJobConfig.COUNTER_GROUPS_MAX_KEY));
- runningJob.waitForCompletion();
- succeeded = runningJob.isSuccessful();
- } else {
- succeeded = job.waitForCompletion(true);
- }
+ boolean succeeded = job.waitForCompletion(true);
Assert.assertTrue("Job status: " + job.getStatus().getFailureInfo(),
succeeded);
}
@@ -1003,14 +951,5 @@ public class TestMRJobs {
+ ", actual: " + ioSortMb);
}
}
-
- @Override
- public void map(IntWritable key, IntWritable value, Context context)
throws IOException, InterruptedException {
- super.map(key, value, context);
- for (int i = 0; i < 100; i++) {
- context.getCounter("testCounterGroup-" + i,
- "testCounter").increment(1);
- }
- }
}
}
