Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7541C10B55 for ; Wed, 18 Feb 2015 21:19:05 +0000 (UTC) Received: (qmail 67283 invoked by uid 500); 18 Feb 2015 21:19:00 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 66998 invoked by uid 500); 18 Feb 2015 21:19:00 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 66586 invoked by uid 99); 18 Feb 2015 21:19:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Feb 2015 21:19:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B5484E0777; Wed, 18 Feb 2015 21:18:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zjshen@apache.org To: common-commits@hadoop.apache.org Date: Wed, 18 Feb 2015 21:19:02 -0000 Message-Id: In-Reply-To: <36b5fde816bf44f28ecf7ef794296ab7@git.apache.org> References: <36b5fde816bf44f28ecf7ef794296ab7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/50] [abbrv] hadoop git commit: MAPREDUCE-6256. Removed unused private methods in o.a.h.mapreduce.Job.java. Contributed by Naganarasimha G R. MAPREDUCE-6256. Removed unused private methods in o.a.h.mapreduce.Job.java. Contributed by Naganarasimha G R. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3338f6d9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3338f6d9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3338f6d9 Branch: refs/heads/YARN-2928 Commit: 3338f6d90795dafd445891cbd2f4d46b53012382 Parents: ef950ea Author: Tsuyoshi Ozawa Authored: Sun Feb 15 10:09:42 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Sun Feb 15 10:09:42 2015 +0900 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 ++ .../java/org/apache/hadoop/mapreduce/Job.java | 47 -------------------- 2 files changed, 3 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3338f6d9/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 38982e4..bb9e105 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -291,6 +291,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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/3338f6d9/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java ---------------------------------------------------------------------- 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 493ca5f..470290c 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 {