From e901de5a25fbb513399a3bfa3eeabd34f81a35bd Mon Sep 17 00:00:00 2001 From: Ayush Saxena Date: Tue, 17 May 2022 15:27:16 +0530 Subject: [PATCH 1/6] Move to JAVA 11. --- dev-support/docker/Dockerfile | 2 +- dev-support/docker/Dockerfile_aarch64 | 2 +- dev-support/docker/Dockerfile_centos_7 | 2 +- dev-support/docker/Dockerfile_centos_8 | 2 +- dev-support/docker/pkg-resolver/packages.json | 2 -- dev-support/jenkins.sh | 4 +--- hadoop-common-project/hadoop-annotations/pom.xml | 15 --------------- hadoop-project/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 7 insertions(+), 26 deletions(-) diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index fac364bbd4363..820893f6e412b 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -58,7 +58,7 @@ ENV PYTHONIOENCODING=utf-8 ###### ENV MAVEN_HOME /usr # JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003) -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 +ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64 ####### # Set env vars for SpotBugs 4.2.2 diff --git a/dev-support/docker/Dockerfile_aarch64 b/dev-support/docker/Dockerfile_aarch64 index dd0348961f464..bb5a3809eeb99 100644 --- a/dev-support/docker/Dockerfile_aarch64 +++ b/dev-support/docker/Dockerfile_aarch64 @@ -58,7 +58,7 @@ ENV PYTHONIOENCODING=utf-8 ###### ENV MAVEN_HOME /usr # JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003) -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-arm64 +ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-arm64 ####### # Set env vars for SpotBugs 4.2.2 diff --git a/dev-support/docker/Dockerfile_centos_7 b/dev-support/docker/Dockerfile_centos_7 index ccb445be269fe..ae984e137d081 100644 --- a/dev-support/docker/Dockerfile_centos_7 +++ b/dev-support/docker/Dockerfile_centos_7 @@ -68,7 +68,7 @@ ENV INFOPATH "${GCC_HOME}/root/usr/share/info" ENV MAVEN_HOME /opt/maven ENV PATH "${PATH}:${MAVEN_HOME}/bin" # JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003) -ENV JAVA_HOME /usr/lib/jvm/java-1.8.0 +ENV JAVA_HOME /usr/lib/jvm/java-1.11.0 ####### # Set env vars for SpotBugs diff --git a/dev-support/docker/Dockerfile_centos_8 b/dev-support/docker/Dockerfile_centos_8 index 8f3b008f7ba03..1490e9a56e816 100644 --- a/dev-support/docker/Dockerfile_centos_8 +++ b/dev-support/docker/Dockerfile_centos_8 @@ -93,7 +93,7 @@ ENV INFOPATH "${GCC_HOME}/root/usr/share/info" ENV MAVEN_HOME /opt/maven ENV PATH "${PATH}:${MAVEN_HOME}/bin" # JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003) -ENV JAVA_HOME /usr/lib/jvm/java-1.8.0 +ENV JAVA_HOME /usr/lib/jvm/java-1.11.0 ####### # Set env vars for SpotBugs diff --git a/dev-support/docker/pkg-resolver/packages.json b/dev-support/docker/pkg-resolver/packages.json index afe8a7a32b107..11e7a2981ed75 100644 --- a/dev-support/docker/pkg-resolver/packages.json +++ b/dev-support/docker/pkg-resolver/packages.json @@ -261,11 +261,9 @@ "java": { "debian:10": "openjdk-11-jdk", "ubuntu:focal": [ - "openjdk-8-jdk", "openjdk-11-jdk" ], "ubuntu:focal::arch64": [ - "openjdk-8-jdk", "openjdk-11-jdk" ] }, diff --git a/dev-support/jenkins.sh b/dev-support/jenkins.sh index 1bb080d19cabc..cdfb340c5fb38 100644 --- a/dev-support/jenkins.sh +++ b/dev-support/jenkins.sh @@ -188,9 +188,7 @@ function run_ci() { YETUS_ARGS+=("--sentinel") # test with Java 8 and 11 - YETUS_ARGS+=("--java-home=/usr/lib/jvm/java-8-openjdk-amd64") - YETUS_ARGS+=("--multijdkdirs=/usr/lib/jvm/java-11-openjdk-amd64") - YETUS_ARGS+=("--multijdktests=compile") + YETUS_ARGS+=("--java-home=/usr/lib/jvm/java-11-openjdk-amd64") # custom javadoc goals YETUS_ARGS+=("--mvn-javadoc-goals=process-sources,javadoc:javadoc-no-fork") diff --git a/hadoop-common-project/hadoop-annotations/pom.xml b/hadoop-common-project/hadoop-annotations/pom.xml index a262d55b0426c..8aac3a2ed4d0f 100644 --- a/hadoop-common-project/hadoop-annotations/pom.xml +++ b/hadoop-common-project/hadoop-annotations/pom.xml @@ -38,21 +38,6 @@ - - jdk1.8 - - 1.8 - - - - jdk.tools - jdk.tools - 1.8 - system - ${java.home}/../lib/tools.jar - - - jdk10 diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 85df7ca7df408..2738604eeeeb4 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -154,7 +154,7 @@ 1.5.0.Final - 1.8 + 1.11 false diff --git a/pom.xml b/pom.xml index 1f6aa885666c4..c11cd015a1be9 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x [3.0.2,) - [1.8,) + [1.11,) From 49182d946b7c0ee7935fc7176a2ba49e9d56a6c2 Mon Sep 17 00:00:00 2001 From: Ayush Saxena Date: Tue, 17 May 2022 20:40:29 +0530 Subject: [PATCH 2/6] Fix Java. --- dev-support/docker/Dockerfile_aarch64 | 1 - dev-support/docker/Dockerfile_centos_7 | 5 ++++- dev-support/docker/Dockerfile_centos_8 | 5 ++++- dev-support/jenkins.sh | 2 +- hadoop-project/pom.xml | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dev-support/docker/Dockerfile_aarch64 b/dev-support/docker/Dockerfile_aarch64 index bb5a3809eeb99..4268370e4b963 100644 --- a/dev-support/docker/Dockerfile_aarch64 +++ b/dev-support/docker/Dockerfile_aarch64 @@ -69,7 +69,6 @@ ENV SPOTBUGS_HOME /opt/spotbugs # Set env vars for Google Protobuf 3.7.1 ####### ENV PROTOBUF_HOME /opt/protobuf -ENV PATH "${PATH}:/opt/protobuf/bin" ### # Avoid out of memory errors in builds diff --git a/dev-support/docker/Dockerfile_centos_7 b/dev-support/docker/Dockerfile_centos_7 index ae984e137d081..fb150a821ad83 100644 --- a/dev-support/docker/Dockerfile_centos_7 +++ b/dev-support/docker/Dockerfile_centos_7 @@ -62,13 +62,16 @@ ENV INFOPATH "${GCC_HOME}/root/usr/share/info" # TODO: Set locale +#Install java 11 +RUN yum install -y java-11-openjdk-devel + ###### # Set env vars required to build Hadoop ###### ENV MAVEN_HOME /opt/maven ENV PATH "${PATH}:${MAVEN_HOME}/bin" # JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003) -ENV JAVA_HOME /usr/lib/jvm/java-1.11.0 +ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk/ ####### # Set env vars for SpotBugs diff --git a/dev-support/docker/Dockerfile_centos_8 b/dev-support/docker/Dockerfile_centos_8 index 1490e9a56e816..b285e49fbf968 100644 --- a/dev-support/docker/Dockerfile_centos_8 +++ b/dev-support/docker/Dockerfile_centos_8 @@ -87,13 +87,16 @@ ENV INFOPATH "${GCC_HOME}/root/usr/share/info" # TODO: Set locale +#Install java 11 +RUN yum install -y java-11-openjdk-devel + ###### # Set env vars required to build Hadoop ###### ENV MAVEN_HOME /opt/maven ENV PATH "${PATH}:${MAVEN_HOME}/bin" # JAVA_HOME must be set in Maven >= 3.5.0 (MNG-6003) -ENV JAVA_HOME /usr/lib/jvm/java-1.11.0 +ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk/ ####### # Set env vars for SpotBugs diff --git a/dev-support/jenkins.sh b/dev-support/jenkins.sh index cdfb340c5fb38..713ce333844b0 100644 --- a/dev-support/jenkins.sh +++ b/dev-support/jenkins.sh @@ -187,7 +187,7 @@ function run_ci() { # help keep the ASF boxes clean YETUS_ARGS+=("--sentinel") - # test with Java 8 and 11 + # test with Java 11 YETUS_ARGS+=("--java-home=/usr/lib/jvm/java-11-openjdk-amd64") # custom javadoc goals diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 2738604eeeeb4..42eeaeaadbe9b 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -154,7 +154,7 @@ 1.5.0.Final - 1.11 + 11 false From e1a02f793bf0f80dfc86d2b4d228165ff1329791 Mon Sep 17 00:00:00 2001 From: Ayush Saxena Date: Tue, 17 May 2022 23:01:26 +0530 Subject: [PATCH 3/6] fix centos-8. --- dev-support/docker/Dockerfile_centos_8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-support/docker/Dockerfile_centos_8 b/dev-support/docker/Dockerfile_centos_8 index b285e49fbf968..4f638493767d7 100644 --- a/dev-support/docker/Dockerfile_centos_8 +++ b/dev-support/docker/Dockerfile_centos_8 @@ -88,7 +88,7 @@ ENV INFOPATH "${GCC_HOME}/root/usr/share/info" # TODO: Set locale #Install java 11 -RUN yum install -y java-11-openjdk-devel +RUN yum -y install java-11-openjdk java-11-openjdk-devel ###### # Set env vars required to build Hadoop From 099ce1f3851ce78580b3d489b531604296864ad9 Mon Sep 17 00:00:00 2001 From: Ayush Saxena Date: Wed, 18 May 2022 18:42:55 +0530 Subject: [PATCH 4/6] Javadoc Fix. --- dev-support/Jenkinsfile | 2 +- .../org/apache/hadoop/conf/Configuration.java | 38 +++++----- .../apache/hadoop/fs/AbstractFileSystem.java | 2 +- .../apache/hadoop/fs/ChecksumFileSystem.java | 2 +- .../java/org/apache/hadoop/fs/ChecksumFs.java | 2 +- .../org/apache/hadoop/fs/RemoteIterator.java | 4 +- .../org/apache/hadoop/io/EnumSetWritable.java | 18 ++--- .../org/apache/hadoop/io/ObjectWritable.java | 4 +- .../org/apache/hadoop/io/SequenceFile.java | 2 +- .../io/compress/bzip2/CBZip2InputStream.java | 8 +-- .../io/compress/zlib/BuiltInZlibDeflater.java | 2 +- .../apache/hadoop/io/file/tfile/Chunk.java | 4 +- .../apache/hadoop/ipc/RpcClientException.java | 2 +- .../org/apache/hadoop/ipc/RpcException.java | 2 +- .../apache/hadoop/ipc/RpcServerException.java | 2 +- .../hadoop/ipc/UnexpectedServerException.java | 2 +- .../java/org/apache/hadoop/net/NetUtils.java | 6 +- .../security/AccessControlException.java | 6 +- .../authorize/AuthorizationException.java | 6 +- .../hadoop/util/InstrumentedReadLock.java | 2 +- .../util/InstrumentedReadWriteLock.java | 2 +- .../hadoop/util/InstrumentedWriteLock.java | 2 +- .../org/apache/hadoop/util/StringUtils.java | 2 +- .../apache/hadoop/ipc/MiniRPCBenchmark.java | 12 ++-- .../client/impl/BlockReaderLocalLegacy.java | 2 +- .../blockmanagement/DatanodeDescriptor.java | 2 +- .../namenode/EncryptionZoneManager.java | 2 +- .../hadoop/hdfs/server/namenode/NameNode.java | 2 +- .../server/namenode/snapshot/DiffList.java | 2 +- .../FileDistributionCalculator.java | 18 ++--- .../FileDistributionVisitor.java | 16 ++--- .../org/apache/hadoop/hdfs/TestSafeMode.java | 2 +- .../datanode/TestReadOnlySharedStorage.java | 6 +- .../app/rm/preemption/AMPreemptionPolicy.java | 2 +- .../hadoop/mapred/FileOutputFormat.java | 16 ++--- .../org/apache/hadoop/mapred/JobConf.java | 4 +- .../org/apache/hadoop/mapred/MapRunnable.java | 2 +- .../apache/hadoop/mapred/jobcontrol/Job.java | 2 +- .../mapred/join/CompositeInputFormat.java | 12 ++-- .../mapred/join/CompositeRecordReader.java | 4 +- .../mapred/join/OverrideRecordReader.java | 2 +- .../org/apache/hadoop/mapred/join/Parser.java | 2 +- .../mapred/lib/TotalOrderPartitioner.java | 2 +- .../lib/jobcontrol/ControlledJob.java | 2 +- .../lib/join/CompositeInputFormat.java | 12 ++-- .../lib/join/CompositeRecordReader.java | 4 +- .../lib/join/OverrideRecordReader.java | 2 +- .../hadoop/mapreduce/lib/join/Parser.java | 2 +- .../mapreduce/lib/join/TupleWritable.java | 2 +- .../lib/output/FileOutputFormat.java | 8 +-- .../lib/partition/TotalOrderPartitioner.java | 10 +-- .../apache/hadoop/fs/AccumulatingReducer.java | 8 +-- .../org/apache/hadoop/fs/IOMapperBase.java | 4 +- .../org/apache/hadoop/fs/JHLogAnalyzer.java | 42 +++++------ .../apache/hadoop/examples/pi/package.html | 70 ++++++++++--------- hadoop-project/pom.xml | 9 --- hadoop-tools/hadoop-aws/pom.xml | 1 - .../hadoop/mapred/gridmix/FilePool.java | 2 +- .../fs/swift/util/HttpResponseUtils.java | 16 ++--- .../streaming/io/IdentifierResolver.java | 2 +- .../org/apache/hadoop/streaming/package.html | 2 +- .../org/apache/hadoop/typedbytes/package.html | 6 +- .../pom.xml | 28 -------- .../timelineservice/ServiceMetricsSink.java | 2 +- .../yarn/security/AdminACLsManager.java | 4 +- .../hadoop/yarn/util/BoundedAppender.java | 2 +- .../yarn/server/utils/LeveldbIterator.java | 2 +- 67 files changed, 223 insertions(+), 253 deletions(-) diff --git a/dev-support/Jenkinsfile b/dev-support/Jenkinsfile index 0ec32e385d275..3f6331b412ec5 100644 --- a/dev-support/Jenkinsfile +++ b/dev-support/Jenkinsfile @@ -47,7 +47,7 @@ pipeline { options { buildDiscarder(logRotator(numToKeepStr: '5')) - timeout (time: 24, unit: 'HOURS') + timeout (time: 48, unit: 'HOURS') timestamps() checkoutToSubdirectory('src') } diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java index 5f720841d7689..6c9a8fa6ca004 100755 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java @@ -127,10 +127,10 @@ * *

Unless explicitly turned off, Hadoop by default specifies two * resources, loaded in-order from the classpath:

    - *
  1. + *
  2. * - * core-default.xml: Read-only defaults for hadoop.
    3. - *
  3. core-site.xml: Site-specific configuration for a given hadoop + * core-default.xml: Read-only defaults for hadoop.
    4. + *
  4. core-site.xml: Site-specific configuration for a given hadoop * installation.
    5. *
* Applications may add additional resources, which are loaded @@ -150,7 +150,7 @@ * </property> * * Administrators typically define parameters as final in - * core-site.xml for values that user applications may not alter. + * core-site.xml for values that user applications may not alter. * *

Variable Expansion

* @@ -182,19 +182,19 @@ * </property> * * - *

When conf.get("tempdir") is called, then ${basedir} + *

When conf.get("tempdir") is called, then ${basedir} * will be resolved to another property in this Configuration, while - * ${user.name} would then ordinarily be resolved to the value + * ${user.name} would then ordinarily be resolved to the value * of the System property with that name. - *

When conf.get("otherdir") is called, then ${env.BASE_DIR} - * will be resolved to the value of the ${BASE_DIR} environment variable. - * It supports ${env.NAME:-default} and ${env.NAME-default} notations. - * The former is resolved to "default" if ${NAME} environment variable is undefined + *

When conf.get("otherdir") is called, then ${env.BASE_DIR} + * will be resolved to the value of the ${BASE_DIR} environment variable. + * It supports ${env.NAME:-default} and ${env.NAME-default} notations. + * The former is resolved to "default" if ${NAME} environment variable is undefined * or its value is empty. - * The latter behaves the same way only if ${NAME} is undefined. + * The latter behaves the same way only if ${NAME} is undefined. *

By default, warnings will be given to any deprecated configuration * parameters and these are suppressible by configuring - * log4j.logger.org.apache.hadoop.conf.Configuration.deprecation in + * log4j.logger.org.apache.hadoop.conf.Configuration.deprecation in * log4j.properties file. * *

Tags

@@ -217,9 +217,9 @@ * <tag>HDFS,SECURITY</tag> * </property> * - *

Properties marked with tags can be retrieved with conf - * .getAllPropertiesByTag("HDFS") or conf.getAllPropertiesByTags - * (Arrays.asList("YARN","SECURITY")).

+ *

Properties marked with tags can be retrieved with conf + * .getAllPropertiesByTag("HDFS") or conf.getAllPropertiesByTags + * (Arrays.asList("YARN","SECURITY")).

*/ @InterfaceAudience.Public @InterfaceStability.Stable @@ -573,7 +573,7 @@ public static void addDeprecations(DeprecationDelta[] deltas) { * It does not override any existing entries in the deprecation map. * This is to be used only by the developers in order to add deprecation of * keys, and attempts to call this method after loading resources once, - * would lead to UnsupportedOperationException + * would lead to UnsupportedOperationException * * If a key is deprecated in favor of multiple keys, they are all treated as * aliases of each other, and setting any one of them resets all the others @@ -601,7 +601,7 @@ public static void addDeprecation(String key, String[] newKeys, * It does not override any existing entries in the deprecation map. * This is to be used only by the developers in order to add deprecation of * keys, and attempts to call this method after loading resources once, - * would lead to UnsupportedOperationException + * would lead to UnsupportedOperationException * * If you have multiple deprecation entries to add, it is more efficient to * use #addDeprecations(DeprecationDelta[] deltas) instead. @@ -621,7 +621,7 @@ public static void addDeprecation(String key, String newKey, * It does not override any existing entries in the deprecation map. * This is to be used only by the developers in order to add deprecation of * keys, and attempts to call this method after loading resources once, - * would lead to UnsupportedOperationException + * would lead to UnsupportedOperationException * * If a key is deprecated in favor of multiple keys, they are all treated as * aliases of each other, and setting any one of them resets all the others @@ -645,7 +645,7 @@ public static void addDeprecation(String key, String[] newKeys) { * It does not override any existing entries in the deprecation map. * This is to be used only by the developers in order to add deprecation of * keys, and attempts to call this method after loading resources once, - * would lead to UnsupportedOperationException + * would lead to UnsupportedOperationException * * If you have multiple deprecation entries to add, it is more efficient to * use #addDeprecations(DeprecationDelta[] deltas) instead. diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java index a4737c548c8fa..2d1f7e5ee9d8f 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java @@ -247,7 +247,7 @@ protected static synchronized Map getAllStatistics() { * The main factory method for creating a file system. Get a file system for * the URI's scheme and authority. The scheme of the uri * determines a configuration property name, - * fs.AbstractFileSystem.scheme.impl whose value names the + * fs.AbstractFileSystem.scheme.impl whose value names the * AbstractFileSystem class. * * The entire URI and conf is passed to the AbstractFileSystem factory method. diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java index 0efcdc8022f7b..14c6b5dc1fe25 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java @@ -686,7 +686,7 @@ boolean apply(Path p) throws IOException { /** * Set replication for an existing file. - * Implement the abstract setReplication of FileSystem + * Implement the abstract setReplication of FileSystem * @param src file name * @param replication new replication * @throws IOException if an I/O error occurs. diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFs.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFs.java index 4820c5c3045d7..5f3e5d9b8efa9 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFs.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFs.java @@ -453,7 +453,7 @@ private boolean isDirectory(Path f) } /** * Set replication for an existing file. - * Implement the abstract setReplication of FileSystem + * Implement the abstract setReplication of FileSystem * @param src file name * @param replication new replication * @throws IOException if an I/O error occurs. diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RemoteIterator.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RemoteIterator.java index 9238c3f6fb993..06b7728ae3e9d 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RemoteIterator.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RemoteIterator.java @@ -24,9 +24,9 @@ */ public interface RemoteIterator { /** - * Returns true if the iteration has more elements. + * Returns true if the iteration has more elements. * - * @return true if the iterator has more elements. + * @return true if the iterator has more elements. * @throws IOException if any IO error occurs */ boolean hasNext() throws IOException; diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/EnumSetWritable.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/EnumSetWritable.java index 4b1dc7513d054..f2c8b76e2ab70 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/EnumSetWritable.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/EnumSetWritable.java @@ -59,10 +59,10 @@ public boolean add(E e) { } /** - * Construct a new EnumSetWritable. If the value argument is null or - * its size is zero, the elementType argument must not be null. If - * the argument value's size is bigger than zero, the argument - * elementType is not be used. + * Construct a new EnumSetWritable. If the value argument is null or + * its size is zero, the elementType argument must not be null. If + * the argument value's size is bigger than zero, the argument + * elementType is not be used. * * @param value enumSet value. * @param elementType elementType. @@ -72,7 +72,7 @@ public EnumSetWritable(EnumSet value, Class elementType) { } /** - * Construct a new EnumSetWritable. Argument value should not be null + * Construct a new EnumSetWritable. Argument value should not be null * or empty. * * @param value enumSet value. @@ -83,10 +83,10 @@ public EnumSetWritable(EnumSet value) { /** * reset the EnumSetWritable with specified - * value and elementType. If the value argument - * is null or its size is zero, the elementType argument must not be - * null. If the argument value's size is bigger than zero, the - * argument elementType is not be used. + * value and elementType. If the value argument + * is null or its size is zero, the elementType argument must not be + * null. If the argument value's size is bigger than zero, the + * argument elementType is not be used. * * @param value enumSet Value. * @param elementType elementType. diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ObjectWritable.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ObjectWritable.java index 29c06a01ad6e3..831931bdace66 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ObjectWritable.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ObjectWritable.java @@ -401,8 +401,8 @@ static Method getStaticProtobufMethod(Class declaredClass, String method, } /** - * Find and load the class with given name className by first finding - * it in the specified conf. If the specified conf is null, + * Find and load the class with given name className by first finding + * it in the specified conf. If the specified conf is null, * try load it directly. * * @param conf configuration. diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java index a0b45814f1c77..762c2dac08bd8 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java @@ -91,7 +91,7 @@ *

The actual compression algorithm used to compress key and/or values can be * specified by using the appropriate {@link CompressionCodec}.

* - *

The recommended way is to use the static createWriter methods + *

The recommended way is to use the static createWriter methods * provided by the SequenceFile to chose the preferred format.

* *

The {@link SequenceFile.Reader} acts as the bridge and can read any of the diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/CBZip2InputStream.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/CBZip2InputStream.java index 187fe481588c8..f7a71a9bdec21 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/CBZip2InputStream.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/CBZip2InputStream.java @@ -37,13 +37,13 @@ *

* The decompression requires large amounts of memory. Thus you should call the * {@link #close() close()} method as soon as possible, to force - * CBZip2InputStream to release the allocated memory. See + * CBZip2InputStream to release the allocated memory. See * {@link CBZip2OutputStream CBZip2OutputStream} for information about memory * usage. *

* *

- * CBZip2InputStream reads bytes from the compressed source stream via + * CBZip2InputStream reads bytes from the compressed source stream via * the single byte {@link java.io.InputStream#read() read()} method exclusively. * Thus you should consider to use a buffered source stream. *

@@ -278,7 +278,7 @@ private void makeMaps() { * specified stream. * *

- * Although BZip2 headers are marked with the magic "Bz" this + * Although BZip2 headers are marked with the magic "Bz" this * constructor expects the next byte in the stream to be the first one after * the magic. Thus callers have to skip the first two bytes. Otherwise this * constructor will throw an exception. @@ -288,7 +288,7 @@ private void makeMaps() { * @throws IOException * if the stream content is malformed or an I/O error occurs. * @throws NullPointerException - * if in == null + * if in == null */ public CBZip2InputStream(final InputStream in, READ_MODE readMode) throws IOException { diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/BuiltInZlibDeflater.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/BuiltInZlibDeflater.java index 739788fa5f5ec..e98980f0f26aa 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/BuiltInZlibDeflater.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/BuiltInZlibDeflater.java @@ -57,7 +57,7 @@ public synchronized int compress(byte[] b, int off, int len) /** * reinit the compressor with the given configuration. It will reset the * compressor's compression level and compression strategy. Different from - * ZlibCompressor, BuiltInZlibDeflater only support three + * ZlibCompressor, BuiltInZlibDeflater only support three * kind of compression strategy: FILTERED, HUFFMAN_ONLY and DEFAULT_STRATEGY. * It will use DEFAULT_STRATEGY as default if the configured compression * strategy is not supported. diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Chunk.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Chunk.java index 05e3d48a469a2..ec508c020468a 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Chunk.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/Chunk.java @@ -219,8 +219,8 @@ static public class ChunkEncoder extends OutputStream { /** * The number of valid bytes in the buffer. This value is always in the - * range 0 through buf.length; elements buf[0] - * through buf[count-1] contain valid byte data. + * range 0 through buf.length; elements buf[0] + * through buf[count-1] contain valid byte data. */ private int count; diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcClientException.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcClientException.java index 7f8d9707f9cd7..107899a9c0d4b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcClientException.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcClientException.java @@ -38,7 +38,7 @@ public class RpcClientException extends RpcException { * @param message message. * @param cause that cause this exception * @param cause the cause (can be retried by the {@link #getCause()} method). - * (A null value is permitted, and indicates that the cause + * (A null value is permitted, and indicates that the cause * is nonexistent or unknown.) */ RpcClientException(final String message, final Throwable cause) { diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcException.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcException.java index 8141333d717a8..ac687050d7cb1 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcException.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcException.java @@ -40,7 +40,7 @@ public class RpcException extends IOException { * @param message message. * @param cause that cause this exception * @param cause the cause (can be retried by the {@link #getCause()} method). - * (A null value is permitted, and indicates that the cause + * (A null value is permitted, and indicates that the cause * is nonexistent or unknown.) */ RpcException(final String message, final Throwable cause) { diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcServerException.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcServerException.java index ce4aac54b6cd2..31f62d4f06fe0 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcServerException.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RpcServerException.java @@ -39,7 +39,7 @@ public RpcServerException(final String message) { * * @param message message. * @param cause the cause (can be retried by the {@link #getCause()} method). - * (A null value is permitted, and indicates that the cause + * (A null value is permitted, and indicates that the cause * is nonexistent or unknown.) */ public RpcServerException(final String message, final Throwable cause) { diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/UnexpectedServerException.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/UnexpectedServerException.java index f00948d5d5065..c683010a88029 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/UnexpectedServerException.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/UnexpectedServerException.java @@ -39,7 +39,7 @@ public class UnexpectedServerException extends RpcException { * @param message message. * @param cause that cause this exception * @param cause the cause (can be retried by the {@link #getCause()} method). - * (A null value is permitted, and indicates that the cause + * (A null value is permitted, and indicates that the cause * is nonexistent or unknown.) */ UnexpectedServerException(final String message, final Throwable cause) { diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java index c49706d66f27d..9320678439064 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java @@ -83,9 +83,9 @@ public class NetUtils { /** * Get the socket factory for the given class according to its * configuration parameter - * hadoop.rpc.socket.factory.class.<ClassName>. When no + * hadoop.rpc.socket.factory.class.<ClassName>. When no * such parameter exists then fall back on the default socket factory as - * configured by hadoop.rpc.socket.factory.class.default. If + * configured by hadoop.rpc.socket.factory.class.default. If * this default socket factory is not configured, then fall back on the JVM * default socket factory. * @@ -111,7 +111,7 @@ public static SocketFactory getSocketFactory(Configuration conf, /** * Get the default socket factory as specified by the configuration - * parameter hadoop.rpc.socket.factory.default + * parameter hadoop.rpc.socket.factory.default * * @param conf the configuration * @return the default socket factory as specified in the configuration or diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java index d0a3620d6d4b2..1ed121f9616da 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/AccessControlException.java @@ -48,10 +48,10 @@ public AccessControlException() { /** * Constructs a new exception with the specified cause and a detail - * message of (cause==null ? null : cause.toString()) (which - * typically contains the class and detail message of cause). + * message of (cause==null ? null : cause.toString()) (which + * typically contains the class and detail message of cause). * @param cause the cause (which is saved for later retrieval by the - * {@link #getCause()} method). (A null value is + * {@link #getCause()} method). (A null value is * permitted, and indicates that the cause is nonexistent or * unknown.) */ diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AuthorizationException.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AuthorizationException.java index 79c7d1814da28..e9c3323bb5b12 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AuthorizationException.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/authorize/AuthorizationException.java @@ -44,10 +44,10 @@ public AuthorizationException(String message) { /** * Constructs a new exception with the specified cause and a detail - * message of (cause==null ? null : cause.toString()) (which - * typically contains the class and detail message of cause). + * message of (cause==null ? null : cause.toString()) (which + * typically contains the class and detail message of cause). * @param cause the cause (which is saved for later retrieval by the - * {@link #getCause()} method). (A null value is + * {@link #getCause()} method). (A null value is * permitted, and indicates that the cause is nonexistent or * unknown.) */ diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedReadLock.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedReadLock.java index 18f6ccfdb176b..85ad7d9a45e71 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedReadLock.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedReadLock.java @@ -26,7 +26,7 @@ import org.slf4j.Logger; /** - * This is a wrap class of a ReadLock. + * This is a wrap class of a ReadLock. * It extends the class {@link InstrumentedLock}, and can be used to track * whether a specific read lock is being held for too long and log * warnings if so. diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedReadWriteLock.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedReadWriteLock.java index 758f1ff87cff7..caceb31cfb552 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedReadWriteLock.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedReadWriteLock.java @@ -28,7 +28,7 @@ /** * This is a wrap class of a {@link ReentrantReadWriteLock}. * It implements the interface {@link ReadWriteLock}, and can be used to - * create instrumented ReadLock and WriteLock. + * create instrumented ReadLock and WriteLock. */ @InterfaceAudience.Private @InterfaceStability.Unstable diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedWriteLock.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedWriteLock.java index 667b1ca6a4b60..0f99504161109 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedWriteLock.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/InstrumentedWriteLock.java @@ -26,7 +26,7 @@ import org.slf4j.Logger; /** - * This is a wrap class of a WriteLock. + * This is a wrap class of a WriteLock. * It extends the class {@link InstrumentedLock}, and can be used to track * whether a specific write lock is being held for too long and log * warnings if so. diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java index b620ba73222ad..d76e36a30d021 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java @@ -231,7 +231,7 @@ public static String uriToString(URI[] uris){ /** * @param str * The string array to be parsed into an URI array. - * @return null if str is null, else the URI array + * @return null if str is null, else the URI array * equivalent to str. * @throws IllegalArgumentException * If any string in str violates RFC 2396. diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/MiniRPCBenchmark.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/MiniRPCBenchmark.java index 2290270bfba1a..f04d978db8728 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/MiniRPCBenchmark.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/MiniRPCBenchmark.java @@ -54,18 +54,18 @@ * The benchmark supports three authentication methods: *

    *
  1. simple - no authentication. In order to enter this mode - * the configuration file core-site.xml should specify - * hadoop.security.authentication = simple. + * the configuration file core-site.xml should specify + * hadoop.security.authentication = simple. * This is the default mode.
    2. *
  2. kerberos - kerberos authentication. In order to enter this mode - * the configuration file core-site.xml should specify - * hadoop.security.authentication = kerberos and + * the configuration file core-site.xml should specify + * hadoop.security.authentication = kerberos and * the argument string should provide qualifying - * keytabFile and userName parameters. + * keytabFile and userName parameters. *
  3. delegation token - authentication using delegation token. * In order to enter this mode the benchmark should provide all the * mentioned parameters for kerberos authentication plus the - * useToken argument option. + * useToken argument option. *
* Input arguments: *
    diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/BlockReaderLocalLegacy.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/BlockReaderLocalLegacy.java index e48ace6c22754..18b220b7a584a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/BlockReaderLocalLegacy.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/client/impl/BlockReaderLocalLegacy.java @@ -503,7 +503,7 @@ public synchronized int read(ByteBuffer buf) throws IOException { * byte buffer to write bytes to. If checksums are not required, buf * can have any number of bytes remaining, otherwise there must be a * multiple of the checksum chunk size remaining. - * @return max(min(totalBytesRead, len) - offsetFromChunkBoundary, 0) + * @return max(min(totalBytesRead, len) - offsetFromChunkBoundary, 0) * that is, the the number of useful bytes (up to the amount * requested) readable from the buffer by the client. */ diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java index a6ca697fa63f7..a79807e73aee5 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java @@ -108,7 +108,7 @@ synchronized List poll(int numBlocks) { } /** - * Returns true if the queue contains the specified element. + * Returns true if the queue contains the specified element. */ synchronized boolean contains(E e) { return blockq.contains(e); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java index 7bf5879971615..2118b1d03fffa 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java @@ -369,7 +369,7 @@ String getFullPathName(Long nodeId) { } /** - * Get the key name for an encryption zone. Returns null if iip is + * Get the key name for an encryption zone. Returns null if iip is * not within an encryption zone. *

    * Called while holding the FSDirectory lock. diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java index f57135a7fc664..4fd56928c993e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java @@ -992,7 +992,7 @@ private void stopHttpServer() { *

  • {@link StartupOption#IMPORT IMPORT} - import checkpoint
    • *
* The option is passed via configuration field: - * dfs.namenode.startup + * dfs.namenode.startup * * The conf will be modified to reflect the actual ports on which * the NameNode is up and running if the user passes the port as diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/DiffList.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/DiffList.java index 80ef538000977..7ad3981d9c4f2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/DiffList.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/DiffList.java @@ -100,7 +100,7 @@ public List getMinListForRange(int startIndex, int endIndex, * @param index index of the element to return * @return the element at the specified position in this list * @throws IndexOutOfBoundsException if the index is out of range - * (index < 0 || index >= size()) + * (index < 0 || index >= size()) */ T get(int index); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionCalculator.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionCalculator.java index fbeea0f673c0e..6586d42f92d64 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionCalculator.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionCalculator.java @@ -37,20 +37,20 @@ /** * This is the tool for analyzing file sizes in the namespace image. In order to - * run the tool one should define a range of integers [0, maxSize] by - * specifying maxSize and a step. The range of integers is - * divided into segments of size step: - * [0, s1, ..., sn-1, maxSize], and the visitor + * run the tool one should define a range of integers [0, maxSize] by + * specifying maxSize and a step. The range of integers is + * divided into segments of size step: + * [0, s1, ..., sn-1, maxSize], and the visitor * calculates how many files in the system fall into each segment - * [si-1, si). Note that files larger than - * maxSize always fall into the very last segment. + * [si-1, si). Note that files larger than + * maxSize always fall into the very last segment. * *

Input.

*
    - *
  • filename specifies the location of the image file;
    • - *
  • maxSize determines the range [0, maxSize] of files + *
  • filename specifies the location of the image file;
    • + *
  • maxSize determines the range [0, maxSize] of files * sizes considered by the visitor;
    • - *
  • step the range is divided into segments of size step.
    • + *
  • step the range is divided into segments of size step.
    • *
* *

Output.

The output file is formatted as a tab separated two column diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionVisitor.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionVisitor.java index 7dcc29998f335..36e61d811b88c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionVisitor.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/FileDistributionVisitor.java @@ -28,20 +28,20 @@ *

Description.

* This is the tool for analyzing file sizes in the namespace image. * In order to run the tool one should define a range of integers - * [0, maxSize] by specifying maxSize and a step. - * The range of integers is divided into segments of size step: - * [0, s1, ..., sn-1, maxSize], + * [0, maxSize] by specifying maxSize and a step. + * The range of integers is divided into segments of size step: + * [0, s1, ..., sn-1, maxSize], * and the visitor calculates how many files in the system fall into - * each segment [si-1, si). - * Note that files larger than maxSize always fall into + * each segment [si-1, si). + * Note that files larger than maxSize always fall into * the very last segment. * *

Input.

*
    - *
  • filename specifies the location of the image file;
    • - *
  • maxSize determines the range [0, maxSize] of files + *
  • filename specifies the location of the image file;
    • + *
  • maxSize determines the range [0, maxSize] of files * sizes considered by the visitor;
    • - *
  • step the range is divided into segments of size step.
    • + *
  • step the range is divided into segments of size step.
    • *
* *

Output.

diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java index 3e9231f476005..55f926d23c8ea 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java @@ -110,7 +110,7 @@ public void tearDown() throws IOException { * Name-node should stay in automatic safe-mode. *
  • Enter safe mode manually.
    • *
  • Start the data-node.
    • - *
  • Wait longer than dfs.namenode.safemode.extension and + *
  • Wait longer than dfs.namenode.safemode.extension and * verify that the name-node is still in safe mode.
    • * * diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestReadOnlySharedStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestReadOnlySharedStorage.java index 106c515d49c08..e162f72cb2207 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestReadOnlySharedStorage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestReadOnlySharedStorage.java @@ -205,7 +205,7 @@ private void validateNumberReplicas(int expectedReplicas) throws IOException { } /** - * Verify that READ_ONLY_SHARED replicas are not counted towards the overall + * Verify that READ_ONLY_SHARED replicas are not counted towards the overall * replication count, but are included as replica locations returned to clients for reads. */ @Test @@ -221,7 +221,7 @@ public void testReplicaCounting() throws Exception { } /** - * Verify that the NameNode is able to still use READ_ONLY_SHARED replicas even + * Verify that the NameNode is able to still use READ_ONLY_SHARED replicas even * when the single NORMAL replica is offline (and the effective replication count is 0). */ @Test @@ -253,7 +253,7 @@ public void testNormalReplicaOffline() throws Exception { } /** - * Verify that corrupt READ_ONLY_SHARED replicas aren't counted + * Verify that corrupt READ_ONLY_SHARED replicas aren't counted * towards the corrupt replicas total. */ @Test diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/preemption/AMPreemptionPolicy.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/preemption/AMPreemptionPolicy.java index 85211f958d6c3..a49700d8e5587 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/preemption/AMPreemptionPolicy.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/preemption/AMPreemptionPolicy.java @@ -109,7 +109,7 @@ public abstract class Context { * TaskId}. Assigning a null is akin to remove all previous checkpoints for * this task. * @param taskId TaskID - * @param cid Checkpoint to assign or null to remove it. + * @param cid Checkpoint to assign or null to remove it. */ public void setCheckpointID(TaskId taskId, TaskCheckpointID cid); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/FileOutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/FileOutputFormat.java index 3932e5849ea14..a89f1f1cee999 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/FileOutputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/FileOutputFormat.java @@ -185,7 +185,7 @@ public static Path getOutputPath(JobConf conf) { * is {@link FileOutputCommitter}. If OutputCommitter is not * a FileOutputCommitter, the task's temporary output * directory is same as {@link #getOutputPath(JobConf)} i.e. - * ${mapreduce.output.fileoutputformat.outputdir}$

    + * ${mapreduce.output.fileoutputformat.outputdir}$

    * *

    Some applications need to create/write-to side-files, which differ from * the actual job-outputs. @@ -194,27 +194,27 @@ public static Path getOutputPath(JobConf conf) { * (running simultaneously e.g. speculative tasks) trying to open/write-to the * same file (path) on HDFS. Hence the application-writer will have to pick * unique names per task-attempt (e.g. using the attemptid, say - * attempt_200709221812_0001_m_000000_0), not just per TIP.

    + * attempt_200709221812_0001_m_000000_0), not just per TIP.

    * *

    To get around this the Map-Reduce framework helps the application-writer * out by maintaining a special - * ${mapreduce.output.fileoutputformat.outputdir}/_temporary/_${taskid} + * ${mapreduce.output.fileoutputformat.outputdir}/_temporary/_${taskid} * sub-directory for each task-attempt on HDFS where the output of the * task-attempt goes. On successful completion of the task-attempt the files - * in the ${mapreduce.output.fileoutputformat.outputdir}/_temporary/_${taskid} (only) - * are promoted to ${mapreduce.output.fileoutputformat.outputdir}. Of course, the + * in the ${mapreduce.output.fileoutputformat.outputdir}/_temporary/_${taskid} (only) + * are promoted to ${mapreduce.output.fileoutputformat.outputdir}. Of course, the * framework discards the sub-directory of unsuccessful task-attempts. This * is completely transparent to the application.

    * *

    The application-writer can take advantage of this by creating any - * side-files required in ${mapreduce.task.output.dir} during execution + * side-files required in ${mapreduce.task.output.dir} during execution * of his reduce-task i.e. via {@link #getWorkOutputPath(JobConf)}, and the * framework will move them out similarly - thus she doesn't have to pick * unique paths per task-attempt.

    * - *

    Note: the value of ${mapreduce.task.output.dir} during + *

    Note: the value of ${mapreduce.task.output.dir} during * execution of a particular task-attempt is actually - * ${mapreduce.output.fileoutputformat.outputdir}/_temporary/_{$taskid}, and this value is + * ${mapreduce.output.fileoutputformat.outputdir}/_temporary/_{$taskid}, and this value is * set by the map-reduce framework. So, just create any side-files in the * path returned by {@link #getWorkOutputPath(JobConf)} from map/reduce * task to take advantage of this feature.

    diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobConf.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobConf.java index 895c9f022efab..4c98b5507a84d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobConf.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobConf.java @@ -1872,8 +1872,8 @@ public String getJobEndNotificationURI() { * Set the uri to be invoked in-order to send a notification after the job * has completed (success/failure). * - *

    The uri can contain 2 special parameters: $jobId and - * $jobStatus. Those, if present, are replaced by the job's + *

    The uri can contain 2 special parameters: $jobId and + * $jobStatus. Those, if present, are replaced by the job's * identifier and completion-status respectively.

    * *

    This is typically used by application-writers to implement chaining of diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapRunnable.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapRunnable.java index 7aa4f336ae522..e5f585e0fbc8f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapRunnable.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapRunnable.java @@ -37,7 +37,7 @@ public interface MapRunnable extends JobConfigurable { /** - * Start mapping input <key, value> pairs. + * Start mapping input <key, value> pairs. * *

    Mapping of input records to output records is complete when this method * returns.

    diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/jobcontrol/Job.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/jobcontrol/Job.java index fd078372fd500..0b1a9786cabbe 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/jobcontrol/Job.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/jobcontrol/Job.java @@ -143,7 +143,7 @@ protected synchronized void setState(int state) { * is waiting to run, not during or afterwards. * * @param dependingJob Job that this Job depends on. - * @return true if the Job was added. + * @return true if the Job was added. */ public synchronized boolean addDependingJob(Job dependingJob) { return super.addDependingJob(dependingJob); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/CompositeInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/CompositeInputFormat.java index 40690e7541fdb..226363ac8caae 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/CompositeInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/CompositeInputFormat.java @@ -38,10 +38,10 @@ * and partitioned the same way. * * A user may define new join types by setting the property - * mapred.join.define.<ident> to a classname. In the expression - * mapred.join.expr, the identifier will be assumed to be a + * mapred.join.define.<ident> to a classname. In the expression + * mapred.join.expr, the identifier will be assumed to be a * ComposableRecordReader. - * mapred.join.keycomparator can be a classname used to compare keys + * mapred.join.keycomparator can be a classname used to compare keys * in the join. * @see #setFormat * @see JoinRecordReader @@ -66,9 +66,9 @@ public CompositeInputFormat() { } * class ::= @see java.lang.Class#forName(java.lang.String) * path ::= @see org.apache.hadoop.fs.Path#Path(java.lang.String) * } - * Reads expression from the mapred.join.expr property and - * user-supplied join types from mapred.join.define.<ident> - * types. Paths supplied to tbl are given as input paths to the + * Reads expression from the mapred.join.expr property and + * user-supplied join types from mapred.join.define.<ident> + * types. Paths supplied to tbl are given as input paths to the * InputFormat class listed. * @see #compose(java.lang.String, java.lang.Class, java.lang.String...) */ diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/CompositeRecordReader.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/CompositeRecordReader.java index 0684268d2d79f..1bb0745d918da 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/CompositeRecordReader.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/CompositeRecordReader.java @@ -61,8 +61,8 @@ public abstract class CompositeRecordReader< protected abstract boolean combine(Object[] srcs, TupleWritable value); /** - * Create a RecordReader with capacity children to position - * id in the parent reader. + * Create a RecordReader with capacity children to position + * id in the parent reader. * The id of a root CompositeRecordReader is -1 by convention, but relying * on this is not recommended. */ diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/OverrideRecordReader.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/OverrideRecordReader.java index 1671e6e895684..d36b776a94409 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/OverrideRecordReader.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/OverrideRecordReader.java @@ -31,7 +31,7 @@ /** * Prefer the "rightmost" data source for this key. - * For example, override(S1,S2,S3) will prefer values + * For example, override(S1,S2,S3) will prefer values * from S3 over S2, and values from S2 over S1 for all keys * emitted from all sources. */ diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/Parser.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/Parser.java index 3c7a991fd045e..96792c1e6662a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/Parser.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/join/Parser.java @@ -275,7 +275,7 @@ public WNode(String ident) { /** * Let the first actual define the InputFormat and the second define - * the mapred.input.dir property. + * the mapred.input.dir property. */ public void parse(List ll, JobConf job) throws IOException { StringBuilder sb = new StringBuilder(); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/TotalOrderPartitioner.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/TotalOrderPartitioner.java index b06961e5cfdd3..98ca9318df490 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/TotalOrderPartitioner.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/TotalOrderPartitioner.java @@ -43,7 +43,7 @@ public void configure(JobConf job) { /** * Set the path to the SequenceFile storing the sorted partition keyset. - * It must be the case that for R reduces, there are R-1 + * It must be the case that for R reduces, there are R-1 * keys in the SequenceFile. * @deprecated Use * {@link #setPartitionFile(Configuration, Path)} diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/jobcontrol/ControlledJob.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/jobcontrol/ControlledJob.java index 16ba22bfb604e..196f731e18a8d 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/jobcontrol/ControlledJob.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/jobcontrol/ControlledJob.java @@ -205,7 +205,7 @@ public List getDependentJobs() { * is waiting to run, not during or afterwards. * * @param dependingJob Job that this Job depends on. - * @return true if the Job was added. + * @return true if the Job was added. */ public synchronized boolean addDependingJob(ControlledJob dependingJob) { if (this.state == State.WAITING) { //only allowed to add jobs when waiting diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/CompositeInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/CompositeInputFormat.java index 6189a271bc3cb..b0b459afe2a0b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/CompositeInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/CompositeInputFormat.java @@ -41,10 +41,10 @@ * and partitioned the same way. * * A user may define new join types by setting the property - * mapreduce.join.define.<ident> to a classname. - * In the expression mapreduce.join.expr, the identifier will be + * mapreduce.join.define.<ident> to a classname. + * In the expression mapreduce.join.expr, the identifier will be * assumed to be a ComposableRecordReader. - * mapreduce.join.keycomparator can be a classname used to compare + * mapreduce.join.keycomparator can be a classname used to compare * keys in the join. * @see #setFormat * @see JoinRecordReader @@ -73,9 +73,9 @@ public CompositeInputFormat() { } * class ::= @see java.lang.Class#forName(java.lang.String) * path ::= @see org.apache.hadoop.fs.Path#Path(java.lang.String) * } - * Reads expression from the mapreduce.join.expr property and - * user-supplied join types from mapreduce.join.define.<ident> - * types. Paths supplied to tbl are given as input paths to the + * Reads expression from the mapreduce.join.expr property and + * user-supplied join types from mapreduce.join.define.<ident> + * types. Paths supplied to tbl are given as input paths to the * InputFormat class listed. * @see #compose(java.lang.String, java.lang.Class, java.lang.String...) */ diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/CompositeRecordReader.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/CompositeRecordReader.java index 40f3570cb59a2..45e3224a3fe08 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/CompositeRecordReader.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/CompositeRecordReader.java @@ -67,8 +67,8 @@ public abstract class CompositeRecordReader< protected X value; /** - * Create a RecordReader with capacity children to position - * id in the parent reader. + * Create a RecordReader with capacity children to position + * id in the parent reader. * The id of a root CompositeRecordReader is -1 by convention, but relying * on this is not recommended. */ diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/OverrideRecordReader.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/OverrideRecordReader.java index 5678445f11ba8..2396e9daa42da 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/OverrideRecordReader.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/OverrideRecordReader.java @@ -33,7 +33,7 @@ /** * Prefer the "rightmost" data source for this key. - * For example, override(S1,S2,S3) will prefer values + * For example, override(S1,S2,S3) will prefer values * from S3 over S2, and values from S2 over S1 for all keys * emitted from all sources. */ diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/Parser.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/Parser.java index c557e14136622..68cf31025943f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/Parser.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/Parser.java @@ -290,7 +290,7 @@ public WNode(String ident) { /** * Let the first actual define the InputFormat and the second define - * the mapred.input.dir property. + * the mapred.input.dir property. */ @Override public void parse(List ll, Configuration conf) throws IOException { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/TupleWritable.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/TupleWritable.java index 2990ca99d36c7..380363c897ab5 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/TupleWritable.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/join/TupleWritable.java @@ -144,7 +144,7 @@ public void remove() { /** * Convert Tuple to String as in the following. - * [<child1>,<child2>,...,<childn>] + * [<child1>,<child2>,...,<childn>] */ public String toString() { StringBuffer buf = new StringBuffer("["); diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java index 2b1f7e37ebe75..5dd572835ccff 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java @@ -208,15 +208,15 @@ public static Path getOutputPath(JobContext job) { * (running simultaneously e.g. speculative tasks) trying to open/write-to the * same file (path) on HDFS. Hence the application-writer will have to pick * unique names per task-attempt (e.g. using the attemptid, say - * attempt_200709221812_0001_m_000000_0), not just per TIP.

    + * attempt_200709221812_0001_m_000000_0), not just per TIP.

    * *

    To get around this the Map-Reduce framework helps the application-writer * out by maintaining a special - * ${mapreduce.output.fileoutputformat.outputdir}/_temporary/_${taskid} + * ${mapreduce.output.fileoutputformat.outputdir}/_temporary/_${taskid} * sub-directory for each task-attempt on HDFS where the output of the * task-attempt goes. On successful completion of the task-attempt the files - * in the ${mapreduce.output.fileoutputformat.outputdir}/_temporary/_${taskid} (only) - * are promoted to ${mapreduce.output.fileoutputformat.outputdir}. Of course, the + * in the ${mapreduce.output.fileoutputformat.outputdir}/_temporary/_${taskid} (only) + * are promoted to ${mapreduce.output.fileoutputformat.outputdir}. Of course, the * framework discards the sub-directory of unsuccessful task-attempts. This * is completely transparent to the application.

    * diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/TotalOrderPartitioner.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/TotalOrderPartitioner.java index c19724e842d26..25967f92fa8bd 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/TotalOrderPartitioner.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/lib/partition/TotalOrderPartitioner.java @@ -65,8 +65,8 @@ public TotalOrderPartitioner() { } /** * Read in the partition file and build indexing data structures. * If the keytype is {@link org.apache.hadoop.io.BinaryComparable} and - * total.order.partitioner.natural.order is not false, a trie - * of the first total.order.partitioner.max.trie.depth(2) + 1 bytes + * total.order.partitioner.natural.order is not false, a trie + * of the first total.order.partitioner.max.trie.depth(2) + 1 bytes * will be built. Otherwise, keys will be located using a binary search of * the partition keyset using the {@link org.apache.hadoop.io.RawComparator} * defined for this job. The input file must be sorted with the same @@ -128,7 +128,7 @@ public int getPartition(K key, V value, int numPartitions) { /** * Set the path to the SequenceFile storing the sorted partition keyset. - * It must be the case that for R reduces, there are R-1 + * It must be the case that for R reduces, there are R-1 * keys in the SequenceFile. */ public static void setPartitionFile(Configuration conf, Path p) { @@ -156,7 +156,7 @@ interface Node { /** * Base class for trie nodes. If the keytype is memcomp-able, this builds - * tries of the first total.order.partitioner.max.trie.depth + * tries of the first total.order.partitioner.max.trie.depth * bytes. */ static abstract class TrieNode implements Node { @@ -171,7 +171,7 @@ int getLevel() { /** * For types that are not {@link org.apache.hadoop.io.BinaryComparable} or - * where disabled by total.order.partitioner.natural.order, + * where disabled by total.order.partitioner.natural.order, * search the partition keyset with a binary search. */ class BinarySearchNode implements Node { diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/AccumulatingReducer.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/AccumulatingReducer.java index f6c2a06bfbbb3..057ac2de2029e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/AccumulatingReducer.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/AccumulatingReducer.java @@ -31,13 +31,13 @@ * The type is specified in the key part of the key-value pair * as a prefix to the key in the following way *

    - * type:key + * type:key *

    * The values are accumulated according to the types: *

      - *
    • s: - string, concatenate
      • - *
    • f: - float, summ
      • - *
    • l: - long, summ
      • + *
    • s: - string, concatenate
      • + *
    • f: - float, summ
      • + *
    • l: - long, summ
      • *
    * */ diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/IOMapperBase.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/IOMapperBase.java index ddd2d2f126936..7ded7a1e639ed 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/IOMapperBase.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/IOMapperBase.java @@ -109,8 +109,8 @@ abstract void collectStats(OutputCollector output, * Map file name and offset into statistical data. *

    * The map task is to get the - * key, which contains the file name, and the - * value, which is the offset within the file. + * key, which contains the file name, and the + * value, which is the offset within the file. * * The parameters are passed to the abstract method * {@link #doIO(Reporter,String,long)}, which performs the io operation, diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/JHLogAnalyzer.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/JHLogAnalyzer.java index 5e3e745f0229c..9eb2d42f5d042 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/JHLogAnalyzer.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/fs/JHLogAnalyzer.java @@ -76,7 +76,7 @@ * specific attempt A during hour h. * The tool then sums all slots for all attempts for every hour. * The result is the slot hour utilization of the cluster: - * slotTime(h) = SUMA slotTime(A,h). + * slotTime(h) = SUMA slotTime(A,h). *

    * Log analyzer calculates slot hours for MAP and REDUCE * attempts separately. @@ -88,8 +88,8 @@ *

    * Map-reduce clusters are usually configured to have a fixed number of MAP * and REDUCE slots per node. Thus the maximal possible number of slots on - * the cluster is total_slots = total_nodes * slots_per_node. - * Effective slot hour cannot exceed total_slots for successful + * the cluster is total_slots = total_nodes * slots_per_node. + * Effective slot hour cannot exceed total_slots for successful * attempts. *

    * Pending time characterizes the wait time of attempts. @@ -106,39 +106,39 @@ * The following input parameters can be specified in the argument string * to the job log analyzer: *

      - *
    • -historyDir inputDir specifies the location of the directory + *
    • -historyDir inputDir specifies the location of the directory * where analyzer will be looking for job history log files.
      • - *
    • -resFile resultFile the name of the result file.
      • - *
    • -usersIncluded | -usersExcluded userList slot utilization and + *
    • -resFile resultFile the name of the result file.
      • + *
    • -usersIncluded | -usersExcluded userList slot utilization and * pending time can be calculated for all or for all but the specified users. *
      - * userList is a comma or semicolon separated list of users.
      • - *
    • -gzip is used if history log files are compressed. + * userList is a comma or semicolon separated list of users.
      • + *
    • -gzip is used if history log files are compressed. * Only {@link GzipCodec} is currently supported.
      • - *
    • -jobDelimiter pattern one can concatenate original log files into + *
    • -jobDelimiter pattern one can concatenate original log files into * larger file(s) with the specified delimiter to recognize the end of the log * for one job from the next one.
      - * pattern is a java regular expression + * pattern is a java regular expression * {@link java.util.regex.Pattern}, which should match only the log delimiters. *
      - * E.g. pattern ".!!FILE=.*!!" matches delimiters, which contain + * E.g. pattern ".!!FILE=.*!!" matches delimiters, which contain * the original history log file names in the following form:
      - * "$!!FILE=my.job.tracker.com_myJobId_user_wordcount.log!!"
      • - *
    • -clean cleans up default directories used by the analyzer.
      • - *
    • -test test one file locally and exit; + * "$!!FILE=my.job.tracker.com_myJobId_user_wordcount.log!!"
      • + *
    • -clean cleans up default directories used by the analyzer.
      • + *
    • -test test one file locally and exit; * does not require map-reduce.
      • - *
    • -help print usage.
      • + *
    • -help print usage.
      • *
    * *

    Output.

    * The output file is formatted as a tab separated table consisting of four - * columns: SERIES, PERIOD, TYPE, SLOT_HOUR. + * columns: SERIES, PERIOD, TYPE, SLOT_HOUR. *
      - *
    • SERIES one of the four statistical series;
      • - *
    • PERIOD the start of the time interval in the following format: - * "yyyy-mm-dd hh:mm:ss";
      • - *
    • TYPE the slot type, e.g. MAP or REDUCE;
      • - *
    • SLOT_HOUR the value of the slot usage during this + *
    • SERIES one of the four statistical series;
      • + *
    • PERIOD the start of the time interval in the following format: + * "yyyy-mm-dd hh:mm:ss";
      • + *
    • TYPE the slot type, e.g. MAP or REDUCE;
      • + *
    • SLOT_HOUR the value of the slot usage during this * time interval.
      • *
    */ diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/package.html b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/package.html index 91484aa49c4c2..bd44bd32f6784 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/package.html +++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/pi/package.html @@ -39,7 +39,9 @@

    The distbbp Program

  • Combine the job outputs and print the π bits.
    • -
    + + +
    "The Bits of Pi

    The Bits of π

    The table on the right are the results computed by distbbp. @@ -56,7 +58,7 @@

    The Bits of π

  • The computations in Row 13 and Row 14 were completed on May 20, 2009. It seems that the corresponding bits were never computed before.
    • -
  • The first part of Row 15 (6216B06) +
  • The first part of Row 15 (6216B06)
    • The first 30% of the computation was done in idle cycles of some clusters spread over 20 days.
      • @@ -69,7 +71,7 @@

      The Bits of π

      this YDN blog.
    • -
  • The second part of Row 15 (D3611) +
  • The second part of Row 15 (D3611)
    • The starting position is 1,000,000,000,000,053, totally 20 bits.
    • Two computations, at positions n and n+4, were performed.
    • A single computation was divided into 14,000 jobs @@ -85,42 +87,45 @@

      The Bits of π

      computed ever in the history.
    • -    		 - - - - - - - - - - - - - - - - - - - - - - +
    Position nπ bits (in hex) starting at n
    01243F6A8885A3*
    111FDAA22168C23
    21013707344A409
    31,001574E69A458F
    410,00144EC5716F2B
    5100,001944F7A204
    61,000,0016FFFA4103
    710,000,0016CFDD54E3
    8100,000,001A306CFA7
    91,000,000,0013E08FF2B
    1010,000,000,0010A8BD8C0
    11100,000,000,001B2238C1
    121,000,000,000,0010FEE563
    1310,000,000,000,001896DC3
    14100,000,000,000,001C216EC
    151,000,000,000,000,0016216B06 ... D3611
    + + + + + + + + + + + + + + + + + + + + + + +
    "Pi in hex"
    Position nπ bits (in hex) starting at n
    01243F6A8885A3*
    111FDAA22168C23
    21013707344A409
    31,001574E69A458F
    410,00144EC5716F2B
    5100,001944F7A204
    61,000,0016FFFA4103
    710,000,0016CFDD54E3
    8100,000,001A306CFA7
    91,000,000,0013E08FF2B
    1010,000,000,0010A8BD8C0
    11100,000,000,001B2238C1
    121,000,000,000,0010FEE563
    1310,000,000,000,001896DC3
    14100,000,000,000,001C216EC
    151,000,000,000,000,0016216B06 ... D3611
    * By representing π in decimal, hexadecimal and binary, we have - - +
    π=3.1415926535 8979323846 2643383279 ...
    + + + - + - +
    "Pi in various formats"
    π=3.1415926535 8979323846 2643383279 ...
    =3.243F6A8885 A308D31319 8A2E037073 ...=3.243F6A8885 A308D31319 8A2E037073 ...
    =11.0010010000 1111110110 1010100010 ...=11.0010010000 1111110110 1010100010 ...
    -The first ten bits of π are 0010010000. +The first ten bits of π are 0010010000.
    @@ -130,7 +135,8 @@

    Command Line Usages

    $ hadoop org.apache.hadoop.examples.pi.DistBbp \ <b> <nThreads> <nJobs> <type> <nPart> <remoteDir> <localDir> And the parameters are: - +
    + diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 42eeaeaadbe9b..98669dc430d4e 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -155,7 +155,6 @@ 11 - false - -html4 - - diff --git a/hadoop-tools/hadoop-aws/pom.xml b/hadoop-tools/hadoop-aws/pom.xml index 5583bb7ad05ec..70b42afd162ee 100644 --- a/hadoop-tools/hadoop-aws/pom.xml +++ b/hadoop-tools/hadoop-aws/pom.xml @@ -35,7 +35,6 @@ UTF-8true${project.build.directory}/test - trueunset diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FilePool.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FilePool.java index 9a0cca380bcbd..9fbad6b7a9817 100644 --- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FilePool.java +++ b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/FilePool.java @@ -128,7 +128,7 @@ static abstract class Node { /** * Return a set of files whose cumulative size is at least - * targetSize. + * targetSize. * TODO Clearly size is not the only criterion, e.g. refresh from * generated data without including running task output, tolerance * for permission issues, etc. diff --git a/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/HttpResponseUtils.java b/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/HttpResponseUtils.java index 1cc340d83d9b4..fb6dba34e7edd 100644 --- a/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/HttpResponseUtils.java +++ b/hadoop-tools/hadoop-openstack/src/main/java/org/apache/hadoop/fs/swift/util/HttpResponseUtils.java @@ -36,7 +36,7 @@ public abstract class HttpResponseUtils { /** * Returns the response body of the HTTPResponse, if any, as an array of bytes. - * If response body is not available or cannot be read, returns null + * If response body is not available or cannot be read, returns null * * Note: This will cause the entire response body to be buffered in memory. A * malicious server may easily exhaust all the VM memory. It is strongly @@ -73,7 +73,7 @@ public static byte[] getResponseBody(HttpResponse resp) throws IOException { /** * Returns the response body of the HTTPResponse, if any, as a {@link String}. - * If response body is not available or cannot be read, returns null + * If response body is not available or cannot be read, returns null * The string conversion on the data is done using UTF-8. * * Note: This will cause the entire response body to be buffered in memory. A @@ -98,17 +98,17 @@ public static String getResponseBodyAsString(HttpResponse resp) /** * Return the length (in bytes) of the response body, as specified in a - * Content-Length header. + * Content-Length header. * *

    - * Return -1 when the content-length is unknown. + * Return -1 when the content-length is unknown. *

    * * @param resp HttpResponse - * @return content length, if Content-Length header is available. - * 0 indicates that the request has no body. - * If Content-Length header is not present, the method - * returns -1. + * @return content length, if Content-Length header is available. + * 0 indicates that the request has no body. + * If Content-Length header is not present, the method + * returns -1. */ public static long getContentLength(HttpResponse resp) { Header header = resp.getFirstHeader(HEADER_CONTENT_LENGTH); diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/IdentifierResolver.java b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/IdentifierResolver.java index b0cd5b4fdb733..9db4087c0cb88 100644 --- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/IdentifierResolver.java +++ b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/io/IdentifierResolver.java @@ -26,7 +26,7 @@ /** * This class is used to resolve a string identifier into the required IO * classes. By extending this class and pointing the property - * stream.io.identifier.resolver.class to this extension, additional + * stream.io.identifier.resolver.class to this extension, additional * IO classes can be added by external code. */ public class IdentifierResolver { diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/package.html b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/package.html index be64426757e72..d7924e8d4e75d 100644 --- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/package.html +++ b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/streaming/package.html @@ -19,7 +19,7 @@ -Hadoop Streaming is a utility which allows users to create and run +Hadoop Streaming is a utility which allows users to create and run Map-Reduce jobs with any executables (e.g. Unix shell utilities) as the mapper and/or the reducer. diff --git a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/package.html b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/package.html index 3494fbd8586cd..f738d1d44149a 100644 --- a/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/package.html +++ b/hadoop-tools/hadoop-streaming/src/main/java/org/apache/hadoop/typedbytes/package.html @@ -26,7 +26,8 @@

    Type Codes

    Each typed bytes sequence starts with an unsigned byte that contains the type code. Possible values are: -
    "command line option"
    <b> The number of bits to skip, i.e. compute the (b+1)th position.
    +
    + @@ -48,7 +49,8 @@

    Subsequent Bytes

    These are the subsequent bytes for the different type codes (everything is big-endian and unpadded): -
    "Type Codes"
    CodeType
    0A sequence of bytes.
    1A byte.
    +
    + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml index 8ad0fc6931679..b57b0cf586785 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/pom.xml @@ -32,7 +32,6 @@ app - ${project.build.directory}/endorsed target/generated-sources/vendor UTF-8 false @@ -306,15 +305,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - - - ${endorsed.dir} - - - org.apache.maven.plugins maven-surefire-plugin @@ -347,24 +337,6 @@ org.apache.maven.plugins maven-dependency-plugin - - validate - - copy - - - ${endorsed.dir} - true - - - javax - javaee-endorsed-api - 7.0 - jar - - - - diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceMetricsSink.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceMetricsSink.java index ff4556f7cd7a3..c4417851a56a5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceMetricsSink.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/timelineservice/ServiceMetricsSink.java @@ -31,7 +31,7 @@ * adding the following to by This would actually be set as: * [prefix].sink.[some instance name].class * =org.apache.hadoop.yarn.service.timelineservice.ServiceMetricsSink - * , where prefix is "atsv2": and some instance name is + * , where prefix is "atsv2": and some instance name is * just any unique name, so properties can be differentiated if there are * multiple sinks of the same type created */ diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AdminACLsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AdminACLsManager.java index 949c6a2e27cc7..3ff53cce8b7c3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AdminACLsManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/AdminACLsManager.java @@ -93,7 +93,7 @@ public UserGroupInformation getOwner() { * * @see YarnConfiguration#YARN_ACL_ENABLE * @see YarnConfiguration#DEFAULT_YARN_ACL_ENABLE - * @return true if ACLs are enabled + * @return true if ACLs are enabled */ public boolean areACLsEnabled() { return aclsEnabled; @@ -103,7 +103,7 @@ public boolean areACLsEnabled() { * Returns whether the specified user/group is an administrator * * @param callerUGI user/group to to check - * @return true if the UserGroupInformation specified + * @return true if the UserGroupInformation specified * is a member of the access control list for administrators */ public boolean isAdmin(UserGroupInformation callerUGI) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/BoundedAppender.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/BoundedAppender.java index 6d582ca1ec799..423f029b9d59a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/BoundedAppender.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/BoundedAppender.java @@ -56,7 +56,7 @@ * } * *

    - * Note that null values are {@link #append(CharSequence) append}ed + * Note that null values are {@link #append(CharSequence) append}ed * just like in {@link StringBuilder#append(CharSequence) original * implementation}. *

    diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/LeveldbIterator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/LeveldbIterator.java index f33cb5f1d8965..a53193f304508 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/LeveldbIterator.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/main/java/org/apache/hadoop/yarn/server/utils/LeveldbIterator.java @@ -102,7 +102,7 @@ public void seekToLast() throws DBException { } /** - * Returns true if the iteration has more elements. + * Returns true if the iteration has more elements. */ public boolean hasNext() throws DBException { try { From 41dcb84a58c55294c423f1f52e57e2aceaaecba8 Mon Sep 17 00:00:00 2001 From: Ayush Saxena Date: Wed, 18 May 2022 19:32:31 +0530 Subject: [PATCH 5/6] Fix javadoc. --- dev-support/docker/Dockerfile_aarch64 | 1 + .../org/apache/hadoop/fs/FileContext.java | 32 ++++---- .../java/org/apache/hadoop/fs/FileSystem.java | 28 +++---- .../io/compress/bzip2/CBZip2OutputStream.java | 82 +++++++++---------- .../apache/hadoop/metrics2/package-info.java | 18 ++-- .../hadoop/util/ShutdownThreadsHelper.java | 16 ++-- .../src/site/markdown/CapacityScheduler.md | 24 +++--- 7 files changed, 101 insertions(+), 100 deletions(-) diff --git a/dev-support/docker/Dockerfile_aarch64 b/dev-support/docker/Dockerfile_aarch64 index 4268370e4b963..bb5a3809eeb99 100644 --- a/dev-support/docker/Dockerfile_aarch64 +++ b/dev-support/docker/Dockerfile_aarch64 @@ -69,6 +69,7 @@ ENV SPOTBUGS_HOME /opt/spotbugs # Set env vars for Google Protobuf 3.7.1 ####### ENV PROTOBUF_HOME /opt/protobuf +ENV PATH "${PATH}:/opt/protobuf/bin" ### # Avoid out of memory errors in builds diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java index 298570bb55fe8..01f5cab07c057 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java @@ -1977,9 +1977,9 @@ public RemoteIterator listFiles( LocatedFileStatus curFile; /** - * Returns true if the iterator has more files. + * Returns true if the iterator has more files. * - * @return true if the iterator has more files. + * @return true if the iterator has more files. * @throws AccessControlException if not allowed to access next * file's status or locations * @throws FileNotFoundException if next file does not exist any more @@ -2071,34 +2071,34 @@ public LocatedFileStatus next() throws IOException { *

    *
    *
    - *
    ? + *
    ? *
    Matches any single character. * - *
    * + *
    * *
    Matches zero or more characters. * - *
    [abc] + *
    [abc] *
    Matches a single character from character set - * {a,b,c}. + * {a,b,c}. * - *
    [a-b] + *
    [a-b] *
    Matches a single character from the character range - * {a...b}. Note: character a must be - * lexicographically less than or equal to character b. + * {a...b}. Note: character a must be + * lexicographically less than or equal to character b. * - *
    [^a] + *
    [^a] *
    Matches a single char that is not from character set or range - * {a}. Note that the ^ character must occur + * {a}. Note that the ^ character must occur * immediately to the right of the opening bracket. * - *
    \c + *
    \c *
    Removes (escapes) any special meaning of character c. * - *
    {ab,cd} - *
    Matches a string from the string set {ab, cd} + *
    {ab,cd} + *
    Matches a string from the string set {ab, cd} * - *
    {ab,c{de,fh}} - *
    Matches a string from string set {ab, cde, cfh} + *
    {ab,c{de,fh}} + *
    Matches a string from string set {ab, cde, cfh} * *
    *
    diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java index 0bc419b035380..a4587c83d2074 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java @@ -2144,34 +2144,34 @@ public FileStatus[] listStatus(Path[] files, PathFilter filter) *
    *
    *
    - *
    ? + *
    ? *
    Matches any single character. * - *
    * + *
    * *
    Matches zero or more characters. * - *
    [abc] + *
    [abc] *
    Matches a single character from character set - * {a,b,c}. + * {a,b,c}. * - *
    [a-b] + *
    [a-b] *
    Matches a single character from the character range - * {a...b}. Note that character a must be - * lexicographically less than or equal to character b. + * {a...b}. Note that character a must be + * lexicographically less than or equal to character b. * - *
    [^a] + *
    [^a] *
    Matches a single character that is not from character set or range - * {a}. Note that the ^ character must occur + * {a}. Note that the ^ character must occur * immediately to the right of the opening bracket. * - *
    \c + *
    \c *
    Removes (escapes) any special meaning of character c. * - *
    {ab,cd} - *
    Matches a string from the string set {ab, cd} + *
    {ab,cd} + *
    Matches a string from the string set {ab, cd} * - *
    {ab,c{de,fh}} - *
    Matches a string from the string set {ab, cde, cfh} + *
    {ab,c{de,fh}} + *
    Matches a string from the string set {ab, cde, cfh} * *
    *
    diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/CBZip2OutputStream.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/CBZip2OutputStream.java index 39c3638b0f497..d354ed6cb1862 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/CBZip2OutputStream.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/bzip2/CBZip2OutputStream.java @@ -36,7 +36,7 @@ *

    * The compression requires large amounts of memory. Thus you should call the * {@link #close() close()} method as soon as possible, to force - * CBZip2OutputStream to release the allocated memory. + * CBZip2OutputStream to release the allocated memory. *

    * *

    @@ -63,64 +63,64 @@ * <code>65k + (5 * blocksize)</code>. * * - *

    "Subsequent Bytes"
    CodeSubsequent Bytes
    0<32-bit signed integer> <as many bytes as indicated by the integer>
    1<signed byte>
    + *
    * - * + * * * - * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * * - * - * - * + * + * + * * *
    Memory usage by blocksize
    Blocksize Compression
    - * memory usage    		 Decompression
    + *     		Blocksize Compression
    + * memory usage    		 Decompression
    * memory usage
    100k1300k565k100k1300k565k
    200k2200k1065k200k2200k1065k
    300k3100k1565k300k3100k1565k
    400k4000k2065k400k4000k2065k
    500k4900k2565k500k4900k2565k
    600k5800k3065k600k5800k3065k
    700k6700k3565k700k6700k3565k
    800k7600k4065k800k7600k4065k
    900k8500k4565k900k8500k4565k
    * *

    - * For decompression CBZip2InputStream allocates less memory if the + * For decompression CBZip2InputStream allocates less memory if the * bzipped input is smaller than one block. *

    * @@ -136,12 +136,12 @@ public class CBZip2OutputStream extends OutputStream implements BZip2Constants { /** - * The minimum supported blocksize == 1. + * The minimum supported blocksize == 1. */ public static final int MIN_BLOCKSIZE = 1; /** - * The maximum supported blocksize == 9. + * The maximum supported blocksize == 9. */ public static final int MAX_BLOCKSIZE = 9; @@ -565,12 +565,12 @@ private static void hbMakeCodeLengths(final byte[] len, final int[] freq, * * @return The blocksize, between {@link #MIN_BLOCKSIZE} and * {@link #MAX_BLOCKSIZE} both inclusive. For a negative - * inputLength this method returns MAX_BLOCKSIZE + * inputLength this method returns MAX_BLOCKSIZE * always. * * @param inputLength * The length of the data which will be compressed by - * CBZip2OutputStream. + * CBZip2OutputStream. */ public static int chooseBlockSize(long inputLength) { return (inputLength > 0) ? (int) Math @@ -578,11 +578,11 @@ public static int chooseBlockSize(long inputLength) { } /** - * Constructs a new CBZip2OutputStream with a blocksize of 900k. + * Constructs a new CBZip2OutputStream with a blocksize of 900k. * *

    * Attention: The caller is resonsible to write the two BZip2 magic - * bytes "BZ" to the specified stream prior to calling this + * bytes "BZ" to the specified stream prior to calling this * constructor. *

    * @@ -599,11 +599,11 @@ public CBZip2OutputStream(final OutputStream out) throws IOException { } /** - * Constructs a new CBZip2OutputStream with specified blocksize. + * Constructs a new CBZip2OutputStream with specified blocksize. * *

    * Attention: The caller is resonsible to write the two BZip2 magic - * bytes "BZ" to the specified stream prior to calling this + * bytes "BZ" to the specified stream prior to calling this * constructor. *

    * diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/package-info.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/package-info.java index 196469be9dce2..991ff849e120f 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/package-info.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/package-info.java @@ -26,7 +26,7 @@
  • Metrics Instrumentation Strategy
  • Migration from previous system
    • -

    Overview

    +

    Overview

    This package provides a framework for metrics instrumentation and publication.

    @@ -84,9 +84,9 @@ usually does not need to reference any class here. -

    Getting started

    +

    Getting started

    Implementing metrics sources

    - +
    @@ -187,7 +187,7 @@ they need to be hooked up to a metrics system. In this case (and most 
       DefaultMetricsSystem.initialize("test"); // called once per application
   DefaultMetricsSystem.register(new MyStat());
    -

    Metrics system configuration

    +

    Metrics system configuration

    Sinks are usually specified in a configuration file, say, "hadoop-metrics2-test.properties", as:

    @@ -209,7 +209,7 @@ identify a particular sink instance. The asterisk (*) can be for more examples.

    -

    Metrics Filtering

    +

    Metrics Filtering

    One of the features of the default metrics system is metrics filtering configuration by source, context, record/tags and metrics. The least expensive way to filter out metrics would be at the source level, e.g., @@ -241,7 +241,7 @@ identify a particular sink instance. The asterisk (*) can be level, respectively. Filters can be combined to optimize the filtering efficiency.

    -

    Metrics instrumentation strategy

    +

    Metrics instrumentation strategy

    In previous examples, we showed a minimal example to use the metrics framework. In a larger system (like Hadoop) that allows @@ -279,7 +279,7 @@ instrumentation interface (incrCounter0 etc.) that allows different -

    Migration from previous system

    +

    Migration from previous system

    Users of the previous metrics system would notice the lack of context prefix in the configuration examples. The new metrics system decouples the concept for context (for grouping) with the @@ -289,7 +289,7 @@ metrics system decouples the concept for context (for grouping) with the configure an implementation instance per context, even if you have a backend that can handle multiple contexts (file, gangalia etc.):

    -
    Implementing metrics sources
    +
    @@ -311,7 +311,7 @@ backend that can handle multiple contexts (file, gangalia etc.):

    In the new metrics system, you can simulate the previous behavior by using the context option in the sink options like the following:

    -
    Migration from previous system
    +
    diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownThreadsHelper.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownThreadsHelper.java index dc13697f158ad..f026585be285a 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownThreadsHelper.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownThreadsHelper.java @@ -37,8 +37,8 @@ public class ShutdownThreadsHelper { /** * @param thread {@link Thread to be shutdown} - * @return true if the thread is successfully interrupted, - * false otherwise + * @return true if the thread is successfully interrupted, + * false otherwise */ public static boolean shutdownThread(Thread thread) { return shutdownThread(thread, SHUTDOWN_WAIT_MS); @@ -48,8 +48,8 @@ public static boolean shutdownThread(Thread thread) { * @param thread {@link Thread to be shutdown} * @param timeoutInMilliSeconds time to wait for thread to join after being * interrupted - * @return true if the thread is successfully interrupted, - * false otherwise + * @return true if the thread is successfully interrupted, + * false otherwise */ public static boolean shutdownThread(Thread thread, long timeoutInMilliSeconds) { @@ -71,8 +71,8 @@ public static boolean shutdownThread(Thread thread, * shutdownExecutorService. * * @param service {@link ExecutorService to be shutdown} - * @return true if the service is terminated, - * false otherwise + * @return true if the service is terminated, + * false otherwise * @throws InterruptedException if the thread is interrupted. */ public static boolean shutdownExecutorService(ExecutorService service) @@ -87,8 +87,8 @@ public static boolean shutdownExecutorService(ExecutorService service) * @param timeoutInMs time to wait for {@link * ExecutorService#awaitTermination(long, java.util.concurrent.TimeUnit)} * calls in milli seconds. - * @return true if the service is terminated, - * false otherwise + * @return true if the service is terminated, + * false otherwise * @throws InterruptedException if the thread is interrupted. */ public static boolean shutdownExecutorService(ExecutorService service, diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md index 3a694e3f2485e..ea01c7d8a6abf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md @@ -400,18 +400,18 @@ As explained in the "Policies" section, quite a few policies can be achieved wit | Old mapping rule | JSON-based mapping rule | |:---- |:---- | -| `u:username:root.user.queue` | { "type": "user",
    "matches": "username",
    "policy": "custom",
    "customPlacement": "root.user.queue",
    "fallbackResult":"placeDefault" }     | -| `u:%user:%user` | { "type": "user",
    "matches": "*",
    "policy": "user",
    "fallbackResult":"placeDefault" }     | -| `u:%user:root.parent.%user` | { "type": "user",
    "matches": "*",
    "policy": "user",
    "parentQueue": "root.parent",
    "fallbackResult":"placeDefault" }     | -| `u:%user:%primary_group` | { "type": "user",
    "matches": "*",
    "policy": "primaryGroup",
    "fallbackResult":"placeDefault" }     | -| `u:%user:%primary_group.%user` | { "type": "user",
    "matches": "*",
    "policy": "primaryGroupUser",
    "fallbackResult":"placeDefault" }     | -| `u:%user:root.groups.%primary_group.%user` | { "type": "user",
    "matches": "*",
    "policy": "primaryGroupUser",
    "parentQueue": "root.groups",
    "fallbackResult":"placeDefault" }     | -| `u:%user:%secondary_group` | { "type": "user",
    "matches": "*",
    "policy": "secondaryGroup",
    "fallbackResult":"placeDefault" }     | -| `u:%user:%secondary_group.%user` | { "type": "user",
    "matches": "*",
    "policy": "secondaryGroupUser",
    "fallbackResult":"placeDefault" }     | -| `u:%user:root.groups.%secondary_group.%user` | { "type": "user",
    "matches": "*",
    "policy": "secondaryGroupUser",
    "parentQueue": "root.groups",
    "fallbackResult":"placeDefault" }     | -| `g:hadoop:root.groups.hadoop` | { "type": "group",
    "matches": "hadoop",
    "policy": "custom",
    "customPlacement": "root.groups.hadoop",
    "fallbackResult":"placeDefault" }     | -| `%application:%application` (application mapping) | { "type": "user",
    "matches": "*",
    "policy": "applicationName",
    "fallbackResult":"placeDefault" }     | -| `hive_query:root.query.hive` (application mapping) | { "type": "application",
    "matches": "hive_query",
    "policy": "custom",
    "customPlacement": "root.query.hive",
    "fallbackResult":"placeDefault" }     | +| `u:username:root.user.queue` | { "type": "user",
    "matches": "username",
    "policy": "custom",
    "customPlacement": "root.user.queue",
    "fallbackResult":"placeDefault" } | +| `u:%user:%user` | { "type": "user",
    "matches": "*",
    "policy": "user",
    "fallbackResult":"placeDefault" } | +| `u:%user:root.parent.%user` | { "type": "user",
    "matches": "*",
    "policy": "user",
    "parentQueue": "root.parent",
    "fallbackResult":"placeDefault" } | +| `u:%user:%primary_group` | { "type": "user",
    "matches": "*",
    "policy": "primaryGroup",
    "fallbackResult":"placeDefault" } | +| `u:%user:%primary_group.%user` | { "type": "user",
    "matches": "*",
    "policy": "primaryGroupUser",
    "fallbackResult":"placeDefault" } | +| `u:%user:root.groups.%primary_group.%user` | { "type": "user",
    "matches": "*",
    "policy": "primaryGroupUser",
    "parentQueue": "root.groups",
    "fallbackResult":"placeDefault" } | +| `u:%user:%secondary_group` | { "type": "user",
    "matches": "*",
    "policy": "secondaryGroup",
    "fallbackResult":"placeDefault" } | +| `u:%user:%secondary_group.%user` | { "type": "user",
    "matches": "*",
    "policy": "secondaryGroupUser",
    "fallbackResult":"placeDefault" } | +| `u:%user:root.groups.%secondary_group.%user` | { "type": "user",
    "matches": "*",
    "policy": "secondaryGroupUser",
    "parentQueue": "root.groups",
    "fallbackResult":"placeDefault" } | +| `g:hadoop:root.groups.hadoop` | { "type": "group",
    "matches": "hadoop",
    "policy": "custom",
    "customPlacement": "root.groups.hadoop",
    "fallbackResult":"placeDefault" } | +| `%application:%application` (application mapping) | { "type": "user",
    "matches": "*",
    "policy": "applicationName",
    "fallbackResult":"placeDefault" } | +| `hive_query:root.query.hive` (application mapping) | { "type": "application",
    "matches": "hive_query",
    "policy": "custom",
    "customPlacement": "root.query.hive",
    "fallbackResult":"placeDefault" } | It's worth noting that `%application:%application` requires a `user` type matcher. It is because internally, the "*" is interpreted only for users. If you set the `type` to `application`, then the "*" means to match an application which is named "*". From a33643f6bffae7b4ae4d9cdc798fb3457b887be3 Mon Sep 17 00:00:00 2001 From: Ayush Saxena Date: Thu, 19 May 2022 08:58:42 +0530 Subject: [PATCH 6/6] Fix Site. Upgrade Maven Plugin to support JDK-11 --- .../src/site/markdown/CapacityScheduler.md | 24 +++++++++---------- pom.xml | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md index ea01c7d8a6abf..3a694e3f2485e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/CapacityScheduler.md @@ -400,18 +400,18 @@ As explained in the "Policies" section, quite a few policies can be achieved wit | Old mapping rule | JSON-based mapping rule | |:---- |:---- | -| `u:username:root.user.queue` | { "type": "user",
    "matches": "username",
    "policy": "custom",
    "customPlacement": "root.user.queue",
    "fallbackResult":"placeDefault" } | -| `u:%user:%user` | { "type": "user",
    "matches": "*",
    "policy": "user",
    "fallbackResult":"placeDefault" } | -| `u:%user:root.parent.%user` | { "type": "user",
    "matches": "*",
    "policy": "user",
    "parentQueue": "root.parent",
    "fallbackResult":"placeDefault" } | -| `u:%user:%primary_group` | { "type": "user",
    "matches": "*",
    "policy": "primaryGroup",
    "fallbackResult":"placeDefault" } | -| `u:%user:%primary_group.%user` | { "type": "user",
    "matches": "*",
    "policy": "primaryGroupUser",
    "fallbackResult":"placeDefault" } | -| `u:%user:root.groups.%primary_group.%user` | { "type": "user",
    "matches": "*",
    "policy": "primaryGroupUser",
    "parentQueue": "root.groups",
    "fallbackResult":"placeDefault" } | -| `u:%user:%secondary_group` | { "type": "user",
    "matches": "*",
    "policy": "secondaryGroup",
    "fallbackResult":"placeDefault" } | -| `u:%user:%secondary_group.%user` | { "type": "user",
    "matches": "*",
    "policy": "secondaryGroupUser",
    "fallbackResult":"placeDefault" } | -| `u:%user:root.groups.%secondary_group.%user` | { "type": "user",
    "matches": "*",
    "policy": "secondaryGroupUser",
    "parentQueue": "root.groups",
    "fallbackResult":"placeDefault" } | -| `g:hadoop:root.groups.hadoop` | { "type": "group",
    "matches": "hadoop",
    "policy": "custom",
    "customPlacement": "root.groups.hadoop",
    "fallbackResult":"placeDefault" } | -| `%application:%application` (application mapping) | { "type": "user",
    "matches": "*",
    "policy": "applicationName",
    "fallbackResult":"placeDefault" } | -| `hive_query:root.query.hive` (application mapping) | { "type": "application",
    "matches": "hive_query",
    "policy": "custom",
    "customPlacement": "root.query.hive",
    "fallbackResult":"placeDefault" } | +| `u:username:root.user.queue` | { "type": "user",
    "matches": "username",
    "policy": "custom",
    "customPlacement": "root.user.queue",
    "fallbackResult":"placeDefault" }     | +| `u:%user:%user` | { "type": "user",
    "matches": "*",
    "policy": "user",
    "fallbackResult":"placeDefault" }     | +| `u:%user:root.parent.%user` | { "type": "user",
    "matches": "*",
    "policy": "user",
    "parentQueue": "root.parent",
    "fallbackResult":"placeDefault" }     | +| `u:%user:%primary_group` | { "type": "user",
    "matches": "*",
    "policy": "primaryGroup",
    "fallbackResult":"placeDefault" }     | +| `u:%user:%primary_group.%user` | { "type": "user",
    "matches": "*",
    "policy": "primaryGroupUser",
    "fallbackResult":"placeDefault" }     | +| `u:%user:root.groups.%primary_group.%user` | { "type": "user",
    "matches": "*",
    "policy": "primaryGroupUser",
    "parentQueue": "root.groups",
    "fallbackResult":"placeDefault" }     | +| `u:%user:%secondary_group` | { "type": "user",
    "matches": "*",
    "policy": "secondaryGroup",
    "fallbackResult":"placeDefault" }     | +| `u:%user:%secondary_group.%user` | { "type": "user",
    "matches": "*",
    "policy": "secondaryGroupUser",
    "fallbackResult":"placeDefault" }     | +| `u:%user:root.groups.%secondary_group.%user` | { "type": "user",
    "matches": "*",
    "policy": "secondaryGroupUser",
    "parentQueue": "root.groups",
    "fallbackResult":"placeDefault" }     | +| `g:hadoop:root.groups.hadoop` | { "type": "group",
    "matches": "hadoop",
    "policy": "custom",
    "customPlacement": "root.groups.hadoop",
    "fallbackResult":"placeDefault" }     | +| `%application:%application` (application mapping) | { "type": "user",
    "matches": "*",
    "policy": "applicationName",
    "fallbackResult":"placeDefault" }     | +| `hive_query:root.query.hive` (application mapping) | { "type": "application",
    "matches": "hive_query",
    "policy": "custom",
    "customPlacement": "root.query.hive",
    "fallbackResult":"placeDefault" }     | It's worth noting that `%application:%application` requires a `user` type matcher. It is because internally, the "*" is interpreted only for users. If you set the `type` to `application`, then the "*" means to match an application which is named "*". diff --git a/pom.xml b/pom.xml index c11cd015a1be9..75c42541e431d 100644 --- a/pom.xml +++ b/pom.xml @@ -99,7 +99,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/x 1.5 1.7 2.4 - 3.0.2 + 3.3.0 3.0.0 2.0.0 3.0.1
    Metrics2