diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 09d52aba8f0..7d47562aa1d 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -55,6 +55,9 @@ Release 2.7.0 - UNRELEASED MAPREDUCE-6255. Fix JobCounter's format to use grouping separator. (Ryu Kobayashi via ozawa) + MAPREDUCE-6256. Removed unused private methods in o.a.h.mapreduce.Job.java. + (Naganarasimha G R via ozawa) + OPTIMIZATIONS MAPREDUCE-6169. MergeQueue should release reference to the current item diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java index 493ca5f6ea5..470290c266b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java @@ -98,9 +98,6 @@ public class Job extends JobContextImpl implements JobContext { "mapreduce.client.genericoptionsparser.used"; public static final String SUBMIT_REPLICATION = "mapreduce.client.submit.file.replication"; - private static final String TASKLOG_PULL_TIMEOUT_KEY = - "mapreduce.client.tasklog.timeout"; - private static final int DEFAULT_TASKLOG_TIMEOUT = 60000; @InterfaceStability.Evolving public static enum TaskStatusFilter { NONE, KILLED, FAILED, SUCCEEDED, ALL } @@ -340,10 +337,6 @@ public class Job extends JobContextImpl implements JobContext { updateStatus(); return status; } - - private void setStatus(JobStatus status) { - this.status = status; - } /** * Returns the current state of the Job. @@ -1393,46 +1386,6 @@ public class Job extends JobContextImpl implements JobContext { return success; } - /** - * @return true if the profile parameters indicate that this is using - * hprof, which generates profile files in a particular location - * that we can retrieve to the client. - */ - private boolean shouldDownloadProfile() { - // Check the argument string that was used to initialize profiling. - // If this indicates hprof and file-based output, then we're ok to - // download. - String profileParams = getProfileParams(); - - if (null == profileParams) { - return false; - } - - // Split this on whitespace. - String [] parts = profileParams.split("[ \\t]+"); - - // If any of these indicate hprof, and the use of output files, return true. - boolean hprofFound = false; - boolean fileFound = false; - for (String p : parts) { - if (p.startsWith("-agentlib:hprof") || p.startsWith("-Xrunhprof")) { - hprofFound = true; - - // This contains a number of comma-delimited components, one of which - // may specify the file to write to. Make sure this is present and - // not empty. - String [] subparts = p.split(","); - for (String sub : subparts) { - if (sub.startsWith("file=") && sub.length() != "file=".length()) { - fileFound = true; - } - } - } - } - - return hprofFound && fileFound; - } - private void printTaskEvents(TaskCompletionEvent[] events, Job.TaskStatusFilter filter, boolean profiling, IntegerRanges mapRanges, IntegerRanges reduceRanges) throws IOException, InterruptedException {