This is an automated email from the ASF dual-hosted git repository.

ayushsaxena pushed a change to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git.


    from f04a9df  YARN-10491. Fix deprecation warnings in SLSWebApp.java (#2519)
     new 8378ab9  HADOOP-17288. Use shaded guava from thirdparty. Contributed 
by Ayush Saxena. #2505
     new b84bc63  HADOOP-17344. Harmonize guava version and shade guava in 
yarn-csi. (#2434)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../hadoop-client-minicluster/pom.xml              | 12 +++++++
 .../org/apache/hadoop/fs/cosn/CosNFileSystem.java  |  2 +-
 .../apache/hadoop/fs/cosn/CosNOutputStream.java    |  8 ++---
 .../fs/cosn/auth/COSCredentialsProviderList.java   |  2 +-
 hadoop-common-project/hadoop-auth/pom.xml          |  7 +++-
 .../client/KerberosAuthenticator.java              |  2 +-
 .../server/AuthenticationHandlerUtil.java          |  2 +-
 .../server/JWTRedirectAuthenticationHandler.java   |  2 +-
 .../server/KerberosAuthenticationHandler.java      |  2 +-
 .../server/LdapAuthenticationHandler.java          |  4 +--
 .../server/MultiSchemeAuthenticationHandler.java   |  4 +--
 .../util/FileSignerSecretProvider.java             |  2 +-
 .../security/authentication/util/KerberosName.java |  2 +-
 .../util/RandomSignerSecretProvider.java           |  2 +-
 .../util/RolloverSignerSecretProvider.java         |  2 +-
 .../util/ZKSignerSecretProvider.java               |  2 +-
 .../util/StringSignerSecretProvider.java           |  2 +-
 .../util/StringSignerSecretProviderCreator.java    |  2 +-
 hadoop-common-project/hadoop-common/pom.xml        |  5 +++
 .../java/org/apache/hadoop/conf/ConfServlet.java   |  2 +-
 .../java/org/apache/hadoop/conf/Configuration.java |  8 ++---
 .../org/apache/hadoop/conf/ReconfigurableBase.java |  6 ++--
 .../apache/hadoop/crypto/AesCtrCryptoCodec.java    |  2 +-
 .../java/org/apache/hadoop/crypto/CryptoCodec.java |  4 +--
 .../apache/hadoop/crypto/CryptoInputStream.java    |  2 +-
 .../apache/hadoop/crypto/CryptoOutputStream.java   |  2 +-
 .../apache/hadoop/crypto/CryptoStreamUtils.java    |  2 +-
 .../apache/hadoop/crypto/JceAesCtrCryptoCodec.java |  2 +-
 .../hadoop/crypto/OpensslAesCtrCryptoCodec.java    |  2 +-
 .../org/apache/hadoop/crypto/OpensslCipher.java    |  2 +-
 .../hadoop/crypto/key/CachingKeyProvider.java      |  6 ++--
 .../hadoop/crypto/key/JavaKeyStoreProvider.java    |  4 +--
 .../crypto/key/KeyProviderCryptoExtension.java     |  2 +-
 .../key/KeyProviderDelegationTokenExtension.java   |  2 +-
 .../org/apache/hadoop/crypto/key/KeyShell.java     |  2 +-
 .../hadoop/crypto/key/kms/KMSClientProvider.java   |  6 ++--
 .../key/kms/LoadBalancingKMSClientProvider.java    |  4 +--
 .../apache/hadoop/crypto/key/kms/ValueQueue.java   | 10 +++---
 .../hadoop/crypto/random/OpensslSecureRandom.java  |  2 +-
 .../org/apache/hadoop/fs/AbstractFileSystem.java   |  2 +-
 .../java/org/apache/hadoop/fs/ByteBufferUtil.java  |  2 +-
 .../org/apache/hadoop/fs/ChecksumFileSystem.java   |  2 +-
 .../src/main/java/org/apache/hadoop/fs/DF.java     |  2 +-
 .../src/main/java/org/apache/hadoop/fs/DU.java     |  2 +-
 .../apache/hadoop/fs/DelegationTokenRenewer.java   |  2 +-
 .../hadoop/fs/FSDataOutputStreamBuilder.java       |  2 +-
 .../java/org/apache/hadoop/fs/FSInputStream.java   |  2 +-
 .../java/org/apache/hadoop/fs/FileContext.java     |  4 +--
 .../org/apache/hadoop/fs/FileEncryptionInfo.java   |  4 +--
 .../main/java/org/apache/hadoop/fs/FileSystem.java |  6 ++--
 .../hadoop/fs/FileSystemStorageStatistics.java     |  2 +-
 .../main/java/org/apache/hadoop/fs/FsTracer.java   |  2 +-
 .../java/org/apache/hadoop/fs/FsUrlConnection.java |  2 +-
 .../apache/hadoop/fs/GlobalStorageStatistics.java  |  2 +-
 .../main/java/org/apache/hadoop/fs/Globber.java    |  2 +-
 .../main/java/org/apache/hadoop/fs/HardLink.java   |  2 +-
 .../java/org/apache/hadoop/fs/PartialListing.java  |  2 +-
 .../org/apache/hadoop/fs/RawLocalFileSystem.java   |  2 +-
 .../src/main/java/org/apache/hadoop/fs/Stat.java   |  2 +-
 .../org/apache/hadoop/fs/TrashPolicyDefault.java   |  2 +-
 .../apache/hadoop/fs/UnionStorageStatistics.java   |  2 +-
 .../main/java/org/apache/hadoop/fs/XAttrCodec.java |  2 +-
 .../org/apache/hadoop/fs/ftp/FTPFileSystem.java    |  4 +--
 .../hadoop/fs/impl/AbstractFSBuilderImpl.java      |  6 ++--
 .../hadoop/fs/impl/AbstractMultipartUploader.java  |  4 +--
 .../fs/impl/FileSystemMultipartUploader.java       |  4 +--
 .../apache/hadoop/fs/impl/FsLinkResolution.java    |  2 +-
 .../fs/impl/MultipartUploaderBuilderImpl.java      |  2 +-
 .../hadoop/fs/impl/PathCapabilitiesSupport.java    |  2 +-
 .../apache/hadoop/fs/impl/WrappedIOException.java  |  2 +-
 .../org/apache/hadoop/fs/permission/AclEntry.java  |  2 +-
 .../org/apache/hadoop/fs/permission/AclStatus.java |  6 ++--
 .../org/apache/hadoop/fs/permission/AclUtil.java   |  2 +-
 .../org/apache/hadoop/fs/sftp/SFTPFileSystem.java  |  2 +-
 .../org/apache/hadoop/fs/shell/AclCommands.java    |  2 +-
 .../java/org/apache/hadoop/fs/shell/Concat.java    |  2 +-
 .../org/apache/hadoop/fs/shell/CopyCommands.java   |  2 +-
 .../main/java/org/apache/hadoop/fs/shell/Ls.java   |  2 +-
 .../apache/hadoop/fs/shell/SnapshotCommands.java   |  2 +-
 .../main/java/org/apache/hadoop/fs/shell/Tail.java |  2 +-
 .../org/apache/hadoop/fs/shell/TouchCommands.java  |  2 +-
 .../org/apache/hadoop/fs/shell/XAttrCommands.java  |  2 +-
 .../org/apache/hadoop/fs/viewfs/InodeTree.java     |  2 +-
 .../apache/hadoop/fs/viewfs/ViewFileSystem.java    |  2 +-
 .../java/org/apache/hadoop/fs/viewfs/ViewFs.java   |  2 +-
 .../org/apache/hadoop/ha/ActiveStandbyElector.java |  4 +--
 .../org/apache/hadoop/ha/FailoverController.java   |  2 +-
 .../main/java/org/apache/hadoop/ha/HAAdmin.java    |  2 +-
 .../java/org/apache/hadoop/ha/HAServiceTarget.java |  2 +-
 .../java/org/apache/hadoop/ha/HealthMonitor.java   |  2 +-
 .../main/java/org/apache/hadoop/ha/NodeFencer.java |  4 +--
 .../org/apache/hadoop/ha/ShellCommandFencer.java   |  2 +-
 .../org/apache/hadoop/ha/SshFenceByTcpPort.java    |  2 +-
 .../org/apache/hadoop/ha/ZKFailoverController.java |  6 ++--
 .../java/org/apache/hadoop/http/HttpServer2.java   |  6 ++--
 .../org/apache/hadoop/io/AbstractMapWritable.java  |  2 +-
 .../org/apache/hadoop/io/DataOutputBuffer.java     |  2 +-
 .../apache/hadoop/io/ElasticByteBufferPool.java    |  2 +-
 .../org/apache/hadoop/io/FastByteComparisons.java  |  2 +-
 .../java/org/apache/hadoop/io/ReadaheadPool.java   |  4 +--
 .../java/org/apache/hadoop/io/SecureIOUtils.java   |  2 +-
 .../java/org/apache/hadoop/io/SequenceFile.java    |  2 +-
 .../org/apache/hadoop/io/compress/CodecPool.java   |  6 ++--
 .../hadoop/io/compress/DecompressorStream.java     |  2 +-
 .../hadoop/io/compress/zlib/ZlibFactory.java       |  2 +-
 .../io/compress/zstd/ZStandardCompressor.java      |  2 +-
 .../hadoop/io/erasurecode/CodecRegistry.java       |  2 +-
 .../apache/hadoop/io/erasurecode/CodecUtil.java    |  2 +-
 .../apache/hadoop/io/file/tfile/Compression.java   |  2 +-
 .../org/apache/hadoop/io/nativeio/NativeIO.java    |  2 +-
 .../apache/hadoop/io/retry/AsyncCallHandler.java   |  4 +--
 .../org/apache/hadoop/io/retry/CallReturn.java     |  2 +-
 .../hadoop/io/retry/RetryInvocationHandler.java    |  2 +-
 .../org/apache/hadoop/io/retry/RetryPolicies.java  |  2 +-
 .../org/apache/hadoop/ipc/CallQueueManager.java    |  2 +-
 .../main/java/org/apache/hadoop/ipc/Client.java    |  6 ++--
 .../main/java/org/apache/hadoop/ipc/ClientId.java  |  2 +-
 .../org/apache/hadoop/ipc/DecayRpcScheduler.java   |  6 ++--
 .../java/org/apache/hadoop/ipc/FairCallQueue.java  |  2 +-
 .../org/apache/hadoop/ipc/ProtobufRpcEngine.java   |  2 +-
 .../org/apache/hadoop/ipc/ProtobufRpcEngine2.java  |  2 +-
 .../org/apache/hadoop/ipc/ProtocolSignature.java   |  2 +-
 .../java/org/apache/hadoop/ipc/ProxyCombiner.java  |  2 +-
 .../org/apache/hadoop/ipc/RefreshRegistry.java     |  6 ++--
 .../java/org/apache/hadoop/ipc/RetryCache.java     |  4 +--
 .../main/java/org/apache/hadoop/ipc/Server.java    |  2 +-
 .../metrics/DecayRpcSchedulerDetailedMetrics.java  |  2 +-
 .../org/apache/hadoop/ipc/metrics/RpcMetrics.java  |  2 +-
 .../main/java/org/apache/hadoop/log/LogLevel.java  |  4 +--
 .../org/apache/hadoop/log/LogThrottlingHelper.java |  2 +-
 .../org/apache/hadoop/metrics2/AbstractMetric.java |  4 +--
 .../org/apache/hadoop/metrics2/MetricsTag.java     |  4 +--
 .../metrics2/filter/AbstractPatternFilter.java     |  2 +-
 .../metrics2/impl/AbstractMetricsRecord.java       |  4 +--
 .../hadoop/metrics2/impl/MBeanInfoBuilder.java     |  2 +-
 .../hadoop/metrics2/impl/MetricsCollectorImpl.java |  4 +--
 .../apache/hadoop/metrics2/impl/MetricsConfig.java |  8 ++---
 .../metrics2/impl/MetricsRecordBuilderImpl.java    |  2 +-
 .../metrics2/impl/MetricsRecordFiltered.java       |  2 +-
 .../hadoop/metrics2/impl/MetricsRecordImpl.java    |  2 +-
 .../hadoop/metrics2/impl/MetricsSinkAdapter.java   |  2 +-
 .../hadoop/metrics2/impl/MetricsSourceAdapter.java |  8 ++---
 .../hadoop/metrics2/impl/MetricsSystemImpl.java    |  8 ++---
 .../hadoop/metrics2/lib/DefaultMetricsSystem.java  |  2 +-
 .../apache/hadoop/metrics2/lib/MethodMetric.java   |  2 +-
 .../hadoop/metrics2/lib/MetricsInfoImpl.java       |  4 +--
 .../hadoop/metrics2/lib/MetricsRegistry.java       |  2 +-
 .../hadoop/metrics2/lib/MetricsSourceBuilder.java  |  2 +-
 .../apache/hadoop/metrics2/lib/MutableCounter.java |  2 +-
 .../apache/hadoop/metrics2/lib/MutableGauge.java   |  2 +-
 .../hadoop/metrics2/lib/MutableQuantiles.java      |  4 +--
 .../apache/hadoop/metrics2/lib/MutableRates.java   |  4 +--
 .../metrics2/lib/MutableRatesWithAggregation.java  |  2 +-
 .../metrics2/lib/MutableRollingAverages.java       |  6 ++--
 .../apache/hadoop/metrics2/lib/UniqueNames.java    |  4 +--
 .../metrics2/sink/RollingFileSystemSink.java       |  2 +-
 .../apache/hadoop/metrics2/source/JvmMetrics.java  |  4 +--
 .../org/apache/hadoop/metrics2/util/MBeans.java    |  4 +--
 .../apache/hadoop/metrics2/util/MetricsCache.java  |  2 +-
 .../org/apache/hadoop/metrics2/util/Quantile.java  |  2 +-
 .../hadoop/metrics2/util/SampleQuantiles.java      |  6 ++--
 .../org/apache/hadoop/metrics2/util/Servers.java   |  2 +-
 .../src/main/java/org/apache/hadoop/net/DNS.java   |  2 +-
 .../main/java/org/apache/hadoop/net/NetUtils.java  |  2 +-
 .../org/apache/hadoop/net/NetworkTopology.java     |  6 ++--
 .../org/apache/hadoop/net/SocketInputWrapper.java  |  2 +-
 .../org/apache/hadoop/net/unix/DomainSocket.java   |  2 +-
 .../hadoop/net/unix/DomainSocketWatcher.java       |  6 ++--
 .../java/org/apache/hadoop/security/Groups.java    | 24 +++++++-------
 .../hadoop/security/IngressPortBasedResolver.java  |  2 +-
 .../apache/hadoop/security/LdapGroupsMapping.java  |  2 +-
 .../org/apache/hadoop/security/ProviderUtils.java  |  2 +-
 .../security/RuleBasedLdapGroupsMapping.java       |  2 +-
 .../org/apache/hadoop/security/SaslRpcClient.java  |  2 +-
 .../org/apache/hadoop/security/SecurityUtil.java   |  4 +--
 .../hadoop/security/ShellBasedIdMapping.java       |  6 ++--
 .../security/ShellBasedUnixGroupsMapping.java      |  4 +--
 .../hadoop/security/UserGroupInformation.java      |  2 +-
 .../alias/AbstractJavaKeyStoreProvider.java        |  2 +-
 .../hadoop/security/alias/CredentialShell.java     |  2 +-
 .../authorize/DefaultImpersonationProvider.java    |  2 +-
 .../hadoop/security/authorize/ProxyUsers.java      |  4 +--
 .../authorize/ServiceAuthorizationManager.java     |  2 +-
 .../hadoop/security/http/CrossOriginFilter.java    |  2 +-
 .../security/ssl/DelegatingSSLSocketFactory.java   |  2 +-
 .../security/ssl/FileBasedKeyStoresFactory.java    |  2 +-
 .../security/ssl/ReloadingX509TrustManager.java    |  2 +-
 .../org/apache/hadoop/security/token/Token.java    |  4 +--
 .../AbstractDelegationTokenIdentifier.java         |  2 +-
 .../AbstractDelegationTokenSecretManager.java      |  2 +-
 .../delegation/ZKDelegationTokenSecretManager.java |  4 +--
 .../web/DelegationTokenAuthenticatedURL.java       |  2 +-
 .../web/DelegationTokenAuthenticationFilter.java   |  2 +-
 .../web/DelegationTokenAuthenticationHandler.java  |  2 +-
 .../delegation/web/DelegationTokenManager.java     |  2 +-
 ...SchemeDelegationTokenAuthenticationHandler.java |  4 +--
 .../org/apache/hadoop/service/AbstractService.java |  2 +-
 .../service/launcher/InterruptEscalator.java       |  2 +-
 .../apache/hadoop/service/launcher/IrqHandler.java |  2 +-
 .../hadoop/service/launcher/ServiceLauncher.java   |  4 +--
 .../org/apache/hadoop/util/AutoCloseableLock.java  |  2 +-
 .../util/BlockingThreadPoolExecutorService.java    |  2 +-
 .../org/apache/hadoop/util/ChunkedArrayList.java   |  8 ++---
 .../hadoop/util/CloseableReferenceCount.java       |  2 +-
 .../org/apache/hadoop/util/DirectBufferPool.java   |  2 +-
 .../java/org/apache/hadoop/util/DiskChecker.java   |  2 +-
 .../apache/hadoop/util/DiskValidatorFactory.java   |  2 +-
 .../java/org/apache/hadoop/util/FindClass.java     |  2 +-
 .../java/org/apache/hadoop/util/GcTimeMonitor.java |  2 +-
 .../org/apache/hadoop/util/IdentityHashStore.java  |  2 +-
 .../org/apache/hadoop/util/InstrumentedLock.java   |  2 +-
 .../apache/hadoop/util/InstrumentedReadLock.java   |  2 +-
 .../apache/hadoop/util/InstrumentedWriteLock.java  |  2 +-
 .../apache/hadoop/util/IntrusiveCollection.java    |  2 +-
 .../org/apache/hadoop/util/JsonSerialization.java  |  2 +-
 .../org/apache/hadoop/util/JvmPauseMonitor.java    | 10 +++---
 .../org/apache/hadoop/util/LightWeightCache.java   |  4 +--
 .../org/apache/hadoop/util/LightWeightGSet.java    |  2 +-
 .../org/apache/hadoop/util/LimitInputStream.java   |  4 +--
 .../java/org/apache/hadoop/util/MachineList.java   |  2 +-
 .../java/org/apache/hadoop/util/NativeCrc32.java   |  2 +-
 .../hadoop/util/ReadWriteDiskValidatorMetrics.java |  2 +-
 .../hadoop/util/SemaphoredDelegatingExecutor.java  |  8 ++---
 .../java/org/apache/hadoop/util/ServletUtil.java   |  2 +-
 .../main/java/org/apache/hadoop/util/Shell.java    |  2 +-
 .../apache/hadoop/util/ShutdownHookManager.java    |  4 +--
 .../apache/hadoop/util/ShutdownThreadsHelper.java  |  2 +-
 .../org/apache/hadoop/util/StringInterner.java     |  4 +--
 .../java/org/apache/hadoop/util/StringUtils.java   |  4 +--
 .../java/org/apache/hadoop/util/SysInfoLinux.java  |  2 +-
 .../org/apache/hadoop/util/SysInfoWindows.java     |  2 +-
 .../main/java/org/apache/hadoop/util/ZKUtil.java   |  8 ++---
 .../hadoop/util/concurrent/AsyncGetFuture.java     |  2 +-
 .../apache/hadoop/util/curator/ChildReaper.java    |  2 +-
 .../hadoop/util/curator/ZKCuratorManager.java      |  2 +-
 .../org/apache/hadoop/conf/TestConfServlet.java    |  2 +-
 .../hadoop/conf/TestConfigurationDeprecation.java  |  4 +--
 .../apache/hadoop/conf/TestReconfiguration.java    |  2 +-
 .../org/apache/hadoop/crypto/TestCryptoCodec.java  |  2 +-
 .../apache/hadoop/crypto/key/TestValueQueue.java   |  2 +-
 .../kms/TestLoadBalancingKMSClientProvider.java    |  2 +-
 .../org/apache/hadoop/fs/FCStatisticsBaseTest.java |  2 +-
 .../apache/hadoop/fs/TestFileSystemCaching.java    |  4 +--
 .../org/apache/hadoop/fs/TestLocalFileSystem.java  |  2 +-
 .../test/java/org/apache/hadoop/fs/TestPath.java   |  2 +-
 .../AbstractContractMultipartUploaderTest.java     |  2 +-
 .../apache/hadoop/fs/ftp/TestFTPFileSystem.java    |  2 +-
 .../hadoop/fs/loadGenerator/LoadGenerator.java     |  2 +-
 .../org/apache/hadoop/ha/ClientBaseWithFixes.java  |  2 +-
 .../java/org/apache/hadoop/ha/DummyHAService.java  |  2 +-
 .../java/org/apache/hadoop/ha/MiniZKFCCluster.java |  4 +--
 .../hadoop/ha/TestActiveStandbyElectorRealZK.java  |  2 +-
 .../java/org/apache/hadoop/ha/TestHAAdmin.java     |  4 +--
 .../java/org/apache/hadoop/ha/TestNodeFencer.java  |  2 +-
 .../apache/hadoop/ha/TestShellCommandFencer.java   |  2 +-
 .../test/java/org/apache/hadoop/io/TestText.java   |  4 +--
 .../io/compress/CompressDecompressTester.java      |  8 ++---
 .../io/compress/TestCompressorDecompressor.java    |  2 +-
 .../zlib/TestZlibCompressorDecompressor.java       |  2 +-
 .../rawcoder/RawErasureCoderBenchmark.java         |  2 +-
 .../org/apache/hadoop/ipc/RPCCallBenchmark.java    |  2 +-
 .../test/java/org/apache/hadoop/ipc/TestIPC.java   |  4 +--
 .../metrics2/impl/TestMetricsSourceAdapter.java    |  2 +-
 .../metrics2/impl/TestMetricsSystemImpl.java       |  2 +-
 .../apache/hadoop/net/MockDomainNameResolver.java  |  2 +-
 .../org/apache/hadoop/net/TestTableMapping.java    |  4 +--
 .../apache/hadoop/net/unix/TestDomainSocket.java   |  2 +-
 .../hadoop/net/unix/TestDomainSocketWatcher.java   |  2 +-
 .../TestLdapGroupsMappingWithBindUserSwitch.java   |  2 +-
 .../apache/hadoop/security/TestSecurityUtil.java   |  2 +-
 .../hadoop/security/TestShellBasedIdMapping.java   |  4 +--
 .../org/apache/hadoop/test/GenericTestUtils.java   |  4 +--
 .../org/apache/hadoop/test/LambdaTestUtils.java    |  2 +-
 .../org/apache/hadoop/test/MetricsAsserts.java     |  2 +-
 .../java/org/apache/hadoop/util/JarFinder.java     |  2 +-
 .../hadoop/util/TestApplicationClassLoader.java    |  4 +--
 .../apache/hadoop/util/TestDirectBufferPool.java   |  2 +-
 .../hadoop/util/TestGenericOptionsParser.java      |  2 +-
 .../org/apache/hadoop/util/TestMachineList.java    |  2 +-
 .../java/org/apache/hadoop/util/TestZKUtil.java    |  4 +--
 .../hadoop/util/bloom/BloomFilterCommonTester.java |  4 +--
 .../apache/hadoop/util/bloom/TestBloomFilters.java |  6 ++--
 hadoop-common-project/hadoop-kms/pom.xml           |  4 +--
 .../apache/hadoop/crypto/key/kms/server/KMS.java   |  2 +-
 .../hadoop/crypto/key/kms/server/KMSACLs.java      |  2 +-
 .../hadoop/crypto/key/kms/server/KMSAudit.java     | 18 +++++------
 .../key/kms/server/KMSAuthenticationFilter.java    |  2 +-
 .../hadoop/crypto/key/kms/server/KMSMDCFilter.java |  2 +-
 .../hadoop/crypto/key/kms/server/KMSWebApp.java    |  2 +-
 .../kms/server/KeyAuthorizationKeyProvider.java    |  6 ++--
 .../key/kms/server/SimpleKMSAuditLogger.java       |  4 +--
 .../hadoop/crypto/key/kms/server/MiniKMS.java      |  2 +-
 .../hadoop/crypto/key/kms/server/TestKMS.java      |  2 +-
 hadoop-common-project/hadoop-nfs/pom.xml           |  4 +--
 .../java/org/apache/hadoop/nfs/NfsExports.java     |  2 +-
 .../hadoop/nfs/nfs3/request/LOOKUP3Request.java    |  2 +-
 .../hadoop/nfs/nfs3/request/READ3Request.java      |  2 +-
 .../hadoop/nfs/nfs3/response/READDIR3Response.java |  2 +-
 .../nfs/nfs3/response/READDIRPLUS3Response.java    |  2 +-
 .../org/apache/hadoop/oncrpc/RpcCallCache.java     |  2 +-
 .../java/org/apache/hadoop/oncrpc/RpcProgram.java  |  2 +-
 .../java/org/apache/hadoop/oncrpc/RpcReply.java    |  2 +-
 .../main/java/org/apache/hadoop/oncrpc/XDR.java    |  4 +--
 .../apache/hadoop/oncrpc/security/Credentials.java |  2 +-
 .../hadoop/oncrpc/security/CredentialsNone.java    |  2 +-
 .../hadoop/oncrpc/security/CredentialsSys.java     |  2 +-
 .../hadoop/oncrpc/security/VerifierNone.java       |  2 +-
 .../java/org/apache/hadoop/portmap/Portmap.java    |  2 +-
 hadoop-common-project/hadoop-registry/pom.xml      |  4 +--
 .../apache/hadoop/registry/cli/RegistryCli.java    |  2 +-
 .../registry/client/api/DNSOperationsFactory.java  |  2 +-
 .../client/api/RegistryOperationsFactory.java      |  2 +-
 .../registry/client/binding/RegistryPathUtils.java |  2 +-
 .../registry/client/binding/RegistryTypeUtils.java |  2 +-
 .../registry/client/binding/RegistryUtils.java     |  4 +--
 .../client/impl/FSRegistryOperationsService.java   |  4 +--
 .../registry/client/impl/zk/CuratorService.java    |  4 +--
 .../client/impl/zk/RegistryOperationsService.java  |  2 +-
 .../registry/client/impl/zk/RegistrySecurity.java  |  6 ++--
 .../registry/client/impl/zk/ZKPathDumper.java      |  4 +--
 .../hadoop/registry/client/types/Endpoint.java     |  2 +-
 .../registry/client/types/ServiceRecord.java       |  2 +-
 .../hadoop/registry/server/dns/RegistryDNS.java    |  2 +-
 .../registry/server/dns/RegistryDNSServer.java     |  2 +-
 .../registry/server/dns/ReverseZoneUtils.java      |  2 +-
 .../integration/SelectByYarnPersistence.java       |  2 +-
 .../server/services/MicroZookeeperService.java     |  2 +-
 .../server/services/RegistryAdminService.java      |  2 +-
 .../java/org/apache/hadoop/hdfs/ClientContext.java |  2 +-
 .../java/org/apache/hadoop/hdfs/DFSClient.java     | 10 +++---
 .../apache/hadoop/hdfs/DFSClientFaultInjector.java |  2 +-
 .../org/apache/hadoop/hdfs/DFSInputStream.java     |  2 +-
 .../org/apache/hadoop/hdfs/DFSOutputStream.java    |  4 +--
 .../apache/hadoop/hdfs/DFSStripedInputStream.java  |  2 +-
 .../apache/hadoop/hdfs/DFSStripedOutputStream.java |  4 +--
 .../java/org/apache/hadoop/hdfs/DFSUtilClient.java |  8 ++---
 .../java/org/apache/hadoop/hdfs/DataStreamer.java  | 12 +++----
 .../org/apache/hadoop/hdfs/DeadNodeDetector.java   |  2 +-
 .../apache/hadoop/hdfs/DistributedFileSystem.java  |  6 ++--
 .../org/apache/hadoop/hdfs/KeyProviderCache.java   | 10 +++---
 .../apache/hadoop/hdfs/NameNodeProxiesClient.java  |  4 +--
 .../java/org/apache/hadoop/hdfs/PeerCache.java     |  6 ++--
 .../apache/hadoop/hdfs/PositionStripeReader.java   |  2 +-
 .../apache/hadoop/hdfs/StatefulStripeReader.java   |  2 +-
 .../java/org/apache/hadoop/hdfs/StripeReader.java  |  2 +-
 .../apache/hadoop/hdfs/StripedDataStreamer.java    |  2 +-
 .../java/org/apache/hadoop/hdfs/XAttrHelper.java   |  6 ++--
 .../hadoop/hdfs/client/HdfsDataInputStream.java    |  2 +-
 .../hadoop/hdfs/client/HdfsDataOutputStream.java   |  2 +-
 .../hdfs/client/impl/BlockReaderFactory.java       |  8 ++---
 .../hadoop/hdfs/client/impl/BlockReaderLocal.java  |  4 +--
 .../hadoop/hdfs/client/impl/BlockReaderRemote.java |  2 +-
 .../hadoop/hdfs/client/impl/DfsClientConf.java     |  4 +--
 .../hadoop/hdfs/client/impl/LeaseRenewer.java      |  2 +-
 .../client/impl/SnapshotDiffReportGenerator.java   |  2 +-
 .../impl/metrics/BlockReaderLocalMetrics.java      |  2 +-
 .../hadoop/hdfs/protocol/BlockStoragePolicy.java   |  2 +-
 .../hadoop/hdfs/protocol/CacheDirectiveInfo.java   |  2 +-
 .../hdfs/protocol/CacheDirectiveIterator.java      |  2 +-
 .../apache/hadoop/hdfs/protocol/DatanodeID.java    |  2 +-
 .../hadoop/hdfs/protocol/ErasureCodingPolicy.java  |  2 +-
 .../hdfs/protocol/ErasureCodingPolicyInfo.java     |  2 +-
 .../hadoop/hdfs/protocol/HdfsPartialListing.java   |  2 +-
 .../apache/hadoop/hdfs/protocol/LocatedBlock.java  |  4 +--
 .../hadoop/hdfs/protocol/ReencryptionStatus.java   |  6 ++--
 .../hadoop/hdfs/protocol/SnapshotDiffReport.java   |  2 +-
 .../hdfs/protocol/SnapshotDiffReportListing.java   |  2 +-
 .../hdfs/protocol/ZoneReencryptionStatus.java      |  2 +-
 .../hdfs/protocol/datatransfer/PacketHeader.java   |  6 ++--
 .../hdfs/protocol/datatransfer/PacketReceiver.java |  4 +--
 .../hdfs/protocol/datatransfer/PipelineAck.java    |  2 +-
 .../datatransfer/sasl/DataTransferSaslUtil.java    |  8 ++---
 .../datatransfer/sasl/SaslDataTransferClient.java  |  6 ++--
 .../ClientNamenodeProtocolTranslatorPB.java        |  2 +-
 .../hadoop/hdfs/protocolPB/PBHelperClient.java     | 12 +++----
 .../protocolPB/ReconfigurationProtocolUtils.java   |  2 +-
 .../security/token/block/BlockTokenIdentifier.java |  2 +-
 .../delegation/DelegationTokenIdentifier.java      |  2 +-
 .../hdfs/server/datanode/BlockMetadataHeader.java  |  2 +-
 .../hdfs/server/datanode/DiskBalancerWorkItem.java |  2 +-
 .../server/datanode/DiskBalancerWorkStatus.java    |  2 +-
 .../namenode/ha/ObserverReadProxyProvider.java     |  2 +-
 .../hdfs/server/protocol/SlowDiskReports.java      |  2 +-
 .../hdfs/server/protocol/SlowPeerReports.java      |  2 +-
 .../hadoop/hdfs/shortcircuit/DfsClientShm.java     |  2 +-
 .../hdfs/shortcircuit/DfsClientShmManager.java     |  4 +--
 .../hdfs/shortcircuit/DomainSocketFactory.java     |  8 ++---
 .../hdfs/shortcircuit/ShortCircuitCache.java       |  6 ++--
 .../hdfs/shortcircuit/ShortCircuitReplica.java     |  4 +--
 .../hadoop/hdfs/shortcircuit/ShortCircuitShm.java  |  6 ++--
 .../apache/hadoop/hdfs/util/ByteArrayManager.java  |  2 +-
 .../apache/hadoop/hdfs/util/StripedBlockUtil.java  |  4 +--
 .../hadoop/hdfs/web/ByteRangeInputStream.java      |  4 +--
 .../org/apache/hadoop/hdfs/web/JsonUtilClient.java |  6 ++--
 .../org/apache/hadoop/hdfs/web/TokenAspect.java    |  2 +-
 .../hadoop/hdfs/web/URLConnectionFactory.java      |  2 +-
 .../apache/hadoop/hdfs/web/WebHdfsFileSystem.java  |  8 ++---
 .../hdfs/web/resources/AclPermissionParam.java     |  2 +-
 .../hadoop/hdfs/web/resources/UserParam.java       |  2 +-
 .../java/org/apache/hadoop/hdfs/TestPeerCache.java |  2 +-
 .../ha/TestRequestHedgingProxyProvider.java        |  2 +-
 .../hadoop/hdfs/web/TestByteRangeInputStream.java  |  2 +-
 .../hadoop/hdfs/web/TestURLConnectionFactory.java  |  2 +-
 hadoop-hdfs-project/hadoop-hdfs-httpfs/pom.xml     |  4 +--
 .../hadoop/fs/http/client/HttpFSFileSystem.java    |  8 ++---
 .../apache/hadoop/fs/http/server/HttpFSServer.java |  2 +-
 .../apache/hadoop/lib/servlet/ServerWebApp.java    |  2 +-
 .../org/apache/hadoop/lib/wsrs/Parameters.java     |  2 +-
 .../apache/hadoop/lib/wsrs/ParametersProvider.java |  2 +-
 .../hadoop/fs/http/client/BaseTestHttpFSWith.java  |  2 +-
 .../hadoop/fs/http/server/TestHttpFSServer.java    |  2 +-
 hadoop-hdfs-project/hadoop-hdfs-nfs/pom.xml        |  4 +--
 .../hadoop/hdfs/nfs/mount/RpcProgramMountd.java    |  2 +-
 .../hadoop/hdfs/nfs/nfs3/DFSClientCache.java       | 16 +++++-----
 .../java/org/apache/hadoop/hdfs/nfs/nfs3/Nfs3.java |  2 +-
 .../apache/hadoop/hdfs/nfs/nfs3/OffsetRange.java   |  2 +-
 .../apache/hadoop/hdfs/nfs/nfs3/OpenFileCtx.java   |  4 +--
 .../hadoop/hdfs/nfs/nfs3/OpenFileCtxCache.java     |  6 ++--
 .../hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java       |  2 +-
 .../org/apache/hadoop/hdfs/nfs/nfs3/WriteCtx.java  |  4 +--
 .../apache/hadoop/hdfs/nfs/nfs3/WriteManager.java  |  2 +-
 .../metrics/FederationRPCPerformanceMonitor.java   |  2 +-
 .../federation/metrics/NamenodeBeanMetrics.java    |  6 ++--
 .../hdfs/server/federation/metrics/RBFMetrics.java |  2 +-
 .../federation/metrics/StateStoreMetrics.java      |  2 +-
 .../federation/resolver/MountTableResolver.java    |  6 ++--
 .../MultipleDestinationMountTableResolver.java     |  2 +-
 .../resolver/order/AvailableSpaceResolver.java     |  2 +-
 .../federation/resolver/order/HashResolver.java    |  2 +-
 .../federation/resolver/order/LocalResolver.java   |  4 +--
 .../federation/resolver/order/RandomResolver.java  |  2 +-
 .../federation/router/ConnectionManager.java       |  2 +-
 .../server/federation/router/ConnectionPool.java   |  2 +-
 .../server/federation/router/ConnectionPoolId.java |  2 +-
 .../router/MountTableRefresherService.java         | 14 ++++----
 .../server/federation/router/PeriodicService.java  |  2 +-
 .../hdfs/server/federation/router/Quota.java       |  4 +--
 .../hdfs/server/federation/router/Router.java      |  2 +-
 .../federation/router/RouterAdminServer.java       |  4 +--
 .../federation/router/RouterClientProtocol.java    |  2 +-
 .../federation/router/RouterHeartbeatService.java  |  2 +-
 .../server/federation/router/RouterRpcClient.java  |  4 +--
 .../server/federation/router/RouterRpcServer.java  |  2 +-
 .../router/security/RouterSecurityManager.java     |  2 +-
 .../server/federation/store/StateStoreService.java |  2 +-
 .../store/driver/impl/StateStoreFileBaseImpl.java  |  2 +-
 .../store/driver/impl/StateStoreFileImpl.java      |  2 +-
 .../federation/store/records/BaseRecord.java       |  2 +-
 .../router/TestRouterPolicyProvider.java           |  2 +-
 .../server/federation/router/TestRouterRpc.java    |  2 +-
 hadoop-hdfs-project/hadoop-hdfs/pom.xml            |  4 +--
 .../main/java/org/apache/hadoop/hdfs/DFSUtil.java  | 10 +++---
 .../main/java/org/apache/hadoop/hdfs/HAUtil.java   |  6 ++--
 .../apache/hadoop/hdfs/net/DFSNetworkTopology.java |  4 +--
 .../hadoop/hdfs/net/DFSTopologyNodeImpl.java       |  4 +--
 .../hadoop/hdfs/protocol/BlockListAsLongs.java     |  4 +--
 .../hadoop/hdfs/protocol/CacheDirective.java       |  4 +--
 .../apache/hadoop/hdfs/protocol/LayoutFlags.java   |  8 ++---
 .../datatransfer/sasl/SaslDataTransferServer.java  |  6 ++--
 .../DatanodeProtocolClientSideTranslatorPB.java    |  2 +-
 .../DatanodeProtocolServerSideTranslatorPB.java    |  2 +-
 .../hadoop/hdfs/qjournal/client/AsyncLogger.java   |  2 +-
 .../hdfs/qjournal/client/AsyncLoggerSet.java       | 12 +++----
 .../hdfs/qjournal/client/IPCLoggerChannel.java     | 20 ++++++------
 .../qjournal/client/IPCLoggerChannelMetrics.java   |  2 +-
 .../hadoop/hdfs/qjournal/client/QuorumCall.java    | 14 ++++----
 .../hdfs/qjournal/client/QuorumException.java      |  4 +--
 .../hdfs/qjournal/client/QuorumJournalManager.java |  8 ++---
 .../qjournal/client/SegmentRecoveryComparator.java |  6 ++--
 .../hadoop/hdfs/qjournal/server/JNStorage.java     |  2 +-
 .../hadoop/hdfs/qjournal/server/Journal.java       |  8 ++---
 .../hdfs/qjournal/server/JournalFaultInjector.java |  2 +-
 .../hadoop/hdfs/qjournal/server/JournalNode.java   |  8 ++---
 .../hdfs/qjournal/server/JournalNodeRpcServer.java |  2 +-
 .../hdfs/qjournal/server/JournalNodeSyncer.java    |  6 ++--
 .../hdfs/qjournal/server/JournaledEditsCache.java  |  2 +-
 .../token/block/BlockPoolTokenSecretManager.java   |  2 +-
 .../token/block/BlockTokenSecretManager.java       | 10 +++---
 .../delegation/DelegationTokenSecretManager.java   |  4 +--
 .../hdfs/server/aliasmap/InMemoryAliasMap.java     |  4 +--
 .../hadoop/hdfs/server/balancer/Balancer.java      |  6 ++--
 .../hadoop/hdfs/server/balancer/Dispatcher.java    |  4 +--
 .../hdfs/server/balancer/NameNodeConnector.java    |  6 ++--
 .../AvailableSpaceBlockPlacementPolicy.java        |  2 +-
 .../server/blockmanagement/BlockIdManager.java     |  4 +--
 .../hdfs/server/blockmanagement/BlockInfo.java     |  2 +-
 .../blockmanagement/BlockInfoContiguous.java       |  2 +-
 .../server/blockmanagement/BlockInfoStriped.java   |  4 +--
 .../hdfs/server/blockmanagement/BlockManager.java  |  4 +--
 .../blockmanagement/BlockManagerFaultInjector.java |  2 +-
 .../blockmanagement/BlockManagerSafeMode.java      |  4 +--
 .../blockmanagement/BlockPlacementPolicy.java      |  2 +-
 .../BlockPlacementPolicyDefault.java               |  4 +--
 .../blockmanagement/BlockReportLeaseManager.java   |  2 +-
 .../blockmanagement/BlockStoragePolicySuite.java   |  6 ++--
 .../server/blockmanagement/BlockToMarkCorrupt.java |  2 +-
 .../blockmanagement/CacheReplicationMonitor.java   |  2 +-
 .../blockmanagement/CombinedHostFileManager.java   |  8 ++---
 .../server/blockmanagement/CorruptReplicasMap.java |  2 +-
 .../DatanodeAdminBackoffMonitor.java               |  2 +-
 .../DatanodeAdminDefaultMonitor.java               |  2 +-
 .../blockmanagement/DatanodeAdminManager.java      |  6 ++--
 .../server/blockmanagement/DatanodeDescriptor.java |  2 +-
 .../server/blockmanagement/DatanodeManager.java    |  6 ++--
 .../blockmanagement/DatanodeStorageInfo.java       |  2 +-
 .../blockmanagement/ExcessRedundancyMap.java       |  2 +-
 .../server/blockmanagement/HeartbeatManager.java   |  2 +-
 .../server/blockmanagement/HostFileManager.java    |  2 +-
 .../hdfs/server/blockmanagement/HostSet.java       |  8 ++---
 .../server/blockmanagement/InvalidateBlocks.java   |  2 +-
 .../blockmanagement/PendingDataNodeMessages.java   |  4 +--
 .../PendingReconstructionBlocks.java               |  2 +-
 .../blockmanagement/PendingRecoveryBlocks.java     |  2 +-
 .../server/blockmanagement/ProvidedStorageMap.java |  2 +-
 .../server/blockmanagement/SlowDiskTracker.java    |  8 ++---
 .../server/blockmanagement/SlowPeerTracker.java    |  6 ++--
 .../hdfs/server/common/HdfsServerConstants.java    |  2 +-
 .../apache/hadoop/hdfs/server/common/Storage.java  |  4 +--
 .../hadoop/hdfs/server/common/StorageInfo.java     |  2 +-
 .../org/apache/hadoop/hdfs/server/common/Util.java |  4 +--
 .../blockaliasmap/impl/TextFileRegionAliasMap.java |  2 +-
 .../hdfs/server/datanode/BPOfferService.java       |  8 ++---
 .../hdfs/server/datanode/BPServiceActor.java       |  4 +--
 .../hdfs/server/datanode/BlockChecksumHelper.java  |  2 +-
 .../hdfs/server/datanode/BlockPoolManager.java     | 10 +++---
 .../server/datanode/BlockPoolSliceStorage.java     |  6 ++--
 .../hadoop/hdfs/server/datanode/BlockReceiver.java |  2 +-
 .../hdfs/server/datanode/BlockRecoveryWorker.java  |  6 ++--
 .../hadoop/hdfs/server/datanode/BlockScanner.java  |  6 ++--
 .../hadoop/hdfs/server/datanode/BlockSender.java   |  4 +--
 .../hadoop/hdfs/server/datanode/DataNode.java      | 14 ++++----
 .../server/datanode/DataNodeFaultInjector.java     |  2 +-
 .../hadoop/hdfs/server/datanode/DataStorage.java   |  8 ++---
 .../hadoop/hdfs/server/datanode/DataXceiver.java   |  4 +--
 .../hdfs/server/datanode/DataXceiverServer.java    |  4 +--
 .../hdfs/server/datanode/DirectoryScanner.java     |  6 ++--
 .../hadoop/hdfs/server/datanode/DiskBalancer.java  |  4 +--
 .../datanode/IncrementalBlockReportManager.java    |  4 +--
 .../hadoop/hdfs/server/datanode/LocalReplica.java  |  2 +-
 .../hdfs/server/datanode/ProvidedReplica.java      |  2 +-
 .../server/datanode/SecureDataNodeStarter.java     |  2 +-
 .../hdfs/server/datanode/ShortCircuitRegistry.java |  8 ++---
 .../hadoop/hdfs/server/datanode/VolumeScanner.java |  8 ++---
 .../server/datanode/VolumeScannerCBInjector.java   |  2 +-
 .../server/datanode/checker/AbstractFuture.java    | 20 ++++++------
 .../hdfs/server/datanode/checker/AsyncChecker.java |  2 +-
 .../datanode/checker/DatasetVolumeChecker.java     | 16 +++++-----
 .../datanode/checker/StorageLocationChecker.java   |  6 ++--
 .../datanode/checker/ThrottledAsyncChecker.java    | 10 +++---
 .../server/datanode/checker/TimeoutFuture.java     |  4 +--
 .../datanode/erasurecode/ErasureCodingWorker.java  |  2 +-
 .../server/datanode/erasurecode/StripedReader.java |  2 +-
 .../datanode/erasurecode/StripedReconstructor.java |  2 +-
 .../server/datanode/erasurecode/StripedWriter.java |  2 +-
 .../datanode/fsdataset/impl/BlockPoolSlice.java    |  2 +-
 .../server/datanode/fsdataset/impl/CacheStats.java |  2 +-
 .../datanode/fsdataset/impl/FsDatasetCache.java    |  4 +--
 .../datanode/fsdataset/impl/FsDatasetImpl.java     |  8 ++---
 .../datanode/fsdataset/impl/FsDatasetUtil.java     |  2 +-
 .../datanode/fsdataset/impl/FsVolumeImpl.java      |  8 ++---
 .../fsdataset/impl/FsVolumeImplBuilder.java        |  2 +-
 .../fsdataset/impl/MappableBlockLoader.java        |  2 +-
 .../impl/NativePmemMappableBlockLoader.java        |  2 +-
 .../datanode/fsdataset/impl/PmemVolumeManager.java |  2 +-
 .../fsdataset/impl/ProvidedVolumeImpl.java         |  2 +-
 .../fsdataset/impl/RamDiskReplicaLruTracker.java   |  2 +-
 .../fsdataset/impl/RamDiskReplicaTracker.java      |  2 +-
 .../datanode/metrics/DataNodeDiskMetrics.java      |  6 ++--
 .../server/datanode/metrics/OutlierDetector.java   |  4 +--
 .../HostRestrictingAuthorizationFilterHandler.java |  2 +-
 .../datanode/web/webhdfs/DataNodeUGIProvider.java  |  6 ++--
 .../datanode/web/webhdfs/ExceptionHandler.java     |  2 +-
 .../datanode/web/webhdfs/WebHdfsHandler.java       |  2 +-
 .../server/diskbalancer/command/CancelCommand.java |  2 +-
 .../hdfs/server/diskbalancer/command/Command.java  |  6 ++--
 .../diskbalancer/command/ExecuteCommand.java       |  2 +-
 .../server/diskbalancer/command/HelpCommand.java   |  2 +-
 .../server/diskbalancer/command/PlanCommand.java   |  4 +--
 .../server/diskbalancer/command/QueryCommand.java  |  2 +-
 .../server/diskbalancer/command/ReportCommand.java |  4 +--
 .../connectors/DBNameNodeConnector.java            |  2 +-
 .../diskbalancer/connectors/JsonNodeConnector.java |  2 +-
 .../datamodel/DiskBalancerCluster.java             |  2 +-
 .../datamodel/DiskBalancerDataNode.java            |  2 +-
 .../datamodel/DiskBalancerVolumeSet.java           |  2 +-
 .../server/diskbalancer/planner/GreedyPlanner.java |  2 +-
 .../hdfs/server/diskbalancer/planner/NodePlan.java |  2 +-
 .../org/apache/hadoop/hdfs/server/mover/Mover.java |  6 ++--
 .../hdfs/server/namenode/AclEntryStatusFormat.java |  2 +-
 .../hadoop/hdfs/server/namenode/AclFeature.java    |  4 +--
 .../hadoop/hdfs/server/namenode/AclStorage.java    |  6 ++--
 .../hdfs/server/namenode/AclTransformation.java    |  8 ++---
 .../hadoop/hdfs/server/namenode/BackupImage.java   |  4 +--
 .../hadoop/hdfs/server/namenode/BackupNode.java    |  2 +-
 .../hadoop/hdfs/server/namenode/CacheManager.java  |  8 ++---
 .../hadoop/hdfs/server/namenode/CachePool.java     |  2 +-
 .../hdfs/server/namenode/CheckpointConf.java       |  2 +-
 .../hdfs/server/namenode/CheckpointSignature.java  |  2 +-
 .../hadoop/hdfs/server/namenode/Checkpointer.java  |  4 +--
 .../namenode/ContentSummaryComputationContext.java |  2 +-
 .../server/namenode/EditLogBackupInputStream.java  |  2 +-
 .../server/namenode/EditLogFileInputStream.java    |  6 ++--
 .../server/namenode/EditLogFileOutputStream.java   |  2 +-
 .../hdfs/server/namenode/EditsDoubleBuffer.java    |  2 +-
 .../server/namenode/EncryptionFaultInjector.java   |  2 +-
 .../server/namenode/EncryptionZoneManager.java     |  8 ++---
 .../namenode/ErasureCodingPolicyManager.java       |  4 +--
 .../hadoop/hdfs/server/namenode/FSDirAclOp.java    |  2 +-
 .../hadoop/hdfs/server/namenode/FSDirAppendOp.java |  2 +-
 .../hadoop/hdfs/server/namenode/FSDirAttrOp.java   |  2 +-
 .../hadoop/hdfs/server/namenode/FSDirConcatOp.java |  2 +-
 .../server/namenode/FSDirEncryptionZoneOp.java     |  4 +--
 .../hdfs/server/namenode/FSDirErasureCodingOp.java |  4 +--
 .../hadoop/hdfs/server/namenode/FSDirMkdirOp.java  |  2 +-
 .../hadoop/hdfs/server/namenode/FSDirRenameOp.java |  2 +-
 .../namenode/FSDirSatisfyStoragePolicyOp.java      |  2 +-
 .../server/namenode/FSDirStatAndListingOp.java     |  2 +-
 .../hdfs/server/namenode/FSDirTruncateOp.java      |  2 +-
 .../hdfs/server/namenode/FSDirWriteFileOp.java     |  2 +-
 .../hadoop/hdfs/server/namenode/FSDirXAttrOp.java  |  6 ++--
 .../hadoop/hdfs/server/namenode/FSDirectory.java   |  6 ++--
 .../hadoop/hdfs/server/namenode/FSEditLog.java     |  6 ++--
 .../hdfs/server/namenode/FSEditLogAsync.java       |  4 +--
 .../hdfs/server/namenode/FSEditLogLoader.java      |  6 ++--
 .../hadoop/hdfs/server/namenode/FSEditLogOp.java   | 10 +++---
 .../hadoop/hdfs/server/namenode/FSImage.java       |  6 ++--
 .../hadoop/hdfs/server/namenode/FSImageFormat.java |  4 +--
 .../hdfs/server/namenode/FSImageFormatPBINode.java |  4 +--
 .../server/namenode/FSImageFormatProtobuf.java     |  4 +--
 .../hdfs/server/namenode/FSImageSerialization.java |  2 +-
 .../FSImageTransactionalStorageInspector.java      |  4 +--
 .../hadoop/hdfs/server/namenode/FSNamesystem.java  | 14 ++++----
 .../hdfs/server/namenode/FSNamesystemLock.java     |  2 +-
 .../hdfs/server/namenode/FSPermissionChecker.java  |  2 +-
 .../hdfs/server/namenode/FSTreeTraverser.java      |  2 +-
 .../hdfs/server/namenode/FileJournalManager.java   | 10 +++---
 .../apache/hadoop/hdfs/server/namenode/INode.java  |  8 ++---
 .../server/namenode/INodeAttributeProvider.java    |  2 +-
 .../hdfs/server/namenode/INodeDirectory.java       |  4 +--
 .../server/namenode/INodeDirectoryAttributes.java  |  2 +-
 .../hadoop/hdfs/server/namenode/INodeFile.java     |  4 +--
 .../hadoop/hdfs/server/namenode/INodeMap.java      |  2 +-
 .../hdfs/server/namenode/INodeReference.java       |  2 +-
 .../server/namenode/INodeWithAdditionalFields.java |  2 +-
 .../hadoop/hdfs/server/namenode/INodesInPath.java  |  2 +-
 .../hadoop/hdfs/server/namenode/ImageServlet.java  |  4 +--
 .../namenode/InotifyFSEditLogOpTranslator.java     |  2 +-
 .../hadoop/hdfs/server/namenode/JournalSet.java    |  8 ++---
 .../hadoop/hdfs/server/namenode/LeaseManager.java  |  6 ++--
 .../hadoop/hdfs/server/namenode/NNStorage.java     |  6 ++--
 .../server/namenode/NNStorageRetentionManager.java |  8 ++---
 .../hadoop/hdfs/server/namenode/NNUpgradeUtil.java |  2 +-
 .../hadoop/hdfs/server/namenode/NameNode.java      | 10 +++---
 .../hdfs/server/namenode/NameNodeHttpServer.java   |  2 +-
 .../server/namenode/NameNodeResourceChecker.java   |  2 +-
 .../hdfs/server/namenode/NameNodeRpcServer.java    |  4 +--
 .../hadoop/hdfs/server/namenode/NameNodeUtils.java |  2 +-
 .../hadoop/hdfs/server/namenode/NamenodeFsck.java  |  2 +-
 .../server/namenode/QuotaByStorageTypeEntry.java   |  2 +-
 .../hadoop/hdfs/server/namenode/QuotaCounts.java   |  2 +-
 .../namenode/RedundantEditLogInputStream.java      |  4 +--
 .../hdfs/server/namenode/ReencryptionHandler.java  |  6 ++--
 .../hdfs/server/namenode/ReencryptionUpdater.java  |  6 ++--
 .../hdfs/server/namenode/SaveNamespaceContext.java |  2 +-
 .../hdfs/server/namenode/SecondaryNameNode.java    |  6 ++--
 .../hdfs/server/namenode/TransferFsImage.java      |  4 +--
 .../hadoop/hdfs/server/namenode/XAttrFeature.java  |  2 +-
 .../hadoop/hdfs/server/namenode/XAttrFormat.java   |  4 +--
 .../server/namenode/XAttrPermissionFilter.java     |  4 +--
 .../hdfs/server/namenode/ha/BootstrapStandby.java  |  4 +--
 .../hdfs/server/namenode/ha/EditLogTailer.java     |  8 ++---
 .../server/namenode/ha/RemoteNameNodeInfo.java     |  4 +--
 .../server/namenode/ha/StandbyCheckpointer.java    |  8 ++---
 .../namenode/snapshot/AbstractINodeDiff.java       |  2 +-
 .../namenode/snapshot/DiffListBySkipList.java      |  2 +-
 .../snapshot/DirectorySnapshottableFeature.java    |  6 ++--
 .../snapshot/DirectoryWithSnapshotFeature.java     |  2 +-
 .../namenode/snapshot/FSImageFormatPBSnapshot.java |  4 +--
 .../server/namenode/snapshot/SnapshotDiffInfo.java |  4 +--
 .../namenode/snapshot/SnapshotDiffListingInfo.java |  2 +-
 .../namenode/snapshot/SnapshotFSImageFormat.java   |  2 +-
 .../server/namenode/snapshot/SnapshotManager.java  |  4 +--
 .../sps/BlockStorageMovementAttemptedItems.java    |  2 +-
 .../namenode/sps/BlockStorageMovementNeeded.java   |  2 +-
 .../namenode/sps/StoragePolicySatisfier.java       |  4 +--
 .../namenode/sps/StoragePolicySatisfyManager.java  |  2 +-
 .../hdfs/server/namenode/top/TopAuditLogger.java   |  2 +-
 .../hadoop/hdfs/server/namenode/top/TopConf.java   |  4 +--
 .../server/namenode/top/metrics/TopMetrics.java    |  2 +-
 .../namenode/top/window/RollingWindowManager.java  |  2 +-
 .../web/resources/NamenodeWebHdfsMethods.java      |  6 ++--
 .../protocol/BlockECReconstructionCommand.java     |  2 +-
 .../hdfs/server/protocol/BlockRecoveryCommand.java |  2 +-
 .../hdfs/server/protocol/BlocksWithLocations.java  |  2 +-
 .../hdfs/server/protocol/DatanodeRegistration.java |  2 +-
 .../hadoop/hdfs/server/protocol/NamespaceInfo.java |  4 +--
 .../hadoop/hdfs/server/protocol/RemoteEditLog.java |  2 +-
 .../server/protocol/RemoteEditLogManifest.java     |  4 +--
 .../org/apache/hadoop/hdfs/tools/AdminHelper.java  |  2 +-
 .../org/apache/hadoop/hdfs/tools/CacheAdmin.java   |  2 +-
 .../org/apache/hadoop/hdfs/tools/DFSAdmin.java     |  4 +--
 .../org/apache/hadoop/hdfs/tools/DFSHAAdmin.java   |  6 ++--
 .../hadoop/hdfs/tools/DFSZKFailoverController.java |  2 +-
 .../org/apache/hadoop/hdfs/tools/DebugAdmin.java   |  2 +-
 .../hadoop/hdfs/tools/DelegationTokenFetcher.java  |  2 +-
 .../hadoop/hdfs/tools/NNHAServiceTarget.java       |  2 +-
 .../offlineEditsViewer/OfflineEditsXmlLoader.java  |  2 +-
 .../offlineEditsViewer/StatisticsEditsVisitor.java |  2 +-
 .../tools/offlineImageViewer/FSImageHandler.java   |  2 +-
 .../tools/offlineImageViewer/FSImageLoader.java    |  8 ++---
 .../FileDistributionCalculator.java                |  2 +-
 .../OfflineImageReconstructor.java                 |  6 ++--
 .../PBImageCorruptionDetector.java                 |  2 +-
 .../offlineImageViewer/PBImageTextWriter.java      |  6 ++--
 .../tools/offlineImageViewer/PBImageXmlWriter.java |  4 +--
 .../offlineImageViewer/TextWriterImageVisitor.java |  2 +-
 .../tools/offlineImageViewer/WebImageViewer.java   |  2 +-
 .../hadoop/hdfs/util/BestEffortLongFile.java       |  4 +--
 .../java/org/apache/hadoop/hdfs/util/Diff.java     |  2 +-
 .../org/apache/hadoop/hdfs/util/EnumCounters.java  |  2 +-
 .../org/apache/hadoop/hdfs/util/EnumDoubles.java   |  2 +-
 .../org/apache/hadoop/hdfs/util/MD5FileUtils.java  |  2 +-
 .../hadoop/hdfs/util/PersistentLongFile.java       |  2 +-
 .../apache/hadoop/hdfs/util/ReferenceCountMap.java |  4 +--
 .../java/org/apache/hadoop/hdfs/web/JsonUtil.java  |  4 +--
 .../hdfs/web/resources/ExceptionHandler.java       |  2 +-
 .../hadoop/fs/TestEnhancedByteBufferAccess.java    |  2 +-
 .../java/org/apache/hadoop/fs/TestGlobPaths.java   |  2 +-
 .../fs/viewfs/TestViewFileSystemWithAcls.java      |  2 +-
 .../hadoop/fs/viewfs/TestViewFsWithAcls.java       |  2 +-
 .../apache/hadoop/hdfs/AdminStatesBaseTest.java    |  2 +-
 .../java/org/apache/hadoop/hdfs/DFSTestUtil.java   | 14 ++++----
 .../hdfs/ErasureCodeBenchmarkThroughput.java       |  2 +-
 .../org/apache/hadoop/hdfs/MiniDFSCluster.java     | 12 +++----
 .../org/apache/hadoop/hdfs/MiniDFSNNTopology.java  |  4 +--
 .../apache/hadoop/hdfs/StripedFileTestUtil.java    |  2 +-
 .../hadoop/hdfs/TestAppendSnapshotTruncate.java    |  2 +-
 .../hadoop/hdfs/TestBatchedListDirectories.java    |  2 +-
 .../apache/hadoop/hdfs/TestBlockStoragePolicy.java |  4 +--
 .../org/apache/hadoop/hdfs/TestDFSFinalize.java    |  2 +-
 .../org/apache/hadoop/hdfs/TestDFSRollback.java    |  4 +--
 .../java/org/apache/hadoop/hdfs/TestDFSShell.java  |  2 +-
 .../TestDFSStripedOutputStreamWithFailureBase.java |  2 +-
 .../org/apache/hadoop/hdfs/TestDFSUpgrade.java     |  4 +--
 .../java/org/apache/hadoop/hdfs/TestDFSUtil.java   |  2 +-
 .../org/apache/hadoop/hdfs/TestDecommission.java   |  2 +-
 .../apache/hadoop/hdfs/TestEncryptionZones.java    |  2 +-
 .../hadoop/hdfs/TestErasureCodingExerciseAPIs.java |  2 +-
 .../org/apache/hadoop/hdfs/TestExtendedAcls.java   |  2 +-
 .../hadoop/hdfs/TestExternalBlockReader.java       |  2 +-
 .../apache/hadoop/hdfs/TestHDFSPolicyProvider.java |  2 +-
 .../java/org/apache/hadoop/hdfs/TestHdfsAdmin.java |  2 +-
 .../hadoop/hdfs/TestLeaseRecoveryStriped.java      |  2 +-
 .../apache/hadoop/hdfs/TestMaintenanceState.java   |  2 +-
 .../org/apache/hadoop/hdfs/TestMiniDFSCluster.java |  2 +-
 .../java/org/apache/hadoop/hdfs/TestQuota.java     |  4 +--
 .../java/org/apache/hadoop/hdfs/TestSafeMode.java  |  2 +-
 .../hadoop/hdfs/TestSafeModeWithStripedFile.java   |  2 +-
 .../hdfs/TestTrashWithSecureEncryptionZones.java   |  2 +-
 .../org/apache/hadoop/hdfs/UpgradeUtilities.java   |  6 ++--
 .../hdfs/client/impl/TestBlockReaderFactory.java   |  2 +-
 .../hadoop/hdfs/net/TestDFSNetworkTopology.java    |  2 +-
 .../protocol/datatransfer/TestPacketReceiver.java  |  2 +-
 .../hadoop/hdfs/protocolPB/TestPBHelper.java       |  8 ++---
 .../hadoop/hdfs/qjournal/MiniJournalCluster.java   |  4 +--
 .../apache/hadoop/hdfs/qjournal/QJMTestUtil.java   |  2 +-
 .../hdfs/qjournal/client/TestEpochsAreUnique.java  |  4 +--
 .../hdfs/qjournal/client/TestQJMWithFaults.java    |  6 ++--
 .../hdfs/qjournal/client/TestQuorumCall.java       |  6 ++--
 .../qjournal/client/TestQuorumJournalManager.java  |  2 +-
 .../client/TestQuorumJournalManagerUnit.java       | 10 +++---
 .../client/TestSegmentRecoveryComparator.java      |  2 +-
 .../hadoop/hdfs/qjournal/server/TestJournal.java   |  2 +-
 .../hdfs/qjournal/server/TestJournalNode.java      |  6 ++--
 .../hdfs/qjournal/server/TestJournalNodeSync.java  |  2 +-
 .../qjournal/server/TestJournaledEditsCache.java   |  2 +-
 .../blockmanagement/BlockManagerTestUtil.java      |  2 +-
 .../server/blockmanagement/TestBlockManager.java   |  8 ++---
 .../TestBlockReportRateLimiting.java               |  4 +--
 .../TestPendingDataNodeMessages.java               |  2 +-
 .../blockmanagement/TestRBWBlockInvalidation.java  |  2 +-
 .../blockmanagement/TestSlowDiskTracker.java       |  4 +--
 .../impl/TestInMemoryLevelDBAliasMapClient.java    |  4 +--
 .../impl/TestLevelDbMockAliasMapClient.java        |  2 +-
 .../hdfs/server/datanode/FsDatasetTestUtils.java   |  2 +-
 .../server/datanode/InternalDataNodeTestUtils.java |  2 +-
 .../hdfs/server/datanode/SimulatedFSDataset.java   |  2 +-
 .../hdfs/server/datanode/TestBPOfferService.java   |  4 +--
 .../hdfs/server/datanode/TestBlockRecovery.java    |  2 +-
 .../datanode/TestDataNodeHotSwapVolumes.java       |  4 +--
 .../hdfs/server/datanode/TestDataNodeMetrics.java  |  2 +-
 .../hdfs/server/datanode/TestDatanodeRegister.java |  2 +-
 .../server/datanode/TestReadOnlySharedStorage.java |  2 +-
 .../hdfs/server/datanode/TestRefreshNamenodes.java |  4 +--
 .../datanode/checker/TestDatasetVolumeChecker.java |  4 +--
 .../checker/TestThrottledAsyncChecker.java         |  2 +-
 .../checker/TestThrottledAsyncCheckerTimeout.java  |  8 ++---
 .../fsdataset/impl/FsDatasetImplTestUtils.java     |  2 +-
 .../fsdataset/impl/LazyPersistTestCase.java        |  2 +-
 .../impl/TestCacheByPmemMappableBlockLoader.java   |  2 +-
 .../fsdataset/impl/TestFsDatasetCache.java         |  2 +-
 .../datanode/fsdataset/impl/TestFsDatasetImpl.java |  2 +-
 .../fsdataset/impl/TestPmemCacheRecovery.java      |  2 +-
 .../fsdataset/impl/TestScrLazyPersistFiles.java    |  2 +-
 .../datanode/metrics/TestSlowNodeDetector.java     |  6 ++--
 .../web/webhdfs/TestDataNodeUGIProvider.java       |  2 +-
 .../server/diskbalancer/DiskBalancerTestUtil.java  |  2 +-
 .../hdfs/server/diskbalancer/TestDiskBalancer.java |  2 +-
 .../TestDiskBalancerWithMockMover.java             |  2 +-
 .../command/TestDiskBalancerCommand.java           |  2 +-
 .../apache/hadoop/hdfs/server/mover/TestMover.java |  2 +-
 .../hadoop/hdfs/server/mover/TestStorageMover.java |  4 +--
 .../hadoop/hdfs/server/namenode/FSAclBaseTest.java |  4 +--
 .../hdfs/server/namenode/FSImageTestUtil.java      | 14 ++++----
 .../hdfs/server/namenode/FSXAttrBaseTest.java      |  4 +--
 .../server/namenode/NNThroughputBenchmark.java     |  2 +-
 .../hdfs/server/namenode/TestAclConfigFlag.java    |  2 +-
 .../server/namenode/TestAclTransformation.java     |  4 +--
 .../hdfs/server/namenode/TestAuditLogAtDebug.java  |  2 +-
 .../hdfs/server/namenode/TestAuditLogger.java      |  2 +-
 .../hdfs/server/namenode/TestBackupNode.java       |  6 ++--
 .../hdfs/server/namenode/TestCheckpoint.java       | 10 +++---
 .../hadoop/hdfs/server/namenode/TestEditLog.java   |  4 +--
 .../hdfs/server/namenode/TestFSDirectory.java      |  4 +--
 .../hdfs/server/namenode/TestFSEditLogLoader.java  |  4 +--
 .../hadoop/hdfs/server/namenode/TestFSImage.java   |  2 +-
 .../hdfs/server/namenode/TestFSImageWithAcl.java   |  2 +-
 .../server/namenode/TestFileJournalManager.java    |  4 +--
 .../hadoop/hdfs/server/namenode/TestFsck.java      |  2 +-
 .../namenode/TestINodeAttributeProvider.java       |  4 +--
 .../hadoop/hdfs/server/namenode/TestINodeFile.java |  2 +-
 .../hdfs/server/namenode/TestLeaseManager.java     |  2 +-
 .../namenode/TestNNStorageRetentionFunctional.java |  2 +-
 .../namenode/TestNNStorageRetentionManager.java    |  8 ++---
 .../hdfs/server/namenode/TestNameEditsConfigs.java |  4 +--
 .../hdfs/server/namenode/TestNameNodeMXBean.java   |  2 +-
 .../hdfs/server/namenode/TestNameNodeRecovery.java |  2 +-
 .../server/namenode/TestProtectedDirectories.java  |  6 ++--
 .../namenode/TestSecondaryNameNodeUpgrade.java     |  2 +-
 .../namenode/TestStartupProgressServlet.java       |  2 +-
 .../hdfs/server/namenode/TestStorageRestore.java   |  2 +-
 .../hdfs/server/namenode/TestTransferFsImage.java  |  2 +-
 .../hadoop/hdfs/server/namenode/ha/HATestUtil.java |  2 +-
 .../server/namenode/ha/TestBootstrapStandby.java   |  2 +-
 .../namenode/ha/TestBootstrapStandbyWithQJM.java   |  2 +-
 .../server/namenode/ha/TestDFSUpgradeWithHA.java   |  2 +-
 .../hdfs/server/namenode/ha/TestDNFencing.java     |  2 +-
 .../namenode/ha/TestDelegationTokensWithHA.java    |  2 +-
 .../namenode/ha/TestEditLogsDuringFailover.java    |  4 +--
 .../server/namenode/ha/TestFailureOfSharedDir.java |  2 +-
 .../server/namenode/ha/TestFailureToReadEdits.java |  2 +-
 .../server/namenode/ha/TestHAConfiguration.java    |  2 +-
 .../hdfs/server/namenode/ha/TestHASafeMode.java    |  2 +-
 .../server/namenode/ha/TestHAStateTransitions.java |  2 +-
 .../namenode/ha/TestObserverReadProxyProvider.java |  2 +-
 .../server/namenode/ha/TestStandbyCheckpoints.java |  6 ++--
 .../namenode/ha/TestStandbyInProgressTail.java     |  4 +--
 .../namenode/metrics/TestNameNodeMetrics.java      |  2 +-
 .../namenode/snapshot/TestAclWithSnapshot.java     |  2 +-
 .../snapshot/TestFileWithSnapshotFeature.java      |  2 +-
 .../hdfs/shortcircuit/TestShortCircuitCache.java   |  4 +--
 .../org/apache/hadoop/hdfs/tools/TestDFSAdmin.java |  2 +-
 .../hadoop/hdfs/tools/TestDFSAdminWithHA.java      |  2 +-
 .../apache/hadoop/hdfs/tools/TestDFSHAAdmin.java   |  4 +--
 .../hdfs/tools/TestDFSHAAdminMiniCluster.java      |  6 ++--
 .../org/apache/hadoop/hdfs/tools/TestGetConf.java  |  2 +-
 ...stViewFileSystemOverloadSchemeWithDFSAdmin.java |  2 +-
 ...ViewFileSystemOverloadSchemeWithFSCommands.java |  2 +-
 .../offlineEditsViewer/TestOfflineEditsViewer.java |  2 +-
 .../offlineImageViewer/TestOfflineImageViewer.java |  6 ++--
 .../TestOfflineImageViewerForAcl.java              |  4 +--
 .../hdfs/util/TestAtomicFileOutputStream.java      |  2 +-
 .../hadoop/hdfs/util/TestStripedBlockUtil.java     |  2 +-
 .../org/apache/hadoop/hdfs/web/TestJsonUtil.java   |  2 +-
 .../org/apache/hadoop/hdfs/web/TestWebHDFS.java    |  2 +-
 .../java/org/apache/hadoop/tools/TestTools.java    |  4 +--
 .../hadoop/mapred/LocalContainerLauncher.java      |  4 +--
 .../hadoop/mapred/TaskAttemptListenerImpl.java     |  2 +-
 .../java/org/apache/hadoop/mapred/YarnChild.java   |  2 +-
 .../jobhistory/JobHistoryEventHandler.java         |  2 +-
 .../hadoop/mapreduce/v2/app/MRAppMaster.java       |  2 +-
 .../mapreduce/v2/app/TaskHeartbeatHandler.java     |  2 +-
 .../v2/app/commit/CommitterEventHandler.java       |  2 +-
 .../hadoop/mapreduce/v2/app/job/impl/JobImpl.java  |  4 +--
 .../mapreduce/v2/app/job/impl/TaskAttemptImpl.java |  4 +--
 .../hadoop/mapreduce/v2/app/job/impl/TaskImpl.java |  2 +-
 .../v2/app/launcher/ContainerLauncherImpl.java     |  2 +-
 .../hadoop/mapreduce/v2/app/rm/RMCommunicator.java |  2 +-
 .../mapreduce/v2/app/rm/RMContainerAllocator.java  |  2 +-
 .../mapreduce/v2/app/rm/RMContainerRequestor.java  |  2 +-
 .../v2/app/speculate/DefaultSpeculator.java        |  2 +-
 .../mapreduce/v2/app/webapp/AMWebServices.java     |  2 +-
 .../mapreduce/v2/app/webapp/AppController.java     |  2 +-
 .../hadoop/mapreduce/v2/app/MockAppContext.java    |  2 +-
 .../apache/hadoop/mapreduce/v2/app/MockJobs.java   |  6 ++--
 .../mapreduce/v2/app/job/impl/TestTaskAttempt.java |  4 +--
 .../mapreduce/v2/app/webapp/TestAMWebApp.java      |  2 +-
 .../mapreduce/v2/app/webapp/TestAMWebServices.java |  2 +-
 .../mapred/LocalDistributedCacheManager.java       |  4 +--
 .../org/apache/hadoop/mapred/LocalJobRunner.java   |  2 +-
 .../apache/hadoop/mapreduce/v2/util/MRApps.java    |  2 +-
 .../hadoop/mapreduce/v2/util/MRWebAppUtil.java     |  4 +--
 .../v2/jobhistory/TestJobHistoryUtils.java         |  2 +-
 .../java/org/apache/hadoop/mapred/Counters.java    |  2 +-
 .../org/apache/hadoop/mapred/FileInputFormat.java  |  2 +-
 .../java/org/apache/hadoop/mapred/JobConf.java     |  2 +-
 .../org/apache/hadoop/mapred/JobQueueClient.java   |  2 +-
 .../hadoop/mapred/LocatedFileStatusFetcher.java    | 16 +++++-----
 .../main/java/org/apache/hadoop/mapred/Task.java   |  2 +-
 .../java/org/apache/hadoop/mapred/TaskLog.java     |  2 +-
 .../org/apache/hadoop/mapred/TextInputFormat.java  |  2 +-
 .../java/org/apache/hadoop/mapreduce/Cluster.java  |  2 +-
 .../main/java/org/apache/hadoop/mapreduce/Job.java |  2 +-
 .../hadoop/mapreduce/JobResourceUploader.java      |  2 +-
 .../hadoop/mapreduce/JobSubmissionFiles.java       |  2 +-
 .../org/apache/hadoop/mapreduce/JobSubmitter.java  |  2 +-
 .../hadoop/mapreduce/counters/AbstractCounter.java |  2 +-
 .../mapreduce/counters/AbstractCounterGroup.java   |  2 +-
 .../mapreduce/counters/AbstractCounters.java       |  6 ++--
 .../mapreduce/counters/CounterGroupFactory.java    |  4 +--
 .../mapreduce/counters/FileSystemCounterGroup.java | 10 +++---
 .../mapreduce/counters/FrameworkCounterGroup.java  |  6 ++--
 .../hadoop/mapreduce/jobhistory/EventWriter.java   |  2 +-
 .../jobhistory/JobUnsuccessfulCompletionEvent.java |  2 +-
 .../lib/input/CombineFileInputFormat.java          |  6 ++--
 .../mapreduce/lib/input/FileInputFormat.java       |  2 +-
 .../mapreduce/lib/input/TextInputFormat.java       |  2 +-
 .../mapreduce/lib/output/FileOutputCommitter.java  |  4 +--
 .../mapreduce/lib/output/FileOutputFormat.java     |  2 +-
 .../lib/output/NamedCommitterFactory.java          |  2 +-
 .../lib/output/PartialFileOutputCommitter.java     |  2 +-
 .../mapreduce/lib/output/PathOutputCommitter.java  |  2 +-
 .../mapreduce/security/SecureShuffleUtils.java     |  2 +-
 .../hadoop/mapreduce/task/reduce/Fetcher.java      |  2 +-
 .../mapreduce/task/reduce/MergeManagerImpl.java    |  2 +-
 .../mapreduce/task/reduce/OnDiskMapOutput.java     |  2 +-
 .../task/reduce/ShuffleClientMetrics.java          |  2 +-
 .../task/reduce/ShuffleSchedulerImpl.java          |  2 +-
 .../org/apache/hadoop/mapreduce/tools/CLI.java     |  4 +--
 .../hadoop/mapreduce/util/CountersStrings.java     |  2 +-
 .../apache/hadoop/mapred/TestFileInputFormat.java  |  2 +-
 .../mapreduce/lib/input/TestFileInputFormat.java   |  4 +--
 .../mapreduce/v2/hs/CachedHistoryStorage.java      | 14 ++++----
 .../mapreduce/v2/hs/HistoryClientService.java      |  2 +-
 .../hadoop/mapreduce/v2/hs/HistoryFileManager.java |  4 +--
 .../apache/hadoop/mapreduce/v2/hs/JobHistory.java  |  4 +--
 .../hadoop/mapreduce/v2/hs/JobHistoryServer.java   |  2 +-
 .../mapreduce/v2/hs/server/HSAdminServer.java      |  2 +-
 .../mapreduce/v2/hs/webapp/HsWebServices.java      |  2 +-
 .../hadoop/mapreduce/v2/hs/webapp/dao/JobInfo.java |  2 +-
 .../hadoop/mapreduce/v2/hs/MockHistoryJobs.java    |  2 +-
 .../hadoop/mapreduce/v2/hs/TestJobHistory.java     |  2 +-
 .../v2/hs/webapp/TestHsWebServicesLogs.java        |  2 +-
 .../hadoop/mapred/ClientServiceDelegate.java       |  2 +-
 .../apache/hadoop/mapred/ResourceMgrDelegate.java  |  2 +-
 .../java/org/apache/hadoop/mapred/YARNRunner.java  |  2 +-
 .../hadoop/mapred/TestMRTimelineEventHandling.java |  2 +-
 .../org/apache/hadoop/mapred/TestYARNRunner.java   |  4 +--
 .../lib/input/TestCombineFileInputFormat.java      |  2 +-
 .../NativeMapOutputCollectorDelegator.java         |  2 +-
 .../hadoop/mapred/nativetask/NativeRuntime.java    |  2 +-
 .../nativetask/buffer/ByteBufferDataWriter.java    |  2 +-
 .../hadoop/mapred/nativetask/util/BytesUtil.java   |  4 +--
 .../hadoop/mapred/nativetask/util/ConfigUtil.java  |  2 +-
 .../mapred/nativetask/util/ReadWriteBuffer.java    |  2 +-
 .../hadoop/mapred/nativetask/kvtest/KVJob.java     |  2 +-
 .../hadoop/mapred/nativetask/kvtest/KVTest.java    |  4 +--
 .../mapred/nativetask/testutil/BytesFactory.java   |  6 ++--
 .../mapred/nativetask/utils/TestBytesUtil.java     |  4 +--
 .../apache/hadoop/mapred/FadvisedChunkedFile.java  |  2 +-
 .../apache/hadoop/mapred/FadvisedFileRegion.java   |  2 +-
 .../org/apache/hadoop/mapred/ShuffleHandler.java   | 14 ++++----
 .../hadoop/mapred/uploader/FrameworkUploader.java  |  2 +-
 .../mapred/uploader/TestFrameworkUploader.java     |  2 +-
 .../hadoop-mapreduce-client/pom.xml                |  4 +--
 .../hadoop-mapreduce-examples/pom.xml              |  4 +--
 .../hadoop/examples/BaileyBorweinPlouffe.java      |  2 +-
 .../java/org/apache/hadoop/examples/WordMean.java  |  2 +-
 .../org/apache/hadoop/examples/WordMedian.java     |  2 +-
 .../hadoop/examples/WordStandardDeviation.java     |  2 +-
 .../examples/dancing/DistributedPentomino.java     |  2 +-
 .../org/apache/hadoop/examples/dancing/Sudoku.java |  2 +-
 .../java/org/apache/hadoop/examples/pi/Parser.java |  2 +-
 .../java/org/apache/hadoop/examples/pi/Util.java   |  2 +-
 .../hadoop/examples/terasort/TeraScheduler.java    |  2 +-
 hadoop-maven-plugins/pom.xml                       |  4 +++
 .../maven/plugin/resourcegz/ResourceGzMojo.java    |  2 +-
 hadoop-project/pom.xml                             | 37 ++++++++++++++++++++--
 .../fs/aliyun/oss/AliyunOSSBlockOutputStream.java  |  8 ++---
 .../hadoop/fs/aliyun/oss/AliyunOSSFileSystem.java  |  4 +--
 .../hadoop/fs/aliyun/oss/AliyunOSSInputStream.java |  2 +-
 .../hadoop/fs/aliyun/oss/AliyunOSSUtils.java       |  2 +-
 hadoop-tools/hadoop-archive-logs/pom.xml           |  4 +--
 .../org/apache/hadoop/tools/HadoopArchiveLogs.java |  2 +-
 .../hadoop/tools/HadoopArchiveLogsRunner.java      |  2 +-
 .../org/apache/hadoop/tools/HadoopArchives.java    |  2 +-
 .../apache/hadoop/fs/s3a/AWSClientIOException.java |  2 +-
 .../hadoop/fs/s3a/AWSCredentialProviderList.java   |  4 +--
 .../hadoop/fs/s3a/FailureInjectionPolicy.java      |  2 +-
 .../hadoop/fs/s3a/InconsistentAmazonS3Client.java  |  2 +-
 .../java/org/apache/hadoop/fs/s3a/Invoker.java     |  2 +-
 .../java/org/apache/hadoop/fs/s3a/Listing.java     |  4 +--
 .../apache/hadoop/fs/s3a/S3ABlockOutputStream.java | 10 +++---
 .../org/apache/hadoop/fs/s3a/S3ADataBlocks.java    |  2 +-
 .../org/apache/hadoop/fs/s3a/S3AFileSystem.java    |  6 ++--
 .../org/apache/hadoop/fs/s3a/S3AInputStream.java   |  4 +--
 .../apache/hadoop/fs/s3a/S3AInstrumentation.java   |  2 +-
 .../apache/hadoop/fs/s3a/S3ALocatedFileStatus.java |  2 +-
 .../org/apache/hadoop/fs/s3a/S3AOpContext.java     |  2 +-
 .../org/apache/hadoop/fs/s3a/S3AReadOpContext.java |  4 +--
 .../org/apache/hadoop/fs/s3a/S3ARetryPolicy.java   |  2 +-
 .../java/org/apache/hadoop/fs/s3a/S3AUtils.java    |  6 ++--
 .../fs/s3a/SimpleAWSCredentialsProvider.java       |  2 +-
 .../apache/hadoop/fs/s3a/WriteOperationHelper.java |  6 ++--
 .../auth/AbstractSessionCredentialsProvider.java   |  2 +-
 .../fs/s3a/auth/AssumedRoleCredentialProvider.java |  4 +--
 .../fs/s3a/auth/MarshalledCredentialBinding.java   |  2 +-
 .../fs/s3a/auth/MarshalledCredentialProvider.java  |  2 +-
 .../hadoop/fs/s3a/auth/MarshalledCredentials.java  |  2 +-
 .../org/apache/hadoop/fs/s3a/auth/RoleModel.java   |  2 +-
 .../apache/hadoop/fs/s3a/auth/RolePolicies.java    |  2 +-
 .../hadoop/fs/s3a/auth/STSClientFactory.java       |  2 +-
 .../fs/s3a/auth/delegation/AbstractDTService.java  |  2 +-
 .../delegation/FullCredentialsTokenBinding.java    |  2 +-
 .../fs/s3a/auth/delegation/RoleTokenBinding.java   |  4 +--
 .../s3a/auth/delegation/S3ADelegationTokens.java   |  6 ++--
 .../s3a/auth/delegation/SessionTokenBinding.java   |  2 +-
 .../hadoop/fs/s3a/commit/AbstractS3ACommitter.java |  6 ++--
 .../hadoop/fs/s3a/commit/CommitOperations.java     |  2 +-
 .../hadoop/fs/s3a/commit/MagicCommitPaths.java     |  2 +-
 .../fs/s3a/commit/files/SinglePendingCommit.java   |  2 +-
 .../fs/s3a/commit/magic/MagicCommitTracker.java    |  2 +-
 .../apache/hadoop/fs/s3a/commit/staging/Paths.java | 12 +++----
 .../fs/s3a/commit/staging/StagingCommitter.java    |  2 +-
 .../hadoop/fs/s3a/impl/AbstractStoreOperation.java |  2 +-
 .../hadoop/fs/s3a/impl/ChangeDetectionPolicy.java  |  2 +-
 .../apache/hadoop/fs/s3a/impl/ChangeTracker.java   |  4 +--
 .../apache/hadoop/fs/s3a/impl/DeleteOperation.java |  4 +--
 .../fs/s3a/impl/ExecutingStoreOperation.java       |  2 +-
 .../hadoop/fs/s3a/impl/InternalConstants.java      |  2 +-
 .../fs/s3a/impl/MultiObjectDeleteSupport.java      |  4 +--
 .../apache/hadoop/fs/s3a/impl/RenameOperation.java |  4 +--
 .../hadoop/fs/s3a/impl/S3AMultipartUploader.java   |  6 ++--
 .../apache/hadoop/fs/s3a/impl/StoreContext.java    |  2 +-
 .../hadoop/fs/s3a/impl/StoreContextBuilder.java    |  2 +-
 .../s3a/s3guard/AuthoritativeAuditOperation.java   |  2 +-
 .../hadoop/fs/s3a/s3guard/DescendantsIterator.java |  2 +-
 .../hadoop/fs/s3a/s3guard/DirListingMetadata.java  |  2 +-
 .../fs/s3a/s3guard/DumpS3GuardDynamoTable.java     |  4 +--
 .../fs/s3a/s3guard/DynamoDBClientFactory.java      |  2 +-
 .../fs/s3a/s3guard/DynamoDBMetadataStore.java      |  8 ++---
 .../s3guard/DynamoDBMetadataStoreTableManager.java |  4 +--
 .../hadoop/fs/s3a/s3guard/ImportOperation.java     |  2 +-
 .../hadoop/fs/s3a/s3guard/LocalMetadataStore.java  |  8 ++---
 .../hadoop/fs/s3a/s3guard/MetadataStore.java       |  2 +-
 .../s3guard/MetadataStoreListFilesIterator.java    |  2 +-
 .../apache/hadoop/fs/s3a/s3guard/PathMetadata.java |  2 +-
 .../s3guard/PathMetadataDynamoDBTranslation.java   |  4 +--
 .../fs/s3a/s3guard/ProgressiveRenameTracker.java   |  2 +-
 .../fs/s3a/s3guard/PurgeS3GuardDynamoTable.java    |  2 +-
 .../hadoop/fs/s3a/s3guard/RenameTracker.java       |  2 +-
 .../org/apache/hadoop/fs/s3a/s3guard/S3Guard.java  |  4 +--
 .../apache/hadoop/fs/s3a/s3guard/S3GuardFsck.java  |  2 +-
 .../hadoop/fs/s3a/s3guard/S3GuardTableAccess.java  |  2 +-
 .../apache/hadoop/fs/s3a/s3guard/S3GuardTool.java  |  4 +--
 .../apache/hadoop/fs/s3a/select/SelectBinding.java |  4 +--
 .../hadoop/fs/s3a/select/SelectInputStream.java    |  4 +--
 .../org/apache/hadoop/fs/s3a/tools/MarkerTool.java |  4 +--
 .../apache/hadoop/fs/s3native/S3xLoginHelper.java  |  4 +--
 .../fs/contract/s3a/ITestS3AContractSeek.java      |  2 +-
 .../ITestBlockingThreadPoolExecutorService.java    |  2 +-
 .../hadoop/fs/s3a/ITestS3AFailureHandling.java     |  2 +-
 .../hadoop/fs/s3a/ITestS3ARemoteFileChanged.java   |  2 +-
 .../hadoop/fs/s3a/ITestS3GuardListConsistency.java |  2 +-
 .../apache/hadoop/fs/s3a/MockS3AFileSystem.java    |  2 +-
 .../org/apache/hadoop/fs/s3a/S3ATestUtils.java     |  2 +-
 .../hadoop/fs/s3a/StorageStatisticsTracker.java    |  2 +-
 .../fs/s3a/TestS3AAWSCredentialsProvider.java      |  2 +-
 .../delegation/ILoadTestSessionCredentials.java    |  2 +-
 .../delegation/MiniKerberizedHadoopCluster.java    |  2 +-
 .../fs/s3a/commit/AbstractYarnClusterITest.java    |  2 +-
 .../fs/s3a/commit/ITestCommitOperations.java       |  2 +-
 .../hadoop/fs/s3a/commit/TestMagicCommitPaths.java |  2 +-
 .../org/apache/hadoop/fs/s3a/commit/TestTasks.java |  2 +-
 .../commit/integration/ITestS3ACommitterMRJob.java |  2 +-
 .../fs/s3a/commit/staging/StagingTestBase.java     |  4 +--
 .../staging/TestDirectoryCommitterScale.java       |  2 +-
 .../s3a/commit/staging/TestStagingCommitter.java   |  2 +-
 .../staging/TestStagingPartitionedFileListing.java |  2 +-
 .../staging/TestStagingPartitionedTaskCommit.java  |  4 +--
 .../fs/s3a/impl/ITestPartialRenamesDeletes.java    |  4 +--
 .../fs/s3a/impl/TestPartialDeleteFailures.java     |  2 +-
 .../s3a/s3guard/AbstractS3GuardToolTestBase.java   |  2 +-
 .../fs/s3a/s3guard/ITestDynamoDBMetadataStore.java |  4 +--
 .../s3guard/ITestDynamoDBMetadataStoreScale.java   |  2 +-
 .../s3a/s3guard/ITestS3GuardDDBRootOperations.java |  2 +-
 .../fs/s3a/s3guard/MetadataStoreTestBase.java      |  2 +-
 .../fs/s3a/s3guard/TestLocalMetadataStore.java     |  6 ++--
 .../TestPathMetadataDynamoDBTranslation.java       |  2 +-
 .../fs/s3a/s3guard/TestPathOrderComparators.java   |  2 +-
 .../scale/ILoadTestS3ABulkDeleteThrottling.java    |  4 +--
 .../org/apache/hadoop/fs/s3a/select/CsvFile.java   |  2 +-
 .../hadoop/fs/s3a/select/ITestS3SelectCLI.java     |  2 +-
 .../org/apache/hadoop/fs/adl/AdlFileSystem.java    |  4 +--
 hadoop-tools/hadoop-azure/pom.xml                  |  4 +--
 .../azure/AzureFileSystemThreadPoolExecutor.java   |  2 +-
 .../fs/azure/AzureNativeFileSystemStore.java       |  2 +-
 .../hadoop/fs/azure/BlockBlobAppendStream.java     |  4 +--
 .../apache/hadoop/fs/azure/CachingAuthorizer.java  |  4 +--
 .../hadoop/fs/azure/ClientThrottlingAnalyzer.java  |  4 +--
 .../hadoop/fs/azure/NativeAzureFileSystem.java     |  4 +--
 .../fs/azure/NativeAzureFileSystemHelper.java      |  2 +-
 .../hadoop/fs/azure/NativeFileSystemStore.java     |  2 +-
 .../hadoop/fs/azure/PageBlobOutputStream.java      |  2 +-
 .../hadoop/fs/azure/RemoteWasbAuthorizerImpl.java  |  2 +-
 .../apache/hadoop/fs/azure/SelfRenewingLease.java  |  2 +-
 .../java/org/apache/hadoop/fs/azure/WasbFsck.java  |  2 +-
 .../hadoop/fs/azure/WasbRemoteCallHelper.java      |  2 +-
 .../hadoop/fs/azurebfs/AbfsConfiguration.java      |  4 +--
 .../hadoop/fs/azurebfs/AbfsCountersImpl.java       |  2 +-
 .../hadoop/fs/azurebfs/AzureBlobFileSystem.java    |  4 +--
 .../fs/azurebfs/AzureBlobFileSystemStore.java      |  6 ++--
 .../fs/azurebfs/oauth2/AzureADAuthenticator.java   |  2 +-
 .../azurebfs/oauth2/ClientCredsTokenProvider.java  |  2 +-
 .../oauth2/CustomTokenProviderAdapter.java         |  2 +-
 .../fs/azurebfs/oauth2/IdentityTransformer.java    |  2 +-
 .../oauth2/RefreshTokenBasedTokenProvider.java     |  2 +-
 .../azurebfs/oauth2/UserPasswordTokenProvider.java |  2 +-
 .../security/AbfsDelegationTokenManager.java       |  4 +--
 .../hadoop/fs/azurebfs/services/AbfsClient.java    |  4 +--
 .../services/AbfsClientThrottlingAnalyzer.java     |  4 +--
 .../hadoop/fs/azurebfs/services/AbfsCounters.java  |  2 +-
 .../fs/azurebfs/services/AbfsInputStream.java      |  4 +--
 .../fs/azurebfs/services/AbfsOutputStream.java     |  4 +--
 .../fs/azurebfs/services/AbfsRestOperation.java    |  2 +-
 .../azurebfs/services/ExponentialRetryPolicy.java  |  2 +-
 .../fs/azurebfs/services/ReadBufferManager.java    |  2 +-
 .../hadoop/fs/azurebfs/utils/CachedSASToken.java   |  2 +-
 .../utils/TextFileBasedIdentityHandler.java        |  4 +--
 .../TestNativeAzureFileSystemAuthorization.java    |  2 +-
 .../fs/azurebfs/ITestAbfsIdentityTransformer.java  |  2 +-
 .../ITestAzureBlobFileSystemCheckAccess.java       |  4 +--
 .../fs/azurebfs/ITestAzureBlobFilesystemAcl.java   |  2 +-
 .../extensions/ClassicDelegationTokenManager.java  |  2 +-
 .../extensions/StubAbfsTokenIdentifier.java        |  2 +-
 .../java/org/apache/hadoop/tools/CopyListing.java  |  2 +-
 .../apache/hadoop/tools/CopyListingFileStatus.java |  6 ++--
 .../main/java/org/apache/hadoop/tools/DistCp.java  |  4 +--
 .../org/apache/hadoop/tools/DistCpOptions.java     |  4 +--
 .../org/apache/hadoop/tools/OptionsParser.java     |  2 +-
 .../org/apache/hadoop/tools/RegexCopyFilter.java   |  2 +-
 .../org/apache/hadoop/tools/SimpleCopyListing.java |  4 +--
 .../hadoop/tools/mapred/DeletedDirTracker.java     |  6 ++--
 .../tools/mapred/RetriableFileCopyCommand.java     |  2 +-
 .../org/apache/hadoop/tools/util/DistCpUtils.java  |  2 +-
 .../hadoop/tools/TestDistCpWithRawXAttrs.java      |  2 +-
 .../apache/hadoop/tools/TestDistCpWithXAttrs.java  |  2 +-
 .../apache/hadoop/tools/util/TestDistCpUtils.java  |  2 +-
 .../hadoop-dynamometer-infra/pom.xml               |  4 +--
 .../apache/hadoop/tools/dynamometer/AMOptions.java |  2 +-
 .../tools/dynamometer/ApplicationMaster.java       |  6 ++--
 .../apache/hadoop/tools/dynamometer/Client.java    | 10 +++---
 .../hadoop/tools/dynamometer/DynoInfraUtils.java   |  2 +-
 .../tools/dynamometer/TestDynamometerInfra.java    |  2 +-
 .../workloadgenerator/CreateFileMapper.java        |  2 +-
 .../audit/AuditLogDirectParser.java                |  2 +-
 .../workloadgenerator/audit/AuditReplayMapper.java |  2 +-
 .../workloadgenerator/audit/AuditReplayThread.java |  2 +-
 .../hadoop/hdfs/server/namenode/ImageWriter.java   |  2 +-
 .../hadoop/hdfs/server/namenode/TreePath.java      |  2 +-
 .../TotalHeapUsageEmulatorPlugin.java              |  2 +-
 .../org/apache/hadoop/metrics2/sink/KafkaSink.java |  2 +-
 .../hadoop/metrics2/impl/TestKafkaMetrics.java     |  2 +-
 .../hadoop/yarn/sls/appmaster/DAGAMSimulator.java  |  2 +-
 .../hadoop/yarn/sls/nodemanager/NMSimulator.java   |  2 +-
 .../yarn/sls/scheduler/FairSchedulerMetrics.java   |  2 +-
 .../hadoop-yarn/hadoop-yarn-api/pom.xml            |  4 +--
 .../yarn/api/records/ResourceInformation.java      |  4 +--
 .../org/apache/hadoop/yarn/api/records/URL.java    |  2 +-
 .../records/timeline/TimelineEntityGroupId.java    |  2 +-
 .../java/org/apache/hadoop/yarn/conf/HAUtil.java   |  2 +-
 .../util/constraint/PlacementConstraintParser.java |  2 +-
 .../hadoop/yarn/util/csi/CsiConfigUtils.java       |  2 +-
 .../hadoop/yarn/util/resource/ResourceUtils.java   |  2 +-
 .../resource/TestPlacementConstraintParser.java    |  2 +-
 .../hadoop/yarn/conf/TestResourceInformation.java  |  4 +--
 .../pom.xml                                        |  4 +--
 .../distributedshell/ApplicationMaster.java        |  4 +--
 .../yarn/applications/distributedshell/Client.java |  4 +--
 .../TestDSWithMultipleNodeManager.java             |  2 +-
 .../hadoop-yarn-services-api/pom.xml               |  4 +--
 .../yarn/service/client/ApiServiceClient.java      |  4 +--
 .../service/client/SystemServiceManagerImpl.java   |  2 +-
 .../hadoop/yarn/service/webapp/ApiServer.java      |  6 ++--
 .../apache/hadoop/yarn/service/TestApiServer.java  |  2 +-
 .../yarn/service/client/TestApiServiceClient.java  |  2 +-
 .../hadoop-yarn-services-core/pom.xml              |  4 +--
 .../apache/hadoop/yarn/service/ServiceContext.java |  4 +--
 .../apache/hadoop/yarn/service/ServiceManager.java |  4 +--
 .../apache/hadoop/yarn/service/ServiceMaster.java  |  2 +-
 .../hadoop/yarn/service/ServiceScheduler.java      |  6 ++--
 .../service/api/records/ResourceInformation.java   |  4 +--
 .../hadoop/yarn/service/client/ServiceClient.java  |  2 +-
 .../hadoop/yarn/service/component/Component.java   |  4 +--
 .../yarn/service/component/ComponentEvent.java     |  2 +-
 .../component/instance/ComponentInstance.java      |  2 +-
 .../component/instance/ComponentInstanceEvent.java |  2 +-
 .../service/containerlaunch/AbstractLauncher.java  |  4 +--
 .../containerlaunch/CommandLineBuilder.java        |  2 +-
 .../containerlaunch/ContainerLaunchService.java    |  2 +-
 .../containerlaunch/JavaCommandLineBuilder.java    |  2 +-
 .../yarn/service/provider/ProviderService.java     |  2 +-
 .../defaultImpl/DefaultClientProvider.java         |  2 +-
 .../registry/YarnRegistryViewForProviders.java     |  2 +-
 .../yarn/service/utils/ClientRegistryBinder.java   |  2 +-
 .../hadoop/yarn/service/utils/ConfigHelper.java    |  2 +-
 .../hadoop/yarn/service/utils/CoreFileSystem.java  |  2 +-
 .../utils/PublishedConfigurationOutputter.java     |  4 +--
 .../hadoop/yarn/service/utils/ServiceApiUtil.java  | 10 +++---
 .../hadoop/yarn/service/utils/ServiceUtils.java    |  2 +-
 .../hadoop/yarn/service/utils/ZookeeperUtils.java  |  2 +-
 .../yarn/service/MockRunningServiceContext.java    |  2 +-
 .../apache/hadoop/yarn/service/MockServiceAM.java  |  2 +-
 .../hadoop/yarn/service/ServiceTestUtils.java      |  6 ++--
 .../TestDefaultUpgradeComponentsFinder.java        |  2 +-
 .../apache/hadoop/yarn/service/TestServiceAM.java  |  2 +-
 .../yarn/service/TestYarnNativeServices.java       |  4 +--
 .../yarn/service/client/TestServiceClient.java     |  2 +-
 .../component/instance/TestComponentInstance.java  |  2 +-
 .../provider/TestAbstractProviderService.java      |  2 +-
 .../hadoop/yarn/service/utils/TestFilterUtils.java |  2 +-
 .../hadoop-yarn/hadoop-yarn-client/pom.xml         |  4 +--
 .../apache/hadoop/yarn/client/api/AMRMClient.java  |  6 ++--
 .../hadoop/yarn/client/api/NMTokenCache.java       |  2 +-
 .../yarn/client/api/async/AMRMClientAsync.java     |  4 +--
 .../yarn/client/api/async/NMClientAsync.java       |  2 +-
 .../client/api/async/impl/AMRMClientAsyncImpl.java |  2 +-
 .../client/api/async/impl/NMClientAsyncImpl.java   |  4 +--
 .../yarn/client/api/impl/AHSv2ClientImpl.java      |  2 +-
 .../yarn/client/api/impl/AMRMClientImpl.java       |  6 ++--
 .../api/impl/ContainerManagementProtocolProxy.java |  2 +-
 .../hadoop/yarn/client/api/impl/NMClientImpl.java  |  2 +-
 .../client/api/impl/SharedCacheClientImpl.java     |  2 +-
 .../yarn/client/api/impl/YarnClientImpl.java       |  2 +-
 .../hadoop/yarn/client/cli/ApplicationCLI.java     |  2 +-
 .../apache/hadoop/yarn/client/cli/ClusterCLI.java  |  2 +-
 .../org/apache/hadoop/yarn/client/cli/LogsCLI.java |  2 +-
 .../hadoop/yarn/client/cli/NodeAttributesCLI.java  |  4 +--
 .../apache/hadoop/yarn/client/cli/QueueCLI.java    |  2 +-
 .../apache/hadoop/yarn/client/cli/RMAdminCLI.java  |  4 +--
 .../hadoop/yarn/client/cli/SchedConfCLI.java       |  2 +-
 .../org/apache/hadoop/yarn/client/cli/TopCLI.java  |  6 ++--
 .../hadoop/yarn/client/util/YarnClientUtils.java   |  4 +--
 .../hadoop/yarn/client/cli/TestClusterCLI.java     |  2 +-
 .../apache/hadoop/yarn/client/cli/TestLogsCLI.java |  2 +-
 .../yarn/client/cli/TestNodeAttributesCLI.java     | 10 +++---
 .../hadoop/yarn/client/cli/TestRMAdminCLI.java     |  4 +--
 .../apache/hadoop/yarn/client/cli/TestYarnCLI.java |  4 +--
 .../hadoop-yarn/hadoop-yarn-common/pom.xml         |  4 +--
 .../impl/pb/GetNodesToLabelsResponsePBImpl.java    |  2 +-
 .../impl/pb/GetPluginInfoRequestPBImpl.java        |  2 +-
 .../impl/pb/GetPluginInfoResponsePBImpl.java       |  2 +-
 .../impl/pb/NodePublishVolumeRequestPBImpl.java    |  4 +--
 .../impl/pb/NodePublishVolumeResponsePBImpl.java   |  2 +-
 .../impl/pb/NodeUnpublishVolumeRequestPBImpl.java  |  2 +-
 .../impl/pb/NodeUnpublishVolumeResponsePBImpl.java |  2 +-
 .../ValidateVolumeCapabilitiesRequestPBImpl.java   |  2 +-
 .../ValidateVolumeCapabilitiesResponsePBImpl.java  |  2 +-
 .../impl/pb/ApplicationAttemptIdPBImpl.java        |  2 +-
 .../api/records/impl/pb/ApplicationIdPBImpl.java   |  2 +-
 .../api/records/impl/pb/ContainerIdPBImpl.java     |  2 +-
 .../yarn/api/records/impl/pb/NodeIdPBImpl.java     |  2 +-
 .../yarn/api/records/impl/pb/ProtoUtils.java       |  4 +--
 .../api/records/impl/pb/ReservationIdPBImpl.java   |  2 +-
 .../api/records/impl/pb/ResourceOptionPBImpl.java  |  2 +-
 .../yarn/api/records/impl/pb/ResourcePBImpl.java   |  4 +--
 .../apache/hadoop/yarn/client/ClientRMProxy.java   |  4 +--
 .../org/apache/hadoop/yarn/client/RMProxy.java     |  2 +-
 .../org/apache/hadoop/yarn/client/ServerProxy.java |  2 +-
 .../yarn/client/api/impl/TimelineClientImpl.java   |  2 +-
 .../yarn/client/api/impl/TimelineConnector.java    |  6 ++--
 .../client/api/impl/TimelineReaderClientImpl.java  |  2 +-
 .../yarn/client/api/impl/TimelineV2ClientImpl.java |  2 +-
 .../yarn/client/api/impl/TimelineWriter.java       |  2 +-
 .../apache/hadoop/yarn/event/AsyncDispatcher.java  |  2 +-
 .../apache/hadoop/yarn/event/EventDispatcher.java  |  2 +-
 .../AggregatedLogDeletionService.java              |  2 +-
 .../yarn/logaggregation/AggregatedLogFormat.java   |  6 ++--
 .../yarn/logaggregation/LogAggregationUtils.java   |  2 +-
 .../hadoop/yarn/logaggregation/LogCLIHelpers.java  |  2 +-
 .../LogAggregationFileController.java              |  2 +-
 .../LogAggregationFileControllerFactory.java       |  4 +--
 .../ifile/LogAggregationIndexedFileController.java |  2 +-
 .../yarn/nodelabels/CommonNodeLabelsManager.java   |  4 +--
 .../hadoop/yarn/nodelabels/NodeLabelUtil.java      |  2 +-
 .../nodelabels/store/op/NodeAttributeMirrorOp.java |  2 +-
 .../nodelabels/store/op/RemoveClusterLabelOp.java  |  2 +-
 .../yarn/security/YarnAuthorizationProvider.java   |  2 +-
 .../client/YARNDelegationTokenIdentifier.java      |  2 +-
 .../impl/pb/ReplaceLabelsOnNodeRequestPBImpl.java  |  2 +-
 .../server/security/ApplicationACLsManager.java    |  2 +-
 .../apache/hadoop/yarn/util/AdHocLogDumper.java    |  2 +-
 .../apache/hadoop/yarn/util/BoundedAppender.java   |  4 +--
 .../org/apache/hadoop/yarn/util/FSDownload.java    |  8 ++---
 .../org/apache/hadoop/yarn/util/RackResolver.java  |  4 +--
 .../org/apache/hadoop/yarn/util/StringHelper.java  |  4 +--
 .../util/resource/DefaultResourceCalculator.java   |  2 +-
 .../hadoop/yarn/util/timeline/TimelineUtils.java   |  2 +-
 .../org/apache/hadoop/yarn/webapp/Controller.java  |  2 +-
 .../org/apache/hadoop/yarn/webapp/Dispatcher.java  |  4 +--
 .../apache/hadoop/yarn/webapp/ResponseInfo.java    |  2 +-
 .../java/org/apache/hadoop/yarn/webapp/Router.java | 10 +++---
 .../java/org/apache/hadoop/yarn/webapp/WebApp.java |  6 ++--
 .../org/apache/hadoop/yarn/webapp/WebApps.java     |  2 +-
 .../hadoop/yarn/webapp/hamlet/HamletGen.java       |  2 +-
 .../hadoop/yarn/webapp/hamlet/HamletImpl.java      |  8 ++---
 .../hadoop/yarn/webapp/hamlet2/HamletGen.java      |  2 +-
 .../hadoop/yarn/webapp/hamlet2/HamletImpl.java     |  8 ++---
 .../hadoop/yarn/webapp/view/DefaultPage.java       |  2 +-
 .../apache/hadoop/yarn/webapp/view/JQueryUI.java   |  2 +-
 .../hadoop/yarn/webapp/view/TwoColumnLayout.java   |  2 +-
 .../test/java/org/apache/hadoop/yarn/MockApps.java |  2 +-
 .../hadoop/yarn/api/BasePBImplRecordsTest.java     |  6 ++--
 .../apache/hadoop/yarn/api/TestPBImplRecords.java  |  2 +-
 .../hadoop/yarn/nodelabels/NodeLabelTestBase.java  |  4 +--
 .../nodelabels/TestCommonNodeLabelsManager.java    |  6 ++--
 .../nodelabels/TestFileSystemNodeLabelsStore.java  |  2 +-
 .../hadoop/yarn/nodelabels/TestNodeLabelUtil.java  |  2 +-
 .../resourcetypes/ResourceTypesTestHelper.java     |  2 +-
 .../apache/hadoop/yarn/util/TestFSDownload.java    |  6 ++--
 .../CustomResourceTypesConfigurationProvider.java  |  2 +-
 .../yarn/util/resource/TestResourceCalculator.java |  2 +-
 .../hadoop-yarn/hadoop-yarn-csi/pom.xml            |  6 ++--
 .../yarn/csi/adaptor/TestCsiAdaptorService.java    |  4 +--
 .../TestValidateVolumeCapabilityRequest.java       |  4 +--
 .../hadoop/yarn/csi/client/TestCsiClient.java      |  2 +-
 .../pom.xml                                        |  4 +--
 .../ApplicationHistoryClientService.java           |  2 +-
 .../ApplicationHistoryManagerImpl.java             |  2 +-
 .../ApplicationHistoryManagerOnTimelineStore.java  |  2 +-
 .../ApplicationHistoryServer.java                  |  2 +-
 .../webapp/AHSWebServices.java                     |  2 +-
 .../yarn/server/timeline/LeveldbTimelineStore.java |  4 +--
 .../timeline/RollingLevelDBTimelineStore.java      |  4 +--
 .../yarn/server/timeline/TimelineDataManager.java  |  2 +-
 .../recovery/LeveldbTimelineStateStore.java        |  2 +-
 .../timeline/security/TimelineACLsManager.java     |  2 +-
 .../hadoop-yarn-server-common/pom.xml              |  4 +--
 .../yarn/server/AMHeartbeatRequestHandler.java     |  4 +--
 .../hadoop/yarn/server/AMRMClientRelayer.java      |  2 +-
 .../hadoop/yarn/server/api/ServerRMProxy.java      |  2 +-
 .../FederationRMFailoverProxyProvider.java         |  4 +--
 .../federation/policies/FederationPolicyUtils.java |  2 +-
 .../federation/policies/RouterPolicyFacade.java    |  2 +-
 .../LocalityMulticastAMRMProxyPolicy.java          |  4 +--
 .../manager/PriorityBroadcastPolicyManager.java    |  2 +-
 .../manager/WeightedLocalityPolicyManager.java     |  2 +-
 .../metrics/FederationStateStoreClientMetrics.java |  2 +-
 .../records/impl/pb/SubClusterInfoPBImpl.java      |  2 +-
 .../federation/utils/FederationRegistryClient.java |  2 +-
 .../utils/FederationStateStoreFacade.java          |  2 +-
 .../server/metrics/AMRMClientRelayerMetrics.java   |  2 +-
 .../metrics/OpportunisticSchedulerMetrics.java     |  2 +-
 .../scheduler/OpportunisticContainerContext.java   |  2 +-
 .../TimelineAuthenticationFilterInitializer.java   |  2 +-
 .../yarn/server/uam/UnmanagedAMPoolManager.java    |  2 +-
 .../server/uam/UnmanagedApplicationManager.java    |  4 +--
 .../hadoop/yarn/server/utils/BuilderUtils.java     |  2 +-
 .../server/volume/csi/VolumeCapabilityRange.java   |  2 +-
 .../yarn/server/volume/csi/VolumeMetaData.java     |  2 +-
 .../hadoop/yarn/server/webapp/ContainerBlock.java  |  2 +-
 .../hadoop/yarn/server/webapp/LogServlet.java      |  4 +--
 .../hadoop/yarn/server/webapp/LogWebService.java   |  4 +--
 .../yarn/server/webapp/LogWebServiceUtils.java     |  2 +-
 .../yarn/server/MockResourceManagerFacade.java     |  2 +-
 .../api/protocolrecords/TestProtocolRecords.java   |  2 +-
 .../yarn/server/webapp/ContainerBlockTest.java     |  2 +-
 .../hadoop-yarn-server-nodemanager/pom.xml         |  4 +--
 .../yarn/server/nodemanager/ContainerExecutor.java |  2 +-
 .../nodemanager/DefaultContainerExecutor.java      |  2 +-
 .../yarn/server/nodemanager/DeletionService.java   |  2 +-
 .../server/nodemanager/DirectoryCollection.java    |  4 +--
 .../server/nodemanager/LinuxContainerExecutor.java |  2 +-
 .../nodemanager/LocalDirsHandlerService.java       |  2 +-
 .../yarn/server/nodemanager/NodeManager.java       |  2 +-
 .../server/nodemanager/NodeStatusUpdaterImpl.java  |  2 +-
 .../nodemanager/amrmproxy/AMRMProxyMetrics.java    |  2 +-
 .../nodemanager/amrmproxy/AMRMProxyService.java    |  2 +-
 .../amrmproxy/AMRMProxyTokenSecretManager.java     |  2 +-
 .../amrmproxy/AbstractRequestInterceptor.java      |  2 +-
 .../amrmproxy/DefaultRequestInterceptor.java       |  4 +--
 .../amrmproxy/FederationInterceptor.java           |  4 +--
 .../nodemanager/api/ResourceLocalizationSpec.java  |  2 +-
 .../nodemanager/containermanager/AuxServices.java  |  4 +--
 .../containermanager/ContainerManagerImpl.java     |  2 +-
 .../application/ApplicationImpl.java               |  2 +-
 .../containermanager/container/ContainerImpl.java  |  2 +-
 .../container/SlidingWindowRetryPolicy.java        |  2 +-
 .../launcher/ContainerCleanup.java                 |  2 +-
 .../containermanager/launcher/ContainerLaunch.java |  2 +-
 .../launcher/ContainersLauncher.java               |  4 +--
 .../resources/CGroupElasticMemoryController.java   |  2 +-
 .../resources/CGroupsBlkioResourceHandlerImpl.java |  2 +-
 .../resources/CGroupsCpuResourceHandlerImpl.java   |  2 +-
 .../linux/resources/CGroupsHandlerImpl.java        |  4 +--
 .../CGroupsMemoryResourceHandlerImpl.java          |  2 +-
 .../linux/resources/CGroupsResourceCalculator.java |  2 +-
 .../linux/resources/DefaultOOMHandler.java         |  2 +-
 .../resources/NetworkPacketTaggingHandlerImpl.java |  2 +-
 .../resources/NetworkTagMappingJsonManager.java    |  2 +-
 .../linux/resources/ResourceHandlerChain.java      |  2 +-
 .../linux/resources/ResourceHandlerModule.java     |  2 +-
 .../resources/fpga/FpgaResourceAllocator.java      |  4 +--
 .../resources/fpga/FpgaResourceHandlerImpl.java    |  2 +-
 .../linux/resources/gpu/GpuResourceAllocator.java  | 10 +++---
 .../resources/numa/NumaResourceAllocation.java     |  2 +-
 .../resources/numa/NumaResourceAllocator.java      |  4 +--
 .../runtime/DelegatingLinuxContainerRuntime.java   |  2 +-
 .../linux/runtime/DockerLinuxContainerRuntime.java |  2 +-
 .../linux/runtime/OCIContainerRuntime.java         |  2 +-
 .../linux/runtime/RuncContainerRuntime.java        |  2 +-
 .../linux/runtime/docker/DockerImagesCommand.java  |  2 +-
 .../runc/HdfsManifestToResourcesPlugin.java        |  6 ++--
 .../localizer/ContainerLocalizer.java              |  6 ++--
 .../localizer/LocalCacheDirectoryManager.java      |  2 +-
 .../localizer/LocalResourcesTrackerImpl.java       |  2 +-
 .../localizer/LocalizerContext.java                |  2 +-
 .../localizer/ResourceLocalizationService.java     |  8 ++---
 .../sharedcache/SharedCacheUploadService.java      |  2 +-
 .../localizer/sharedcache/SharedCacheUploader.java |  2 +-
 .../logaggregation/AppLogAggregatorImpl.java       |  4 +--
 .../logaggregation/LogAggregationService.java      |  4 +--
 .../loghandler/NonAggregatingLogHandler.java       |  2 +-
 .../monitor/ContainersMonitorImpl.java             |  4 +--
 .../resourceplugin/ResourcePluginManager.java      |  6 ++--
 .../resourceplugin/com/nec/NECVEPlugin.java        |  2 +-
 .../resourceplugin/com/nec/VEDeviceDiscoverer.java |  2 +-
 .../com/nvidia/NvidiaGPUPluginForRuntimeV2.java    |  4 +--
 .../deviceframework/DeviceMappingManager.java      |  8 ++---
 .../deviceframework/DevicePluginAdapter.java       |  2 +-
 .../deviceframework/DeviceResourceHandlerImpl.java |  2 +-
 .../resourceplugin/fpga/FpgaDevice.java            |  2 +-
 .../resourceplugin/fpga/FpgaDiscoverer.java        |  6 ++--
 .../resourceplugin/fpga/IntelFpgaOpenclPlugin.java |  2 +-
 .../resourceplugin/gpu/GpuDiscoverer.java          |  8 ++---
 .../gpu/NvidiaDockerV1CommandPlugin.java           |  2 +-
 .../gpu/NvidiaDockerV2CommandPlugin.java           |  2 +-
 .../scheduler/ContainerScheduler.java              |  2 +-
 .../volume/csi/ContainerVolumePublisher.java       |  4 +--
 .../health/NodeHealthCheckerService.java           |  6 ++--
 .../health/TimedHealthReporterService.java         |  2 +-
 .../nodemanager/metrics/NodeManagerMetrics.java    |  2 +-
 .../AbstractNodeDescriptorsProvider.java           |  2 +-
 .../ConfigurationNodeAttributesProvider.java       |  6 ++--
 .../recovery/NMLeveldbStateStoreService.java       |  6 ++--
 .../scheduler/DistributedScheduler.java            |  2 +-
 .../security/NMTokenSecretManagerInNM.java         |  2 +-
 .../timelineservice/NMTimelinePublisher.java       |  2 +-
 .../util/CgroupsLCEResourcesHandler.java           |  2 +-
 .../server/nodemanager/TestContainerExecutor.java  |  2 +-
 .../TestNodeStatusUpdaterForAttributes.java        |  2 +-
 .../containermanager/TestAuxServices.java          |  4 +--
 .../containermanager/TestContainerManager.java     |  2 +-
 .../container/TestResourceMappings.java            |  2 +-
 .../launcher/TestContainerLaunch.java              |  2 +-
 .../fpga/TestFpgaResourceHandlerImpl.java          |  4 +--
 .../resources/gpu/TestGpuResourceAllocator.java    |  2 +-
 .../resources/gpu/TestGpuResourceHandlerImpl.java  |  4 +--
 .../localizer/TestResourceLocalizationService.java |  2 +-
 .../com/nec/TestVEDeviceDiscoverer.java            |  2 +-
 .../resourceplugin/gpu/TestGpuResourcePlugin.java  |  2 +-
 .../gpu/TestNvidiaDockerV1CommandPlugin.java       |  4 +--
 .../gpu/TestNvidiaDockerV2CommandPlugin.java       |  4 +--
 .../health/TestNodeHealthCheckerService.java       |  4 +--
 .../nodemanager/webapp/TestNMWebServices.java      |  2 +-
 .../hadoop-yarn-server-resourcemanager/pom.xml     |  4 +--
 .../ActiveStandbyElectorBasedElectorService.java   |  2 +-
 .../yarn/server/resourcemanager/AdminService.java  |  2 +-
 .../resourcemanager/ApplicationMasterService.java  |  2 +-
 .../server/resourcemanager/ClientRMService.java    |  2 +-
 .../server/resourcemanager/ClusterMetrics.java     |  2 +-
 .../CuratorBasedElectorService.java                |  2 +-
 .../yarn/server/resourcemanager/DBManager.java     |  2 +-
 .../server/resourcemanager/NodesListManager.java   |  2 +-
 .../OpportunisticContainerAllocatorAMService.java  |  2 +-
 .../yarn/server/resourcemanager/RMAppManager.java  |  4 +--
 .../yarn/server/resourcemanager/RMContextImpl.java |  2 +-
 .../resourcemanager/RMSecretManagerService.java    |  2 +-
 .../yarn/server/resourcemanager/RMServerUtils.java |  2 +-
 .../server/resourcemanager/ResourceManager.java    |  2 +-
 .../resourcemanager/ResourceTrackerService.java    |  4 +--
 .../ahs/RMApplicationHistoryWriter.java            |  2 +-
 .../resourcemanager/amlauncher/AMLauncher.java     |  2 +-
 .../amlauncher/ApplicationMasterLauncher.java      |  2 +-
 .../federation/FederationStateStoreService.java    |  2 +-
 .../metrics/TimelineServiceV2Publisher.java        |  2 +-
 .../resourcemanager/monitor/SchedulingMonitor.java |  2 +-
 .../monitor/SchedulingMonitorManager.java          |  2 +-
 .../capacity/PreemptionCandidatesSelector.java     |  2 +-
 .../ProportionalCapacityPreemptionPolicy.java      |  4 +--
 .../QueuePriorityContainerCandidateSelector.java   |  4 +--
 .../invariants/MetricsInvariantChecker.java        |  4 +--
 .../nodelabels/NodeAttributesManagerImpl.java      |  6 ++--
 .../nodelabels/RMDelegatedNodeLabelsUpdater.java   |  2 +-
 .../nodelabels/RMNodeLabelsManager.java            |  2 +-
 .../placement/DefaultPlacementRule.java            |  2 +-
 .../resourcemanager/placement/FSPlacementRule.java |  2 +-
 .../placement/PlacementManager.java                |  2 +-
 .../placement/UserGroupMappingPlacementRule.java   |  2 +-
 .../SubmissionContextPreProcessor.java             |  2 +-
 .../recovery/FileSystemRMStateStore.java           |  2 +-
 .../recovery/LeveldbRMStateStore.java              |  2 +-
 .../recovery/MemoryRMStateStore.java               |  2 +-
 .../resourcemanager/recovery/RMStateStore.java     |  4 +--
 .../recovery/RMStateUpdateAppEvent.java            |  2 +-
 .../resourcemanager/recovery/ZKRMStateStore.java   |  2 +-
 .../PeriodicRLESparseResourceAllocation.java       |  2 +-
 .../reservation/ReservationAllocation.java         |  2 +-
 .../planning/SimpleCapacityReplanner.java          |  2 +-
 .../resource/ResourceProfilesManagerImpl.java      |  2 +-
 .../server/resourcemanager/rmapp/RMAppImpl.java    |  2 +-
 .../rmapp/attempt/RMAppAttemptImpl.java            |  2 +-
 .../rmcontainer/RMContainerImpl.java               |  2 +-
 .../server/resourcemanager/rmnode/RMNodeImpl.java  |  2 +-
 .../scheduler/AbstractYarnScheduler.java           |  4 +--
 .../resourcemanager/scheduler/Allocation.java      |  2 +-
 .../scheduler/ClusterNodeTracker.java              |  4 +--
 .../resourcemanager/scheduler/QueueMetrics.java    |  4 +--
 .../scheduler/QueueMetricsCustomResource.java      |  2 +-
 .../scheduler/SchedulerApplicationAttempt.java     |  6 ++--
 .../resourcemanager/scheduler/SchedulerNode.java   |  4 +--
 .../resourcemanager/scheduler/SchedulerUtils.java  |  6 ++--
 .../resourcemanager/scheduler/YarnScheduler.java   |  2 +-
 .../scheduler/activities/ActivitiesManager.java    |  4 +--
 .../scheduler/capacity/AbstractCSQueue.java        |  4 +--
 .../capacity/CSMaxRunningAppsEnforcer.java         |  4 +--
 .../scheduler/capacity/CSQueue.java                |  2 +-
 .../scheduler/capacity/CSQueueStore.java           |  6 ++--
 .../scheduler/capacity/CSQueueUtils.java           |  2 +-
 .../scheduler/capacity/CapacityScheduler.java      |  6 ++--
 .../capacity/CapacitySchedulerConfiguration.java   |  6 ++--
 .../capacity/CapacitySchedulerMetrics.java         |  2 +-
 .../capacity/CapacitySchedulerQueueManager.java    |  2 +-
 .../scheduler/capacity/LeafQueue.java              |  4 +--
 .../capacity/QueueManagementDynamicEditPolicy.java |  2 +-
 .../scheduler/capacity/UsersManager.java           |  2 +-
 .../capacity/WorkflowPriorityMappingsManager.java  |  2 +-
 .../conf/FSSchedulerConfigurationStore.java        |  2 +-
 .../capacity/conf/LeveldbConfigurationStore.java   |  2 +-
 .../conf/MutableCSConfigurationProvider.java       |  4 +--
 .../capacity/conf/ZKConfigurationStore.java        |  2 +-
 .../PriorityUtilizationQueueOrderingPolicy.java    |  2 +-
 .../capacity/preemption/PreemptionManager.java     |  2 +-
 .../GuaranteedOrZeroCapacityOverTimePolicy.java    |  2 +-
 .../scheduler/common/fica/FiCaSchedulerApp.java    |  2 +-
 .../scheduler/constraint/AllocationTags.java       |  2 +-
 .../constraint/AllocationTagsManager.java          |  4 +--
 .../scheduler/constraint/TargetApplications.java   |  4 +--
 .../constraint/TargetApplicationsNamespace.java    |  4 +--
 .../processor/PlacementConstraintProcessor.java    |  2 +-
 ...CentralizedOpportunisticContainerAllocator.java |  2 +-
 .../distributed/NodeQueueLoadMonitor.java          |  2 +-
 .../scheduler/fair/AllocationConfiguration.java    |  2 +-
 .../fair/AllocationFileLoaderService.java          |  2 +-
 .../scheduler/fair/FSAppAttempt.java               |  2 +-
 .../scheduler/fair/FSLeafQueue.java                |  2 +-
 .../scheduler/fair/FSOpDurations.java              |  2 +-
 .../scheduler/fair/FSParentQueue.java              |  2 +-
 .../resourcemanager/scheduler/fair/FSQueue.java    |  2 +-
 .../scheduler/fair/FSQueueMetrics.java             |  2 +-
 .../scheduler/fair/FSSchedulerNode.java            |  4 +--
 .../scheduler/fair/FairScheduler.java              |  8 ++---
 .../scheduler/fair/FairSchedulerConfiguration.java |  2 +-
 .../scheduler/fair/FairSchedulerUtilities.java     |  2 +-
 .../scheduler/fair/MaxRunningAppsEnforcer.java     |  6 ++--
 .../scheduler/fair/QueueManager.java               |  6 ++--
 .../fair/ReservationQueueConfiguration.java        |  2 +-
 .../fair/allocation/AllocationFileParser.java      |  4 +--
 .../fair/converter/DryRunResultHolder.java         |  2 +-
 .../FSConfigToCSConfigArgumentHandler.java         |  2 +-
 .../converter/FSConfigToCSConfigConverter.java     |  2 +-
 .../converter/FSConfigToCSConfigRuleHandler.java   |  2 +-
 .../policies/DominantResourceFairnessPolicy.java   |  2 +-
 .../scheduler/fair/policies/FairSharePolicy.java   |  2 +-
 .../scheduler/fair/policies/FifoPolicy.java        |  2 +-
 .../scheduler/fifo/FifoScheduler.java              |  2 +-
 .../scheduler/placement/MultiNodeSorter.java       |  2 +-
 .../placement/SimpleCandidateNodeSet.java          |  2 +-
 .../SingleConstraintAppPlacementAllocator.java     |  2 +-
 .../scheduler/policy/FairOrderingPolicy.java       |  2 +-
 .../security/AMRMTokenSecretManager.java           |  2 +-
 .../security/ClientToAMTokenSecretManagerInRM.java |  2 +-
 .../security/DelegationTokenRenewer.java           |  4 +--
 .../security/NMTokenSecretManagerInRM.java         |  2 +-
 .../resourcemanager/security/QueueACLsManager.java |  2 +-
 .../security/RMContainerTokenSecretManager.java    |  2 +-
 .../security/RMDelegationTokenSecretManager.java   |  2 +-
 .../volume/csi/VolumeManagerImpl.java              |  4 +--
 .../volume/csi/lifecycle/VolumeImpl.java           |  6 ++--
 .../webapp/ApplicationsRequestBuilder.java         |  2 +-
 .../resourcemanager/webapp/RMWebAppFilter.java     |  2 +-
 .../resourcemanager/webapp/RMWebServices.java      |  2 +-
 .../resourcemanager/webapp/dao/ActivitiesInfo.java |  2 +-
 .../webapp/dao/ActivityNodeInfo.java               |  2 +-
 .../webapp/dao/AppActivitiesInfo.java              |  2 +-
 .../server/resourcemanager/webapp/dao/AppInfo.java |  4 +--
 .../webapp/dao/AppRequestAllocationInfo.java       |  2 +-
 .../resourcemanager/webapp/dao/NodeInfo.java       |  2 +-
 .../ApplicationMasterServiceTestBase.java          |  2 +-
 .../resourcemanager/MockMemoryRMStateStore.java    |  2 +-
 .../yarn/server/resourcemanager/MockNodes.java     |  4 +--
 .../server/resourcemanager/TestAppManager.java     |  6 ++--
 .../TestApplicationMasterServiceFair.java          |  2 +-
 .../resourcemanager/TestClientRMService.java       |  4 +--
 .../server/resourcemanager/TestRMAdminService.java |  6 ++--
 .../resourcemanager/TestRMHAForNodeLabels.java     |  2 +-
 .../yarn/server/resourcemanager/TestRMRestart.java |  4 +--
 .../TestResourceTrackerService.java                |  4 +--
 .../applicationsmanager/MockAsm.java               |  2 +-
 .../applicationsmanager/TestAMRestart.java         |  4 +--
 .../TestFileSystemNodeAttributeStore.java          |  2 +-
 .../nodelabels/TestNodeAttributesManager.java      |  4 +--
 .../TestRMDelegatedNodeLabelsUpdater.java          |  4 +--
 .../nodelabels/TestRMNodeLabelsManager.java        |  4 +--
 .../TestUserGroupMappingPlacementRule.java         |  2 +-
 .../recovery/TestZKRMStateStore.java               |  6 ++--
 .../rmapp/TestRMAppTransitions.java                |  2 +-
 .../rmcontainer/TestRMContainerImpl.java           |  2 +-
 .../scheduler/AppMetricsChecker.java               |  2 +-
 .../scheduler/ResourceMetricsChecker.java          |  2 +-
 .../scheduler/TestAbstractYarnScheduler.java       |  4 +--
 .../TestQueueMetricsForCustomResources.java        |  4 +--
 .../scheduler/TestSchedulerUtils.java              |  6 ++--
 .../capacity/CapacitySchedulerTestBase.java        |  2 +-
 .../scheduler/capacity/TestApplicationLimits.java  |  6 ++--
 .../capacity/TestApplicationLimitsByPartition.java |  4 +--
 .../scheduler/capacity/TestCapacityScheduler.java  |  6 ++--
 .../TestCapacitySchedulerAsyncScheduling.java      |  2 +-
 .../TestCapacitySchedulerAutoCreatedQueueBase.java |  4 +--
 .../TestCapacitySchedulerAutoQueueCreation.java    |  2 +-
 .../TestCapacitySchedulerLazyPreemption.java       |  2 +-
 .../TestCapacitySchedulerMaxParallelApps.java      |  2 +-
 .../TestCapacitySchedulerNodeLabelUpdate.java      |  6 ++--
 ...stCapacitySchedulerSchedulingRequestUpdate.java |  4 +--
 .../TestCapacitySchedulerSurgicalPreemption.java   |  4 +--
 ...estCapacitySchedulerWithMultiResourceTypes.java |  2 +-
 ...stCapacitySchedulerWorkflowPriorityMapping.java |  4 +--
 .../scheduler/capacity/TestLeafQueue.java          |  2 +-
 .../capacity/TestNodeLabelContainerAllocation.java |  6 ++--
 .../scheduler/capacity/TestQueueParsing.java       |  2 +-
 .../scheduler/capacity/TestReservations.java       |  2 +-
 .../TestSchedulingRequestContainerAllocation.java  |  4 +--
 ...tSchedulingRequestContainerAllocationAsync.java |  2 +-
 .../scheduler/capacity/TestUtils.java              |  2 +-
 .../TestWorkPreservingRMRestartForNodeLabel.java   |  6 ++--
 ...TestPriorityUtilizationQueueOrderingPolicy.java |  4 +--
 .../constraint/TestAllocationTagsManager.java      |  2 +-
 .../constraint/TestAllocationTagsNamespace.java    |  4 +--
 .../TestPlacementConstraintManagerService.java     |  2 +-
 .../constraint/TestPlacementConstraintsUtil.java   |  4 +--
 .../algorithm/TestLocalAllocationTagsManager.java  |  2 +-
 .../scheduler/fair/FairSchedulerTestBase.java      |  2 +-
 .../scheduler/fair/TestFSLeafQueue.java            |  2 +-
 .../scheduler/fair/TestFSQueueMetrics.java         |  2 +-
 .../scheduler/fair/TestFairScheduler.java          |  4 +--
 .../fair/TestFairSchedulerConfiguration.java       |  2 +-
 .../scheduler/fair/TestQueueManager.java           |  4 +--
 .../fair/allocationfile/AllocationFileQueue.java   |  2 +-
 .../AllocationFileQueuePlacementPolicy.java        |  2 +-
 .../AllocationFileQueuePlacementRule.java          |  2 +-
 .../TestFSConfigToCSConfigArgumentHandler.java     |  2 +-
 .../fair/converter/TestFSQueueConverter.java       |  2 +-
 .../converter/TestQueuePlacementConverter.java     |  2 +-
 .../volume/csi/TestVolumeProcessor.java            |  6 ++--
 .../webapp/ActivitiesTestUtils.java                |  2 +-
 .../webapp/TestApplicationsRequestBuilder.java     |  2 +-
 .../resourcemanager/webapp/TestRMWebApp.java       |  2 +-
 .../webapp/TestRMWebAppFairScheduler.java          |  2 +-
 .../webapp/TestRMWebServiceAppsNodelabel.java      |  4 +--
 .../resourcemanager/webapp/TestRMWebServices.java  |  2 +-
 .../webapp/TestRMWebServicesApps.java              |  2 +-
 .../TestRMWebServicesForCSWithPartitions.java      |  6 ++--
 .../webapp/TestRMWebServicesNodes.java             |  2 +-
 .../FairSchedulerJsonVerifications.java            |  2 +-
 .../FairSchedulerXmlVerifications.java             |  2 +-
 .../helper/ResourceRequestsJsonVerifications.java  |  4 +--
 .../helper/ResourceRequestsXmlVerifications.java   |  6 ++--
 .../apache/hadoop/yarn/server/router/Router.java   |  2 +-
 .../hadoop/yarn/server/router/RouterMetrics.java   |  2 +-
 .../clientrm/DefaultClientRequestInterceptor.java  |  2 +-
 .../clientrm/FederationClientInterceptor.java      |  4 +--
 .../router/clientrm/RouterClientRMService.java     |  2 +-
 .../rmadmin/DefaultRMAdminRequestInterceptor.java  |  2 +-
 .../router/rmadmin/RouterRMAdminService.java       |  2 +-
 .../router/webapp/FederationInterceptorREST.java   |  4 +--
 .../server/router/webapp/RouterWebServices.java    |  2 +-
 .../router/webapp/TestRouterWebServicesREST.java   |  2 +-
 .../server/sharedcachemanager/CleanerService.java  |  2 +-
 .../sharedcachemanager/SharedCacheManager.java     |  2 +-
 .../sharedcachemanager/store/InMemorySCMStore.java |  4 +--
 .../server/sharedcachemanager/store/SCMStore.java  |  2 +-
 .../hadoop-yarn-server-tests/pom.xml               |  4 +--
 .../apache/hadoop/yarn/server/MiniYARNCluster.java |  2 +-
 .../pom.xml                                        |  4 +--
 .../timeline/EntityGroupFSTimelineStore.java       |  4 +--
 .../hadoop/yarn/server/timeline/LogInfo.java       |  2 +-
 .../server/timeline/EntityGroupPlugInForTest.java  |  2 +-
 .../cosmosdb/CosmosDBDocumentStoreReader.java      |  4 +--
 .../cosmosdb/CosmosDBDocumentStoreWriter.java      |  2 +-
 .../pom.xml                                        |  6 ++++
 .../TestTimelineReaderWebServicesHBaseStorage.java |  4 +--
 .../pom.xml                                        |  4 +--
 .../storage/HBaseTimelineSchemaCreator.java        |  2 +-
 .../storage/reader/ApplicationEntityReader.java    |  2 +-
 .../storage/reader/EntityTypeReader.java           |  2 +-
 .../storage/reader/FlowActivityEntityReader.java   |  2 +-
 .../storage/reader/FlowRunEntityReader.java        |  2 +-
 .../storage/reader/GenericEntityReader.java        |  2 +-
 .../storage/reader/SubApplicationEntityReader.java |  2 +-
 .../pom.xml                                        |  4 +--
 .../storage/common/TestSeparator.java              |  2 +-
 .../pom.xml                                        |  4 +--
 .../timelineservice/storage/flow/FlowScanner.java  |  2 +-
 .../pom.xml                                        |  4 +--
 .../timelineservice/storage/flow/FlowScanner.java  |  2 +-
 .../hadoop-yarn-server-timelineservice/pom.xml     |  4 +--
 .../collector/AppLevelTimelineCollector.java       |  4 +--
 .../AppLevelTimelineCollectorWithAgg.java          |  2 +-
 .../collector/NodeTimelineCollectorManager.java    |  4 +--
 .../PerNodeTimelineCollectorsAuxService.java       |  2 +-
 .../collector/TimelineCollectorManager.java        |  2 +-
 .../PerNodeAggTimelineCollectorMetrics.java        |  2 +-
 .../metrics/TimelineReaderMetrics.java             |  2 +-
 .../reader/TimelineReaderServer.java               |  2 +-
 .../reader/TimelineReaderUtils.java                |  2 +-
 .../reader/TimelineReaderWebServices.java          |  2 +-
 .../storage/FileSystemTimelineReaderImpl.java      |  2 +-
 .../storage/FileSystemTimelineWriterImpl.java      |  2 +-
 .../storage/TimelineSchemaCreator.java             |  2 +-
 .../storage/common/OfflineAggregationInfo.java     |  2 +-
 .../collector/TestTimelineCollector.java           |  2 +-
 .../reader/TestTimelineReaderWebServicesUtils.java |  2 +-
 .../hadoop-yarn-server-web-proxy/pom.xml           |  4 +--
 .../hadoop/yarn/server/webproxy/ProxyCA.java       |  2 +-
 .../hadoop/yarn/server/webproxy/WebAppProxy.java   |  2 +-
 .../yarn/server/webproxy/WebAppProxyServlet.java   |  2 +-
 .../webproxy/amfilter/AmFilterInitializer.java     |  2 +-
 .../yarn/server/webproxy/amfilter/AmIpFilter.java  |  2 +-
 .../yarn/server/webproxy/TestProxyUriUtils.java    |  2 +-
 1749 files changed, 2807 insertions(+), 2744 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to