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 2453E17731 for ; Tue, 15 Sep 2015 19:12:02 +0000 (UTC) Received: (qmail 25190 invoked by uid 500); 15 Sep 2015 19:11:48 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 25053 invoked by uid 500); 15 Sep 2015 19:11:48 -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 23176 invoked by uid 99); 15 Sep 2015 19:11:47 -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; Tue, 15 Sep 2015 19:11:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 25838DFFBF; Tue, 15 Sep 2015 19:11:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: eclark@apache.org To: common-commits@hadoop.apache.org Date: Tue, 15 Sep 2015 19:12:18 -0000 Message-Id: <4c6a2c9457bb45a8a370291d1308f096@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [33/50] [abbrv] hadoop git commit: HADOOP-12087. [JDK8] Fix javadoc errors caused by incorrect or illegal tags. (Akira AJISAKA via stevel). HADOOP-12087. [JDK8] Fix javadoc errors caused by incorrect or illegal tags. (Akira AJISAKA via stevel). Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/72699062 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/72699062 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/72699062 Branch: refs/heads/HADOOP-11890 Commit: 7269906254afe59ea464ed674d8218f82eeaec26 Parents: 0c7d3f4 Author: Steve Loughran Authored: Sun Sep 13 14:25:06 2015 +0100 Committer: Steve Loughran Committed: Sun Sep 13 14:25:26 2015 +0100 ---------------------------------------------------------------------- .../server/AuthenticationToken.java | 3 ++- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../hadoop/tools/util/ProducerConsumer.java | 19 ++++++++++--------- .../org/apache/hadoop/tools/util/WorkReport.java | 2 +- .../apache/hadoop/tools/util/WorkRequest.java | 2 +- .../yarn/api/records/ApplicationReport.java | 2 +- .../hadoop/yarn/server/api/ContainerType.java | 1 - .../yarn/nodelabels/CommonNodeLabelsManager.java | 2 +- .../yarn/server/api/records/NodeStatus.java | 2 +- .../scheduler/policy/OrderingPolicy.java | 2 +- 10 files changed, 21 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/72699062/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationToken.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationToken.java b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationToken.java index 6303c95..8295fe1 100644 --- a/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationToken.java +++ b/hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/security/authentication/server/AuthenticationToken.java @@ -62,7 +62,8 @@ public class AuthenticationToken extends AuthToken { /** * Sets the max inactive time of the token. * - * @param max inactive time of the token in milliseconds since the epoch. + * @param maxInactives inactive time of the token in milliseconds + * since the epoch. */ public void setMaxInactives(long maxInactives) { if (this != AuthenticationToken.ANONYMOUS) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/72699062/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index db671ae..a7ea0aa 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -1060,6 +1060,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12348. MetricsSystemImpl creates MetricsSourceAdapter with wrong time unit parameter. (zxu via rkanter) + HADOOP-12087. [JDK8] Fix javadoc errors caused by incorrect or illegal + tags. (Akira AJISAKA via stevel). + OPTIMIZATIONS HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString() http://git-wip-us.apache.org/repos/asf/hadoop/blob/72699062/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/ProducerConsumer.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/ProducerConsumer.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/ProducerConsumer.java index 3dad4e3..bf72bb8 100644 --- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/ProducerConsumer.java +++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/ProducerConsumer.java @@ -32,9 +32,10 @@ import java.util.concurrent.LinkedBlockingQueue; /** * ProducerConsumer class encapsulates input and output queues and a - * thread-pool of Workers that loop on WorkRequest inputQueue and for each - * consumed WorkRequest Workers invoke WorkRequestProcessor.processItem() - * and output resulting WorkReport to the outputQueue. + * thread-pool of Workers that loop on WorkRequest{@literal } inputQueue + * and for each consumed WorkRequest Workers invoke + * WorkRequestProcessor.processItem() and output resulting + * WorkReport{@literal } to the outputQueue. */ public class ProducerConsumer { private Log LOG = LogFactory.getLog(ProducerConsumer.class); @@ -57,9 +58,9 @@ public class ProducerConsumer { } /** - * Add another worker that will consume WorkRequest items from input - * queue, process each item using supplied processor, and for every - * processed item output WorkReport to output queue. + * Add another worker that will consume WorkRequest{@literal } items + * from input queue, process each item using supplied processor, and for + * every processed item output WorkReport{@literal } to output queue. * * @param processor Processor implementing WorkRequestProcessor interface. * @@ -102,7 +103,7 @@ public class ProducerConsumer { /** * Blocking put workRequest to ProducerConsumer input queue. * - * @param WorkRequest item to be processed. + * @param workRequest item to be processed. */ public void put(WorkRequest workRequest) { boolean isDone = false; @@ -120,7 +121,7 @@ public class ProducerConsumer { /** * Blocking take from ProducerConsumer output queue that can be interrupted. * - * @return WorkReport item returned by processor's processItem(). + * @return item returned by processor's processItem(). */ public WorkReport take() throws InterruptedException { WorkReport report = outputQueue.take(); @@ -132,7 +133,7 @@ public class ProducerConsumer { * Blocking take from ProducerConsumer output queue (catches exceptions and * retries forever). * - * @return WorkReport item returned by processor's processItem(). + * @return item returned by processor's processItem(). */ public WorkReport blockingTake() { while (true) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/72699062/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/WorkReport.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/WorkReport.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/WorkReport.java index 91c9805..43ce212 100644 --- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/WorkReport.java +++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/WorkReport.java @@ -19,7 +19,7 @@ package org.apache.hadoop.tools.util; /** - * WorkReport is a simple container for items of class T and its + * WorkReport{@literal } is a simple container for items of class T and its * corresponding retry counter that indicates how many times this item * was previously attempted to be processed. */ http://git-wip-us.apache.org/repos/asf/hadoop/blob/72699062/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/WorkRequest.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/WorkRequest.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/WorkRequest.java index 339a3ab..597dd8a 100644 --- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/WorkRequest.java +++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/util/WorkRequest.java @@ -19,7 +19,7 @@ package org.apache.hadoop.tools.util; /** - * WorkRequest is a simple container for items of class T and its + * WorkRequest{@literal } is a simple container for items of class T and its * corresponding retry counter that indicates how many times this item * was previously attempted to be processed. */ http://git-wip-us.apache.org/repos/asf/hadoop/blob/72699062/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationReport.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationReport.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationReport.java index fa3b1e5..5de7858 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationReport.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationReport.java @@ -404,7 +404,7 @@ public abstract class ApplicationReport { public abstract boolean isUnmanagedApp(); /** - * @param value true if RM should not manage the AM + * @param unmanagedApplication true if RM should not manage the AM */ @Public @Unstable http://git-wip-us.apache.org/repos/asf/hadoop/blob/72699062/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/server/api/ContainerType.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/server/api/ContainerType.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/server/api/ContainerType.java index ffae811..df8a4c2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/server/api/ContainerType.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/server/api/ContainerType.java @@ -27,7 +27,6 @@ package org.apache.hadoop.yarn.server.api; *
  • {@link #APPLICATION_MASTER} *
  • {@link #TASK} * - *

    */ public enum ContainerType { APPLICATION_MASTER, TASK http://git-wip-us.apache.org/repos/asf/hadoop/blob/72699062/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java index 8cc3770..deec6ab 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/nodelabels/CommonNodeLabelsManager.java @@ -827,7 +827,7 @@ public class CommonNodeLabelsManager extends AbstractService { /** * Get mapping of labels info to nodes for specified set of labels. * - * @param nodelabels + * @param labels * set of nodelabels for which labels to nodes mapping will be * returned. * @return labels to nodes map http://git-wip-us.apache.org/repos/asf/hadoop/blob/72699062/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/NodeStatus.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/NodeStatus.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/NodeStatus.java index 24391bf..7b8262f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/NodeStatus.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/api/records/NodeStatus.java @@ -46,7 +46,7 @@ public abstract class NodeStatus { * @param containerStatuses Status of the containers running in this node. * @param keepAliveApplications Applications to keep alive. * @param nodeHealthStatus Health status of the node. - * @param containersUtilizations Utilization of the containers in this node. + * @param containersUtilization Utilization of the containers in this node. * @param nodeUtilization Utilization of the node. * @return New {@code NodeStatus} with the provided information. */ http://git-wip-us.apache.org/repos/asf/hadoop/blob/72699062/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/OrderingPolicy.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/OrderingPolicy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/OrderingPolicy.java index e3f67ce..1616bb1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/OrderingPolicy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/policy/OrderingPolicy.java @@ -107,7 +107,7 @@ public interface OrderingPolicy { void demandUpdated(S schedulableEntity); /** - * Display information regarding configuration & status + * Display information regarding configuration and status */ public String getInfo();