Merge branch 'trunk' into HADOOP-13345

 Conflicts:
        hadoop-tools/hadoop-aws/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b114f248
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b114f248
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b114f248

Branch: refs/heads/HADOOP-13345
Commit: b114f2488fc1a298d9c993af6ca3575249e6f4d3
Parents: b4c2ab2 63cfcb9
Author: Steve Loughran <ste...@apache.org>
Authored: Wed Aug 9 18:23:39 2017 +0100
Committer: Steve Loughran <ste...@apache.org>
Committed: Wed Aug 9 18:23:39 2017 +0100

----------------------------------------------------------------------
 LICENSE.txt                                     |     1 +
 dev-support/docker/hadoop_env_checks.sh         |     2 +-
 dev-support/findHangingTest.sh                  |     2 +-
 dev-support/verify-xml.sh                       |     2 +-
 .../resources/assemblies/hadoop-yarn-dist.xml   |     1 +
 .../hadoop-client-check-invariants/pom.xml      |     1 -
 .../hadoop-client-check-test-invariants/pom.xml |     1 -
 .../hadoop-client-minicluster/pom.xml           |    43 +
 hadoop-client-modules/hadoop-client/pom.xml     |     4 -
 .../util/TestCertificateUtil.java               |     6 +-
 .../dev-support/findbugsExcludeFile.xml         |     4 +
 hadoop-common-project/hadoop-common/pom.xml     |     7 +-
 .../hadoop-common/src/main/bin/hadoop           |    28 +-
 .../src/main/bin/hadoop-functions.sh            |   161 +-
 .../org/apache/hadoop/conf/Configuration.java   |    63 +-
 .../apache/hadoop/conf/ReconfigurableBase.java  |     7 +-
 .../hadoop/conf/ReconfigurationServlet.java     |     8 +-
 .../hadoop/crypto/JceAesCtrCryptoCodec.java     |     8 +-
 .../hadoop/crypto/OpensslAesCtrCryptoCodec.java |     8 +-
 .../org/apache/hadoop/crypto/OpensslCipher.java |     8 +-
 .../crypto/key/kms/KMSClientProvider.java       |    39 +-
 .../key/kms/LoadBalancingKMSClientProvider.java |    90 +-
 .../crypto/random/OpensslSecureRandom.java      |     8 +-
 .../hadoop/crypto/random/OsSecureRandom.java    |     9 +-
 .../apache/hadoop/fs/AbstractFileSystem.java    |     6 +-
 .../java/org/apache/hadoop/fs/ChecksumFs.java   |     8 +-
 .../fs/CommonConfigurationKeysPublic.java       |    31 +
 .../src/main/java/org/apache/hadoop/fs/DF.java  |     9 +-
 .../hadoop/fs/DelegationTokenRenewer.java       |    10 +-
 .../hadoop/fs/FSDataOutputStreamBuilder.java    |   161 +-
 .../org/apache/hadoop/fs/FSInputChecker.java    |     9 +-
 .../java/org/apache/hadoop/fs/FileContext.java  |    10 +-
 .../apache/hadoop/fs/FileEncryptionInfo.java    |     6 +-
 .../java/org/apache/hadoop/fs/FileStatus.java   |   172 +-
 .../java/org/apache/hadoop/fs/FileSystem.java   |    24 +-
 .../java/org/apache/hadoop/fs/FileUtil.java     |    10 +-
 .../main/java/org/apache/hadoop/fs/FsShell.java |     6 +-
 .../apache/hadoop/fs/FsShellPermissions.java    |     4 +-
 .../org/apache/hadoop/fs/FsUrlConnection.java   |    10 +
 .../hadoop/fs/FsUrlStreamHandlerFactory.java    |    26 +-
 .../main/java/org/apache/hadoop/fs/Globber.java |     7 +-
 .../org/apache/hadoop/fs/HarFileSystem.java     |    11 +-
 .../org/apache/hadoop/fs/LocalDirAllocator.java |     9 +-
 .../org/apache/hadoop/fs/LocatedFileStatus.java |    64 +-
 .../main/java/org/apache/hadoop/fs/Trash.java   |     7 +-
 .../apache/hadoop/fs/TrashPolicyDefault.java    |     8 +-
 .../org/apache/hadoop/fs/ftp/FTPFileSystem.java |     8 +-
 .../hadoop/fs/permission/FsPermission.java      |    18 +-
 .../apache/hadoop/fs/protocolPB/PBHelper.java   |   131 +
 .../hadoop/fs/protocolPB/package-info.java      |    18 +
 .../hadoop/fs/sftp/SFTPConnectionPool.java      |     7 +-
 .../apache/hadoop/fs/sftp/SFTPFileSystem.java   |     7 +-
 .../org/apache/hadoop/fs/shell/Command.java     |     6 +-
 .../apache/hadoop/fs/shell/CopyCommands.java    |   112 +-
 .../apache/hadoop/fs/shell/MoveCommands.java    |     4 +-
 .../java/org/apache/hadoop/fs/shell/Stat.java   |    19 +-
 .../org/apache/hadoop/fs/viewfs/Constants.java  |     2 +
 .../apache/hadoop/fs/viewfs/ViewFileSystem.java |    79 +-
 .../org/apache/hadoop/fs/viewfs/ViewFs.java     |    43 +-
 .../apache/hadoop/ha/ActiveStandbyElector.java  |    15 +-
 .../apache/hadoop/ha/FailoverController.java    |    10 +-
 .../main/java/org/apache/hadoop/ha/HAAdmin.java |     8 +-
 .../org/apache/hadoop/ha/HealthMonitor.java     |     8 +-
 .../java/org/apache/hadoop/ha/NodeFencer.java   |     6 +-
 .../org/apache/hadoop/ha/PowerShellFencer.java  |     7 +-
 .../apache/hadoop/ha/ShellCommandFencer.java    |     7 +-
 .../org/apache/hadoop/ha/SshFenceByTcpPort.java |    18 +-
 .../java/org/apache/hadoop/ha/StreamPumper.java |     8 +-
 .../apache/hadoop/ha/ZKFailoverController.java  |    20 +-
 ...HAServiceProtocolServerSideTranslatorPB.java |     6 +-
 .../org/apache/hadoop/http/HttpServer2.java     |     7 +-
 .../hadoop/http/lib/StaticUserWebFilter.java    |     7 +-
 .../java/org/apache/hadoop/io/BloomMapFile.java |     6 +-
 .../apache/hadoop/io/FastByteComparisons.java   |     7 +-
 .../main/java/org/apache/hadoop/io/IOUtils.java |    10 +-
 .../main/java/org/apache/hadoop/io/MapFile.java |     8 +-
 .../org/apache/hadoop/io/ReadaheadPool.java     |     6 +-
 .../java/org/apache/hadoop/io/SequenceFile.java |     7 +-
 .../main/java/org/apache/hadoop/io/UTF8.java    |     5 +-
 .../apache/hadoop/io/compress/CodecPool.java    |     6 +-
 .../io/compress/CompressionCodecFactory.java    |     8 +-
 .../apache/hadoop/io/compress/DefaultCodec.java |     6 +-
 .../io/compress/bzip2/Bzip2Compressor.java      |     8 +-
 .../io/compress/bzip2/Bzip2Decompressor.java    |     8 +-
 .../hadoop/io/compress/bzip2/Bzip2Factory.java  |     6 +-
 .../hadoop/io/compress/lz4/Lz4Compressor.java   |     8 +-
 .../hadoop/io/compress/lz4/Lz4Decompressor.java |     8 +-
 .../io/compress/snappy/SnappyCompressor.java    |     8 +-
 .../io/compress/snappy/SnappyDecompressor.java  |     8 +-
 .../io/compress/zlib/BuiltInZlibDeflater.java   |     8 +-
 .../hadoop/io/compress/zlib/ZlibCompressor.java |     8 +-
 .../hadoop/io/compress/zlib/ZlibFactory.java    |     8 +-
 .../apache/hadoop/io/erasurecode/CodecUtil.java |    20 +-
 .../apache/hadoop/io/erasurecode/ECSchema.java  |     6 +-
 .../io/erasurecode/ErasureCodeNative.java       |    13 +-
 .../org/apache/hadoop/io/file/tfile/BCFile.java |     6 +-
 .../hadoop/io/file/tfile/Compression.java       |     6 +-
 .../org/apache/hadoop/io/file/tfile/TFile.java  |     8 +-
 .../hadoop/io/file/tfile/TFileDumper.java       |     8 +-
 .../org/apache/hadoop/io/nativeio/NativeIO.java |    16 +-
 .../nativeio/SharedFileDescriptorFactory.java   |     7 +-
 .../hadoop/io/retry/RetryInvocationHandler.java |    11 +
 .../apache/hadoop/io/retry/RetryPolicies.java   |     6 +-
 .../org/apache/hadoop/io/retry/RetryUtils.java  |     6 +-
 .../io/serializer/SerializationFactory.java     |     8 +-
 .../org/apache/hadoop/ipc/CallQueueManager.java |     7 +-
 .../main/java/org/apache/hadoop/ipc/Client.java |    40 +-
 .../org/apache/hadoop/ipc/FairCallQueue.java    |     6 +-
 .../apache/hadoop/ipc/ProtobufRpcEngine.java    |     7 +-
 .../main/java/org/apache/hadoop/ipc/RPC.java    |     6 +-
 .../org/apache/hadoop/ipc/RefreshRegistry.java  |     7 +-
 .../java/org/apache/hadoop/ipc/RetryCache.java  |     6 +-
 .../main/java/org/apache/hadoop/ipc/Server.java |    16 +-
 .../ipc/WeightedRoundRobinMultiplexer.java      |     8 +-
 .../apache/hadoop/ipc/WritableRpcEngine.java    |     6 +-
 .../hadoop/ipc/metrics/RetryCacheMetrics.java   |     6 +-
 .../hadoop/ipc/metrics/RpcDetailedMetrics.java  |     8 +-
 .../apache/hadoop/ipc/metrics/RpcMetrics.java   |     6 +-
 .../org/apache/hadoop/jmx/JMXJsonServlet.java   |     7 +-
 .../hadoop/metrics2/impl/MBeanInfoBuilder.java  |     2 +-
 .../hadoop/metrics2/impl/MetricsConfig.java     |     8 +-
 .../metrics2/impl/MetricsSinkAdapter.java       |     9 +-
 .../metrics2/impl/MetricsSourceAdapter.java     |     7 +-
 .../hadoop/metrics2/impl/MetricsSystemImpl.java |     6 +-
 .../hadoop/metrics2/lib/MethodMetric.java       |     7 +-
 .../metrics2/lib/MetricsSourceBuilder.java      |     7 +-
 .../metrics2/lib/MutableMetricsFactory.java     |     7 +-
 .../hadoop/metrics2/lib/MutableRates.java       |     7 +-
 .../lib/MutableRatesWithAggregation.java        |     7 +-
 .../hadoop/metrics2/sink/GraphiteSink.java      |     7 +-
 .../sink/ganglia/AbstractGangliaSink.java       |    10 +-
 .../metrics2/sink/ganglia/GangliaSink30.java    |     6 +-
 .../metrics2/sink/ganglia/GangliaSink31.java    |     7 +-
 .../org/apache/hadoop/metrics2/util/MBeans.java |     6 +-
 .../hadoop/metrics2/util/MetricsCache.java      |     6 +-
 .../main/java/org/apache/hadoop/net/DNS.java    |     6 +-
 .../java/org/apache/hadoop/net/NetUtils.java    |     6 +-
 .../apache/hadoop/net/ScriptBasedMapping.java   |     8 +-
 .../apache/hadoop/net/SocketIOWithTimeout.java  |     6 +-
 .../org/apache/hadoop/net/TableMapping.java     |     6 +-
 .../apache/hadoop/net/unix/DomainSocket.java    |    10 +-
 .../hadoop/net/unix/DomainSocketWatcher.java    |    12 +-
 .../AuthenticationWithProxyUserFilter.java      |     8 +-
 .../hadoop/security/CompositeGroupsMapping.java |     7 +-
 .../org/apache/hadoop/security/Credentials.java |    10 +-
 .../java/org/apache/hadoop/security/Groups.java |     7 +-
 .../HttpCrossOriginFilterInitializer.java       |     8 +-
 .../security/JniBasedUnixGroupsMapping.java     |     8 +-
 .../JniBasedUnixGroupsMappingWithFallback.java  |     8 +-
 .../JniBasedUnixGroupsNetgroupMapping.java      |     6 +-
 ...edUnixGroupsNetgroupMappingWithFallback.java |     8 +-
 .../hadoop/security/LdapGroupsMapping.java      |     7 +-
 .../apache/hadoop/security/ProviderUtils.java   |     7 +-
 .../apache/hadoop/security/SaslInputStream.java |     7 +-
 .../apache/hadoop/security/SaslRpcClient.java   |     7 +-
 .../apache/hadoop/security/SaslRpcServer.java   |     6 +-
 .../apache/hadoop/security/SecurityUtil.java    |     9 +-
 .../hadoop/security/ShellBasedIdMapping.java    |     8 +-
 .../ShellBasedUnixGroupsNetgroupMapping.java    |     8 +-
 .../hadoop/security/UserGroupInformation.java   |     5 +-
 .../hadoop/security/WhitelistBasedResolver.java |     7 +-
 .../alias/AbstractJavaKeyStoreProvider.java     |     6 +-
 .../alias/CredentialProviderFactory.java        |    10 +
 .../authorize/ServiceAuthorizationManager.java  |     9 +-
 .../hadoop/security/http/CrossOriginFilter.java |     7 +-
 .../security/ssl/FileBasedKeyStoresFactory.java |     8 +-
 .../security/ssl/ReloadingX509TrustManager.java |     7 +-
 .../hadoop/security/token/DtFileOperations.java |     7 +-
 .../hadoop/security/token/DtUtilShell.java      |     6 +-
 .../org/apache/hadoop/security/token/Token.java |     6 +-
 .../AbstractDelegationTokenSecretManager.java   |     8 +-
 .../apache/hadoop/service/AbstractService.java  |     9 +-
 .../apache/hadoop/service/CompositeService.java |     7 +-
 .../service/LoggingStateChangeListener.java     |    11 +-
 .../hadoop/service/ServiceOperations.java       |    25 +-
 .../tracing/TracerConfigurationManager.java     |     8 +-
 .../hadoop/util/ApplicationClassLoader.java     |    10 +-
 .../apache/hadoop/util/AsyncDiskService.java    |     7 +-
 .../apache/hadoop/util/CombinedIPWhiteList.java |     7 +-
 .../apache/hadoop/util/FastNumberFormat.java    |    44 +
 .../org/apache/hadoop/util/FileBasedIPList.java |    11 +-
 .../main/java/org/apache/hadoop/util/GSet.java  |     6 +-
 .../hadoop/util/GenericOptionsParser.java       |     7 +-
 .../org/apache/hadoop/util/GenericsUtil.java    |    15 +
 .../org/apache/hadoop/util/HostsFileReader.java |     9 +-
 .../apache/hadoop/util/IntrusiveCollection.java |     7 +-
 .../org/apache/hadoop/util/JvmPauseMonitor.java |     6 +-
 .../java/org/apache/hadoop/util/LogAdapter.java |     4 +
 .../org/apache/hadoop/util/MachineList.java     |     6 +-
 .../apache/hadoop/util/NativeCodeLoader.java    |     8 +-
 .../hadoop/util/NodeHealthScriptRunner.java     |     7 +-
 .../java/org/apache/hadoop/util/Progress.java   |     6 +-
 .../org/apache/hadoop/util/ReflectionUtils.java |    30 +
 .../apache/hadoop/util/ShutdownHookManager.java |     7 +-
 .../hadoop/util/ShutdownThreadsHelper.java      |     7 +-
 .../org/apache/hadoop/util/SysInfoLinux.java    |     8 +-
 .../org/apache/hadoop/util/SysInfoWindows.java  |     7 +-
 .../java/org/apache/hadoop/util/ThreadUtil.java |     7 +-
 .../org/apache/hadoop/util/VersionInfo.java     |     8 +-
 .../hadoop/util/concurrent/AsyncGetFuture.java  |     7 +-
 .../hadoop/util/concurrent/ExecutorHelper.java  |     8 +-
 .../HadoopScheduledThreadPoolExecutor.java      |     8 +-
 .../concurrent/HadoopThreadPoolExecutor.java    |     8 +-
 .../org/apache/hadoop/crypto/OpensslCipher.c    |    46 +-
 .../hadoop-common/src/main/proto/FSProtos.proto |    69 +
 .../src/main/resources/core-default.xml         |    56 +-
 .../src/site/markdown/FileSystemShell.md        |     4 +-
 .../hadoop-common/src/site/markdown/Metrics.md  |    20 +-
 .../src/site/markdown/SecureMode.md             |     9 +-
 .../src/site/markdown/ServiceLevelAuth.md       |    32 +-
 .../src/site/markdown/UnixShellGuide.md         |     4 +-
 .../src/site/markdown/filesystem/filesystem.md  |    24 +
 .../3.0.0-alpha4/CHANGES.3.0.0-alpha4.md        |   880 +
 .../3.0.0-alpha4/RELEASENOTES.3.0.0-alpha4.md   |   492 +
 .../conf/TestCommonConfigurationFields.java     |     3 +
 .../apache/hadoop/conf/TestConfiguration.java   |   181 +-
 .../apache/hadoop/conf/TestDeprecatedKeys.java  |     2 +-
 .../hadoop/crypto/CryptoStreamsTestBase.java    |     6 +-
 .../apache/hadoop/crypto/TestCryptoCodec.java   |     7 +-
 .../crypto/key/TestKeyProviderFactory.java      |    11 +-
 .../kms/TestLoadBalancingKMSClientProvider.java |   378 +-
 .../apache/hadoop/fs/FCStatisticsBaseTest.java  |     7 +-
 .../fs/FileContextCreateMkdirBaseTest.java      |     2 +-
 .../fs/FileContextMainOperationsBaseTest.java   |    66 +-
 .../hadoop/fs/FileContextPermissionBase.java    |     5 +-
 .../apache/hadoop/fs/FileContextUtilBase.java   |     5 +-
 .../org/apache/hadoop/fs/TestFileContext.java   |     7 +-
 .../org/apache/hadoop/fs/TestFileStatus.java    |     9 +-
 .../java/org/apache/hadoop/fs/TestFileUtil.java |     6 +-
 .../org/apache/hadoop/fs/TestFsShellCopy.java   |     6 +-
 .../apache/hadoop/fs/TestFsShellReturnCode.java |     8 +-
 .../org/apache/hadoop/fs/TestFsShellTouch.java  |     6 +-
 .../org/apache/hadoop/fs/TestHarFileSystem.java |     7 +-
 .../java/org/apache/hadoop/fs/TestHardLink.java |     2 +-
 .../org/apache/hadoop/fs/TestListFiles.java     |     4 +-
 .../apache/hadoop/fs/TestLocalFileSystem.java   |    72 +-
 .../fs/TestLocalFileSystemPermission.java       |     2 +-
 .../fs/contract/AbstractBondedFSContract.java   |     8 +-
 .../fs/contract/AbstractContractAppendTest.java |    33 +-
 .../fs/contract/AbstractContractCreateTest.java |    90 +-
 .../hadoop/fs/contract/ContractTestUtils.java   |   150 +-
 .../hadoop/fs/loadGenerator/LoadGenerator.java  |    10 +-
 .../fs/protocolPB/TestFSSerialization.java      |    85 +
 .../hadoop/fs/shell/TestCopyFromLocal.java      |   173 +
 .../hadoop/fs/shell/TestCopyPreserveFlag.java   |    19 +
 .../fs/viewfs/ViewFileSystemBaseTest.java       |    79 +-
 .../apache/hadoop/fs/viewfs/ViewFsBaseTest.java |    94 +-
 .../hadoop/ha/ActiveStandbyElectorTestUtil.java |     6 +-
 .../org/apache/hadoop/ha/DummyHAService.java    |     7 +-
 .../org/apache/hadoop/ha/MiniZKFCCluster.java   |     7 +-
 .../ha/TestActiveStandbyElectorRealZK.java      |     7 +-
 .../java/org/apache/hadoop/ha/TestHAAdmin.java  |     6 +-
 .../org/apache/hadoop/ha/TestHealthMonitor.java |     6 +-
 .../hadoop/ha/TestShellCommandFencer.java       |    55 +-
 .../apache/hadoop/ha/TestSshFenceByTcpPort.java |     6 +-
 .../hadoop/ha/TestZKFailoverController.java     |     5 +-
 .../apache/hadoop/http/TestGlobalFilter.java    |     6 +-
 .../org/apache/hadoop/http/TestHttpServer.java  |     6 +-
 .../apache/hadoop/http/TestHttpServerLogs.java  |     6 +-
 .../hadoop/http/TestHttpServerWebapps.java      |     9 +-
 .../hadoop/http/TestHttpServerWithSpengo.java   |     7 +-
 .../org/apache/hadoop/http/TestPathFilter.java  |     6 +-
 .../apache/hadoop/http/TestSSLHttpServer.java   |     7 +-
 .../apache/hadoop/http/TestServletFilter.java   |     6 +-
 .../hadoop/http/resource/JerseyResource.java    |     6 +-
 .../org/apache/hadoop/io/TestArrayFile.java     |     7 +-
 .../hadoop/io/TestDefaultStringifier.java       |     8 +-
 .../org/apache/hadoop/io/TestSequenceFile.java  |     7 +-
 .../java/org/apache/hadoop/io/TestSetFile.java  |     7 +-
 .../org/apache/hadoop/io/TestWritableUtils.java |     7 +-
 .../apache/hadoop/io/compress/TestCodec.java    |     8 +-
 .../io/compress/TestCompressionStreamReuse.java |     9 +-
 .../apache/hadoop/io/nativeio/TestNativeIO.java |    10 +-
 .../TestSharedFileDescriptorFactory.java        |     7 +-
 .../io/serializer/TestSerializationFactory.java |     6 +-
 .../org/apache/hadoop/ipc/MiniRPCBenchmark.java |    13 +-
 .../org/apache/hadoop/ipc/TestAsyncIPC.java     |    10 +-
 .../java/org/apache/hadoop/ipc/TestIPC.java     |    98 +-
 .../hadoop/ipc/TestIPCServerResponder.java      |    10 +-
 .../apache/hadoop/ipc/TestMiniRPCBenchmark.java |     2 +-
 .../ipc/TestProtoBufRpcServerHandoff.java       |    12 +-
 .../java/org/apache/hadoop/ipc/TestRPC.java     |     8 +-
 .../apache/hadoop/ipc/TestRPCCompatibility.java |     8 +-
 .../hadoop/ipc/TestRPCServerShutdown.java       |     7 +-
 .../apache/hadoop/ipc/TestRpcServerHandoff.java |     8 +-
 .../java/org/apache/hadoop/ipc/TestSaslRPC.java |    23 +-
 .../java/org/apache/hadoop/ipc/TestServer.java  |     4 +-
 .../ipc/TestWeightedRoundRobinMultiplexer.java  |     7 +-
 .../metrics2/impl/TestGangliaMetrics.java       |     7 +-
 .../hadoop/metrics2/impl/TestMetricsConfig.java |     7 +-
 .../metrics2/impl/TestMetricsSystemImpl.java    |    13 +-
 .../hadoop/metrics2/impl/TestSinkQueue.java     |    10 +-
 .../hadoop/metrics2/lib/TestMutableMetrics.java |     7 +-
 .../hadoop/metrics2/util/TestMetricsCache.java  |     8 +-
 .../org/apache/hadoop/net/ServerSocketUtil.java |     9 +-
 .../java/org/apache/hadoop/net/TestDNS.java     |     6 +-
 .../org/apache/hadoop/net/TestNetUtils.java     |     6 +-
 .../hadoop/net/TestSocketIOWithTimeout.java     |     8 +-
 .../apache/hadoop/net/TestStaticMapping.java    |     7 +-
 .../hadoop/net/unix/TestDomainSocket.java       |     2 +-
 .../net/unix/TestDomainSocketWatcher.java       |    15 +-
 .../security/TestCompositeGroupMapping.java     |     7 +-
 .../hadoop/security/TestDoAsEffectiveUser.java  |     8 +-
 .../hadoop/security/TestGroupFallback.java      |    19 +-
 .../hadoop/security/TestGroupsCaching.java      |     8 +-
 .../TestShellBasedUnixGroupsMapping.java        |     8 +-
 .../hadoop/security/TestUGIWithMiniKdc.java     |     2 +-
 .../security/TestUserGroupInformation.java      |     2 +-
 .../alias/TestCredentialProviderFactory.java    |    17 +-
 .../authorize/TestAccessControlList.java        |    16 +-
 .../security/authorize/TestProxyUsers.java      |     8 +-
 .../hadoop/security/ssl/TestSSLFactory.java     |     2 +-
 .../token/delegation/TestDelegationToken.java   |     7 +-
 .../delegation/web/TestWebDelegationToken.java  |     2 +-
 .../hadoop/service/TestCompositeService.java    |     7 +-
 .../hadoop/service/TestServiceLifecycle.java    |     7 +-
 .../hadoop/service/TestServiceOperations.java   |    65 +
 .../apache/hadoop/test/GenericTestUtils.java    |   104 +-
 .../org/apache/hadoop/test/MetricsAsserts.java  |     6 +-
 .../org/apache/hadoop/test/MockitoMaker.java    |   132 -
 .../hadoop/test/MultithreadedTestUtil.java      |     8 +-
 .../hadoop/test/TestGenericTestUtils.java       |    15 +-
 .../org/apache/hadoop/test/TestJUnitSetup.java  |     7 +-
 .../hadoop/util/Crc32PerformanceTest.java       |    11 +-
 .../hadoop/util/TestAsyncDiskService.java       |     7 +-
 .../org/apache/hadoop/util/TestClasspath.java   |     9 +-
 .../org/apache/hadoop/util/TestDiskChecker.java |    12 +-
 .../hadoop/util/TestFastNumberFormat.java       |    46 +
 .../org/apache/hadoop/util/TestFindClass.java   |     7 +-
 .../apache/hadoop/util/TestGenericsUtil.java    |     5 +
 .../hadoop/util/TestIdentityHashStore.java      |     7 +-
 .../apache/hadoop/util/TestLightWeightGSet.java |     7 +-
 .../util/TestLightWeightResizableGSet.java      |     7 +-
 .../hadoop/util/TestNativeCodeLoader.java       |     6 +-
 .../hadoop/util/TestReadWriteDiskValidator.java |     5 +-
 .../apache/hadoop/util/TestReflectionUtils.java |    19 +-
 .../apache/hadoop/util/TestSignalLogger.java    |    11 +-
 .../org/apache/hadoop/util/TestWinUtils.java    |     6 +-
 .../src/test/resources/testConf.xml             |    54 +-
 .../scripts/hadoop-functions_test_helper.bash   |     2 +-
 .../test/scripts/hadoop_add_array_param.bats    |    37 +
 .../src/test/scripts/hadoop_array_contains.bats |    47 +
 .../src/test/scripts/hadoop_sort_array.bats     |    37 +
 .../main/libexec/shellprofile.d/hadoop-kms.sh   |     4 +-
 .../main/resources/webapps/kms/WEB-INF/web.xml  |    10 +
 .../hadoop/crypto/key/kms/server/TestKMS.java   |    79 +
 hadoop-common-project/hadoop-nfs/pom.xml        |     6 +
 .../org/apache/hadoop/mount/MountdBase.java     |    12 +-
 .../java/org/apache/hadoop/nfs/NfsExports.java  |     6 +-
 .../org/apache/hadoop/nfs/nfs3/FileHandle.java  |     6 +-
 .../org/apache/hadoop/nfs/nfs3/Nfs3Base.java    |    10 +-
 .../hadoop/oncrpc/RegistrationClient.java       |     7 +-
 .../java/org/apache/hadoop/oncrpc/RpcCall.java  |    10 +-
 .../org/apache/hadoop/oncrpc/RpcProgram.java    |     6 +-
 .../java/org/apache/hadoop/oncrpc/RpcUtil.java  |    11 +-
 .../hadoop/oncrpc/SimpleTcpClientHandler.java   |     7 +-
 .../apache/hadoop/oncrpc/SimpleTcpServer.java   |     7 +-
 .../apache/hadoop/oncrpc/SimpleUdpServer.java   |     7 +-
 .../hadoop/oncrpc/security/Credentials.java     |     6 +-
 .../hadoop/oncrpc/security/SecurityHandler.java |     7 +-
 .../java/org/apache/hadoop/portmap/Portmap.java |     8 +-
 .../hadoop/portmap/RpcProgramPortmap.java       |     7 +-
 .../apache/hadoop/oncrpc/TestFrameDecoder.java  |     6 +-
 .../java/org/apache/hadoop/hdfs/DFSClient.java  |    26 +-
 .../org/apache/hadoop/hdfs/DFSUtilClient.java   |    23 +-
 .../hadoop/hdfs/DistributedFileSystem.java      |     5 +-
 .../hdfs/protocol/ErasureCodingPolicy.java      |     8 +-
 .../hdfs/protocol/FsPermissionExtension.java    |     5 +
 .../hadoop/hdfs/protocol/HdfsConstants.java     |     4 +-
 .../hadoop/hdfs/protocol/HdfsFileStatus.java    |   228 +-
 .../hdfs/protocol/HdfsLocatedFileStatus.java    |    42 +-
 .../protocol/SnapshottableDirectoryStatus.java  |    10 +-
 .../ClientNamenodeProtocolTranslatorPB.java     |     4 +-
 .../hadoop/hdfs/protocolPB/PBHelperClient.java  |    65 +-
 .../apache/hadoop/hdfs/web/JsonUtilClient.java  |    50 +-
 .../hadoop/hdfs/web/WebHdfsConstants.java       |     8 +-
 .../hadoop/hdfs/web/WebHdfsFileSystem.java      |    18 +-
 .../hadoop-hdfs-client/src/main/proto/acl.proto |     7 +-
 .../src/main/proto/erasurecoding.proto          |     2 +-
 .../src/main/proto/hdfs.proto                   |    16 +-
 .../src/main/conf/httpfs-env.sh                 |     2 +-
 .../hadoop/fs/http/client/HttpFSFileSystem.java |   134 +-
 .../hadoop/fs/http/server/FSOperations.java     |   157 +-
 .../http/server/HttpFSAuthenticationFilter.java |     6 +-
 .../http/server/HttpFSParametersProvider.java   |    48 +-
 .../hadoop/fs/http/server/HttpFSServer.java     |    57 +-
 .../fs/http/server/HttpFSServerWebServer.java   |    15 +-
 .../libexec/shellprofile.d/hadoop-httpfs.sh     |    35 +-
 .../src/main/resources/httpfs-default.xml       |     8 +-
 .../src/site/markdown/ServerSetup.md.vm         |    10 +-
 .../fs/http/client/BaseTestHttpFSWith.java      |   242 +-
 ...KerberosAuthenticationHandlerForTesting.java |     1 -
 .../hadoop/fs/http/server/TestHttpFSServer.java |   492 +-
 .../fs/http/server/TestHttpFSServerNoACLs.java  |    15 +-
 .../http/server/TestHttpFSServerNoXAttrs.java   |    10 +-
 .../http/server/TestHttpFSServerWebServer.java  |     2 +-
 .../dev-support/findbugsExcludeFile.xml         |    12 +
 .../jdiff/Apache_Hadoop_HDFS_3.0.0-alpha4.xml   |   322 +
 .../hadoop-hdfs/src/main/bin/hdfs               |    62 +-
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |     6 +-
 .../hadoop/hdfs/protocol/SnapshotException.java |     4 +
 .../hadoop/hdfs/protocol/SnapshotInfo.java      |     2 +-
 ...tNamenodeProtocolServerSideTranslatorPB.java |     4 +-
 .../hadoop/hdfs/protocolPB/package-info.java    |    18 +
 .../hadoop/hdfs/qjournal/server/Journal.java    |     3 +-
 .../hdfs/qjournal/server/JournalMetrics.java    |    11 +
 .../hdfs/qjournal/server/JournalNodeSyncer.java |     4 +
 .../hadoop/hdfs/server/balancer/Dispatcher.java |    36 +-
 .../server/blockmanagement/BlockCollection.java |    24 +-
 .../server/blockmanagement/BlockManager.java    |    49 +-
 .../blockmanagement/DatanodeAdminManager.java   |   756 +
 .../blockmanagement/DatanodeDescriptor.java     |    19 +-
 .../server/blockmanagement/DatanodeManager.java |    50 +-
 .../blockmanagement/DecommissionManager.java    |   741 -
 .../hdfs/server/datanode/BPOfferService.java    |    47 +-
 .../hadoop/hdfs/server/datanode/DataNode.java   |    31 +-
 .../hdfs/server/datanode/DataNodeMXBean.java    |     7 +
 .../hdfs/server/datanode/DataXceiver.java       |     9 +-
 .../checker/StorageLocationChecker.java         |     8 +-
 .../erasurecode/ErasureCodingWorker.java        |    15 +-
 .../erasurecode/StripedBlockReconstructor.java  |     3 +-
 .../datanode/erasurecode/StripedReader.java     |    20 +
 .../erasurecode/StripedReconstructionInfo.java  |    15 +
 .../erasurecode/StripedReconstructor.java       |     8 +-
 .../datanode/fsdataset/impl/FsDatasetImpl.java  |    70 +-
 .../hadoop/hdfs/server/namenode/BackupNode.java |     2 +-
 .../ContentSummaryComputationContext.java       |    23 +-
 .../namenode/DirectoryWithQuotaFeature.java     |     4 +-
 .../server/namenode/EncryptionZoneManager.java  |     5 +-
 .../namenode/ErasureCodingPolicyManager.java    |    12 +-
 .../server/namenode/FSDirErasureCodingOp.java   |     5 +-
 .../server/namenode/FSDirStatAndListingOp.java  |    67 +-
 .../hdfs/server/namenode/FSDirectory.java       |    20 +-
 .../hdfs/server/namenode/FSNamesystem.java      |   169 +-
 .../server/namenode/FSPermissionChecker.java    |    32 +
 .../hadoop/hdfs/server/namenode/INode.java      |     9 +-
 .../hdfs/server/namenode/INodeDirectory.java    |    16 +-
 .../hdfs/server/namenode/INodeReference.java    |     3 +-
 .../namenode/INodeWithAdditionalFields.java     |    24 +-
 .../hdfs/server/namenode/INodesInPath.java      |    19 +-
 .../hdfs/server/namenode/LeaseManager.java      |    23 +-
 .../hadoop/hdfs/server/namenode/NameNode.java   |     5 +-
 .../hdfs/server/namenode/NameNodeRpcServer.java |    20 +-
 .../hdfs/server/namenode/SecondaryNameNode.java |    10 +
 .../namenode/metrics/ECBlockGroupsMBean.java    |    59 +
 .../metrics/ECBlockGroupsStatsMBean.java        |    59 -
 .../namenode/metrics/ReplicatedBlocksMBean.java |    63 +
 .../metrics/ReplicatedBlocksStatsMBean.java     |    63 -
 .../snapshot/AbstractINodeDiffList.java         |    53 +-
 .../snapshot/DirectorySnapshottableFeature.java |    19 +-
 .../snapshot/DirectoryWithSnapshotFeature.java  |     3 +-
 .../hdfs/server/namenode/snapshot/Snapshot.java |     4 +-
 .../namenode/snapshot/SnapshotManager.java      |     7 +-
 .../org/apache/hadoop/hdfs/tools/DFSAdmin.java  |    65 +-
 .../org/apache/hadoop/hdfs/tools/ECAdmin.java   |    14 +-
 .../org/apache/hadoop/hdfs/web/JsonUtil.java    |    28 +-
 .../src/main/resources/hdfs-default.xml         |    47 +-
 .../hadoop-hdfs/src/main/webapps/datanode/dn.js |     2 +-
 .../src/site/markdown/HDFSErasureCoding.md      |    27 +
 .../org/apache/hadoop/TestGenericRefresh.java   |    28 +-
 .../fs/TestHDFSFileContextMainOperations.java   |    46 +-
 .../apache/hadoop/fs/TestUrlStreamHandler.java  |    48 +-
 .../fs/viewfs/TestViewFileSystemHdfs.java       |    22 +
 .../org/apache/hadoop/hdfs/MiniDFSCluster.java  |     8 +-
 .../hadoop/hdfs/TestDFSClientRetries.java       |     6 +-
 .../hadoop/hdfs/TestDFSClientSocketSize.java    |    20 +-
 .../org/apache/hadoop/hdfs/TestDFSShell.java    |    12 +-
 .../apache/hadoop/hdfs/TestDecommission.java    |    44 +-
 .../hadoop/hdfs/TestDistributedFileSystem.java  |    50 +
 .../apache/hadoop/hdfs/TestEncryptionZones.java |     3 +-
 .../hadoop/hdfs/TestEncryptionZonesWithKMS.java |    19 +-
 .../hadoop/hdfs/TestErasureCodingPolicies.java  |    44 +-
 .../hdfs/TestFileStatusSerialization.java       |   153 +
 .../java/org/apache/hadoop/hdfs/TestLease.java  |     7 +-
 .../hadoop/hdfs/TestReconstructStripedFile.java |    74 +-
 .../hdfs/qjournal/TestJournalNodeSync.java      |   265 -
 .../hdfs/qjournal/server/TestJournalNode.java   |     6 +-
 .../qjournal/server/TestJournalNodeSync.java    |   439 +
 .../blockmanagement/BlockManagerTestUtil.java   |     2 +-
 .../blockmanagement/TestBlockManager.java       |    58 +-
 .../TestPendingReconstruction.java              |    46 +-
 ...constructStripedBlocksWithRackAwareness.java |     5 +-
 .../TestReplicationPolicyConsiderLoad.java      |     2 +-
 .../server/datanode/TestBPOfferService.java     |    29 +
 .../server/datanode/TestDataNodeMXBean.java     |     4 +
 .../TestDataXceiverBackwardsCompat.java         |   212 +
 .../fsdataset/impl/FsDatasetImplTestUtils.java  |    10 +
 .../fsdataset/impl/TestWriteToReplica.java      |    53 +-
 .../hdfs/server/namenode/AclTestHelpers.java    |    13 +-
 .../server/namenode/TestAddStripedBlocks.java   |     4 +-
 .../hdfs/server/namenode/TestDeadDatanode.java  |    53 +
 .../namenode/TestDecommissioningStatus.java     |     6 +-
 .../TestDefaultBlockPlacementPolicy.java        |     4 +-
 .../server/namenode/TestEnabledECPolicies.java  |    10 +-
 .../hadoop/hdfs/server/namenode/TestFsck.java   |    17 +-
 .../TestGetContentSummaryWithPermission.java    |   201 +
 .../hdfs/server/namenode/TestMetaSave.java      |     2 +
 .../namenode/TestNameNodeHttpServerXFrame.java  |    22 +
 .../server/namenode/TestNameNodeMXBean.java     |    14 +-
 .../namenode/TestNameNodeReconfigure.java       |    47 +
 .../namenode/TestNamenodeCapacityReport.java    |     8 +-
 .../namenode/TestReconstructStripedBlocks.java  |     4 +-
 .../server/namenode/TestSnapshotPathINodes.java |     5 +-
 .../namenode/TestTruncateQuotaUpdate.java       |     1 +
 .../namenode/metrics/TestNameNodeMetrics.java   |   134 +-
 .../snapshot/TestOpenFilesWithSnapshot.java     |   126 +
 .../apache/hadoop/hdfs/web/TestJsonUtil.java    |    11 +-
 .../test/resources/testErasureCodingConf.xml    |    35 +
 .../src/test/resources/testHDFSConf.xml         |   125 +-
 hadoop-mapreduce-project/bin/mapred             |    18 +-
 .../jobhistory/JobHistoryEventHandler.java      |    27 +-
 .../hadoop/mapreduce/v2/app/AppContext.java     |     4 +
 .../hadoop/mapreduce/v2/app/MRAppMaster.java    |    14 +-
 .../mapreduce/v2/app/rm/RMCommunicator.java     |     4 +-
 .../mapreduce/v2/app/webapp/AppController.java  |    10 +-
 .../hadoop/mapreduce/v2/app/webapp/AppView.java |     4 +-
 .../mapreduce/v2/app/webapp/ConfBlock.java      |    36 +-
 .../mapreduce/v2/app/webapp/CountersBlock.java  |    38 +-
 .../mapreduce/v2/app/webapp/CountersPage.java   |     4 +-
 .../mapreduce/v2/app/webapp/InfoPage.java       |     2 +-
 .../mapreduce/v2/app/webapp/JobBlock.java       |    95 +-
 .../mapreduce/v2/app/webapp/JobConfPage.java    |     3 +-
 .../hadoop/mapreduce/v2/app/webapp/JobPage.java |     2 +-
 .../mapreduce/v2/app/webapp/JobsBlock.java      |    24 +-
 .../mapreduce/v2/app/webapp/NavBlock.java       |    38 +-
 .../v2/app/webapp/SingleCounterBlock.java       |    28 +-
 .../v2/app/webapp/SingleCounterPage.java        |     3 +-
 .../mapreduce/v2/app/webapp/TaskPage.java       |    20 +-
 .../mapreduce/v2/app/webapp/TasksBlock.java     |    12 +-
 .../mapreduce/v2/app/webapp/TasksPage.java      |     2 +-
 .../jobhistory/TestJobHistoryEventHandler.java  |   102 +
 .../hadoop/mapreduce/v2/app/MockAppContext.java |    10 +
 .../mapreduce/v2/app/TestJobEndNotifier.java    |    16 +-
 .../mapreduce/v2/app/TestRuntimeEstimators.java |    10 +
 .../v2/app/launcher/TestContainerLauncher.java  |     9 +
 .../app/launcher/TestContainerLauncherImpl.java |     9 +
 .../v2/app/metrics/TestMRAppMetrics.java        |     9 +-
 .../v2/app/rm/TestRMContainerAllocator.java     |    10 +-
 .../hadoop/mapreduce/v2/util/MRWebAppUtil.java  |     9 +-
 .../org/apache/hadoop/mapreduce/Cluster.java    |    16 +-
 .../java/org/apache/hadoop/mapreduce/Job.java   |    13 +-
 .../apache/hadoop/mapreduce/JobSubmitter.java   |     2 -
 .../mapreduce/counters/AbstractCounters.java    |     4 -
 .../hadoop/mapreduce/counters/Limits.java       |    12 -
 .../mapreduce/jobhistory/HistoryViewer.java     |    16 -
 .../hadoop/mapreduce/lib/db/DBOutputFormat.java |    15 +-
 .../org/apache/hadoop/mapred/TestQueue.java     |     8 +-
 .../webapp/TestMapReduceTrackingUriPlugin.java  |    26 +-
 .../hadoop/mapreduce/v2/hs/CompletedJob.java    |    15 -
 .../hadoop/mapreduce/v2/hs/JobHistory.java      |    10 +
 .../mapreduce/v2/hs/webapp/HsAboutPage.java     |     7 +-
 .../mapreduce/v2/hs/webapp/HsConfPage.java      |     2 +-
 .../mapreduce/v2/hs/webapp/HsCountersPage.java  |     4 +-
 .../mapreduce/v2/hs/webapp/HsJobBlock.java      |    98 +-
 .../mapreduce/v2/hs/webapp/HsJobPage.java       |     2 +-
 .../mapreduce/v2/hs/webapp/HsJobsBlock.java     |    46 +-
 .../mapreduce/v2/hs/webapp/HsLogsPage.java      |     2 +-
 .../mapreduce/v2/hs/webapp/HsNavBlock.java      |    30 +-
 .../v2/hs/webapp/HsSingleCounterPage.java       |     2 +-
 .../mapreduce/v2/hs/webapp/HsTaskPage.java      |    53 +-
 .../mapreduce/v2/hs/webapp/HsTasksBlock.java    |    57 +-
 .../mapreduce/v2/hs/webapp/HsTasksPage.java     |     2 +-
 .../hadoop/mapreduce/v2/hs/webapp/HsView.java   |     4 +-
 .../java/org/apache/hadoop/fs/TestDFSIO.java    |    14 +-
 .../apache/hadoop/mapred/TestYARNRunner.java    |     8 +-
 .../apache/hadoop/mapreduce/TestCounters.java   |    39 +-
 .../mapreduce/TestMapperReducerCleanup.java     |     4 +
 .../mapreduce/lib/db/TestDBOutputFormat.java    |    45 +
 .../lib/input/TestMRCJCFileInputFormat.java     |    11 +-
 .../mapreduce/lib/input/TestMultipleInputs.java |    10 +-
 .../TestUmbilicalProtocolWithJobToken.java      |    22 +-
 .../apache/hadoop/mapreduce/v2/TestMRJobs.java  |    87 +-
 .../hadoop/mapred/TestShuffleHandler.java       |    32 +-
 hadoop-maven-plugins/pom.xml                    |     5 +-
 hadoop-project-dist/pom.xml                     |     2 +-
 hadoop-project/pom.xml                          |    48 +-
 hadoop-project/src/site/site.xml                |     1 +
 .../main/shellprofile.d/hadoop-archive-logs.sh  |     2 +-
 .../src/main/shellprofile.d/hadoop-archives.sh  |     4 +-
 hadoop-tools/hadoop-aws/pom.xml                 |    22 +-
 .../org/apache/hadoop/fs/adl/AdlFileStatus.java |    69 +
 .../org/apache/hadoop/fs/adl/AdlFileSystem.java |    29 +-
 .../apache/hadoop/fs/adl/TestGetFileStatus.java |    57 +-
 .../apache/hadoop/fs/adl/TestListStatus.java    |     8 +-
 .../fs/azure/AzureNativeFileSystemStore.java    |   324 +-
 .../fs/azure/BlobOperationDescriptor.java       |   222 +
 .../hadoop/fs/azure/BlockBlobInputStream.java   |   447 +
 .../hadoop/fs/azure/CachingAuthorizer.java      |   232 +
 .../fs/azure/ClientThrottlingAnalyzer.java      |   284 +
 .../fs/azure/ClientThrottlingIntercept.java     |   221 +
 .../fs/azure/LocalSASKeyGeneratorImpl.java      |    28 +-
 .../hadoop/fs/azure/NativeAzureFileSystem.java  |   117 +-
 .../fs/azure/NativeAzureFileSystemHelper.java   |    28 +
 .../hadoop/fs/azure/NativeFileSystemStore.java  |     6 +-
 .../fs/azure/RemoteSASKeyGeneratorImpl.java     |   310 +-
 .../fs/azure/RemoteWasbAuthorizerImpl.java      |   267 +-
 .../hadoop/fs/azure/SASKeyGeneratorImpl.java    |     4 +-
 .../fs/azure/SecureStorageInterfaceImpl.java    |     5 +
 .../fs/azure/SecureWasbRemoteCallHelper.java    |   230 +
 .../hadoop/fs/azure/StorageInterface.java       |    11 +-
 .../hadoop/fs/azure/StorageInterfaceImpl.java   |     5 +
 .../hadoop/fs/azure/WasbRemoteCallHelper.java   |   288 +-
 .../hadoop/fs/azure/security/Constants.java     |    33 +-
 .../hadoop/fs/azure/security/JsonUtils.java     |    52 +
 .../RemoteWasbDelegationTokenManager.java       |   169 +
 .../hadoop/fs/azure/security/SecurityUtils.java |    86 -
 .../hadoop/fs/azure/security/SpnegoToken.java   |    49 +
 .../hadoop/fs/azure/security/TokenUtils.java    |    60 +
 .../security/WasbDelegationTokenManager.java    |    54 +
 .../fs/azure/security/WasbTokenRenewer.java     |    77 +-
 .../hadoop-azure/src/site/markdown/index.md     |   107 +-
 .../hadoop/fs/azure/AbstractWasbTestBase.java   |     9 +
 .../fs/azure/AzureBlobStorageTestAccount.java   |    40 +-
 .../hadoop/fs/azure/MockStorageInterface.java   |    36 +-
 .../hadoop/fs/azure/MockWasbAuthorizerImpl.java |    22 +-
 .../azure/TestAzureConcurrentOutOfBandIo.java   |     2 +-
 .../fs/azure/TestBlobOperationDescriptor.java   |   305 +
 .../fs/azure/TestBlockBlobInputStream.java      |   875 +
 .../fs/azure/TestClientThrottlingAnalyzer.java  |   177 +
 .../TestNativeAzureFSAuthorizationCaching.java  |    60 +
 .../TestNativeAzureFileSystemAuthorization.java |   233 +-
 ...veAzureFileSystemAuthorizationWithOwner.java |     2 +-
 .../fs/azure/TestWasbRemoteCallHelper.java      |   281 +-
 .../fs/azure/TestWasbUriAndConfiguration.java   |    48 +
 .../src/test/resources/azure-test.xml           |    13 +-
 .../src/main/shellprofile.d/hadoop-distcp.sh    |     4 +-
 .../src/site/markdown/DistCp.md.vm              |     2 +-
 .../src/main/shellprofile.d/hadoop-extras.sh    |     2 +-
 .../src/main/shellprofile.d/hadoop-gridmix.sh   |     2 +-
 .../src/main/native/pipes/impl/HadoopPipes.cc   |    12 +-
 .../src/main/shellprofile.d/hadoop-rumen.sh     |     4 +-
 .../org/apache/hadoop/yarn/sls/SLSRunner.java   |    64 +-
 .../hadoop/yarn/sls/appmaster/AMSimulator.java  |    39 +-
 .../yarn/sls/appmaster/MRAMSimulator.java       |    11 +-
 .../hadoop/yarn/sls/conf/SLSConfiguration.java  |    15 +
 .../src/site/markdown/SchedulerLoadSimulator.md |     3 +-
 .../yarn/sls/appmaster/TestAMSimulator.java     |     4 +-
 .../src/main/shellprofile.d/hadoop-streaming.sh |     2 +-
 .../MySQL/FederationStateStoreDatabase.sql      |    21 +
 .../MySQL/FederationStateStoreStoredProcs.sql   |   162 +
 .../MySQL/FederationStateStoreTables.sql        |    47 +
 .../MySQL/FederationStateStoreUser.sql          |    25 +
 .../FederationStateStore/MySQL/dropDatabase.sql |    21 +
 .../MySQL/dropStoreProcedures.sql               |    47 +
 .../FederationStateStore/MySQL/dropTables.sql   |    27 +
 .../bin/FederationStateStore/MySQL/dropUser.sql |    21 +
 .../FederationStateStoreStoreProcs.sql          |   511 +
 .../SQLServer/FederationStateStoreTables.sql    |   122 +
 hadoop-yarn-project/hadoop-yarn/bin/yarn        |    47 +-
 hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd    |    13 +-
 .../hadoop-yarn/conf/yarn-env.sh                |    12 +
 .../dev-support/findbugs-exclude.xml            |    22 +-
 .../ams/ApplicationMasterServiceContext.java    |    29 +
 .../ams/ApplicationMasterServiceProcessor.java  |    81 +
 .../yarn/ams/ApplicationMasterServiceUtils.java |    89 +
 .../apache/hadoop/yarn/ams/package-info.java    |    24 +
 .../yarn/api/ContainerManagementProtocol.java   |    23 +
 .../protocolrecords/ContainerUpdateRequest.java |    77 +
 .../ContainerUpdateResponse.java                |    95 +
 .../yarn/api/records/ApplicationAttemptId.java  |    77 +-
 .../hadoop/yarn/api/records/ApplicationId.java  |    54 +-
 .../hadoop/yarn/api/records/ContainerId.java    |   139 +-
 .../hadoop/yarn/api/records/ReservationId.java  |    21 +-
 .../org/apache/hadoop/yarn/conf/HAUtil.java     |    30 +-
 .../hadoop/yarn/conf/YarnConfiguration.java     |   166 +-
 .../proto/containermanagement_protocol.proto    |     1 +
 .../src/main/proto/yarn_service_protos.proto    |     9 +
 .../yarn/conf/TestYarnConfigurationFields.java  |    45 +
 .../yarn/client/api/impl/AMRMClientImpl.java    |     4 +-
 .../yarn/client/api/impl/NMClientImpl.java      |    18 +-
 .../TestFederationRMFailoverProxyProvider.java  |   223 +
 .../yarn/client/api/impl/TestNMClient.java      |    37 +-
 .../yarn/client/api/impl/TestYarnClient.java    |     9 +-
 .../hadoop-yarn/hadoop-yarn-common/pom.xml      |    22 +
 ...ContainerManagementProtocolPBClientImpl.java |    40 +-
 ...ontainerManagementProtocolPBServiceImpl.java |    28 +-
 .../impl/pb/ContainerUpdateRequestPBImpl.java   |   171 +
 .../impl/pb/ContainerUpdateResponsePBImpl.java  |   241 +
 .../impl/pb/ContainerLaunchContextPBImpl.java   |     8 +
 .../hadoop/yarn/client/ClientRMProxy.java       |     4 +-
 .../org/apache/hadoop/yarn/client/RMProxy.java  |    11 +-
 .../api/impl/FileSystemTimelineWriter.java      |    40 +-
 .../yarn/client/api/impl/TimelineWriter.java    |     8 +-
 .../apache/hadoop/yarn/util/AsyncCallback.java  |    35 +
 .../hadoop/yarn/util/LRUCacheHashMap.java       |    49 +
 .../resource/DominantResourceCalculator.java    |    22 +-
 .../apache/hadoop/yarn/webapp/ResponseInfo.java |     4 +-
 .../hadoop/yarn/webapp/example/HelloWorld.java  |     4 +-
 .../hadoop/yarn/webapp/example/MyApp.java       |     6 +-
 .../hadoop/yarn/webapp/hamlet/Hamlet.java       |     4 +
 .../hadoop/yarn/webapp/hamlet/HamletGen.java    |     2 +
 .../hadoop/yarn/webapp/hamlet/HamletImpl.java   |     2 +
 .../hadoop/yarn/webapp/hamlet/HamletSpec.java   |     2 +
 .../hadoop/yarn/webapp/hamlet/package-info.java |     6 +
 .../hadoop/yarn/webapp/hamlet2/Hamlet.java      | 30557 +++++++++++++++++
 .../hadoop/yarn/webapp/hamlet2/HamletGen.java   |   449 +
 .../hadoop/yarn/webapp/hamlet2/HamletImpl.java  |   385 +
 .../hadoop/yarn/webapp/hamlet2/HamletSpec.java  |  3101 ++
 .../yarn/webapp/hamlet2/package-info.java       |    27 +
 .../yarn/webapp/log/AggregatedLogsBlock.java    |    66 +-
 .../yarn/webapp/log/AggregatedLogsNavBlock.java |     4 +-
 .../yarn/webapp/log/AggregatedLogsPage.java     |     2 +-
 .../hadoop/yarn/webapp/util/WebAppUtils.java    |    14 +
 .../hadoop/yarn/webapp/view/ErrorPage.java      |    12 +-
 .../hadoop/yarn/webapp/view/FooterBlock.java    |     2 +-
 .../hadoop/yarn/webapp/view/HeaderBlock.java    |     6 +-
 .../hadoop/yarn/webapp/view/HtmlBlock.java      |     2 +-
 .../hadoop/yarn/webapp/view/HtmlPage.java       |    12 +-
 .../hadoop/yarn/webapp/view/InfoBlock.java      |    28 +-
 .../hadoop/yarn/webapp/view/JQueryUI.java       |    14 +-
 .../hadoop/yarn/webapp/view/LipsumBlock.java    |     4 +-
 .../hadoop/yarn/webapp/view/NavBlock.java       |    10 +-
 .../yarn/webapp/view/TwoColumnCssLayout.java    |    20 +-
 .../yarn/webapp/view/TwoColumnLayout.java       |    20 +-
 .../src/main/resources/yarn-default.xml         |   183 +-
 .../hadoop/yarn/TestContainerLaunchRPC.java     |     9 +
 .../yarn/TestContainerResourceIncreaseRPC.java  |    20 +-
 .../hadoop/yarn/api/TestPBImplRecords.java      |     4 +
 .../TestApplicationClientProtocolRecords.java   |    52 +
 .../api/impl/TestTimelineClientForATS1_5.java   |    81 +-
 .../hadoop/yarn/conf/TestYarnConfiguration.java |     1 -
 .../hadoop/yarn/util/TestLRUCacheHashMap.java   |    74 +
 .../yarn/util/TestProcfsBasedProcessTree.java   |     2 +-
 .../hadoop/yarn/util/TestYarnVersionInfo.java   |    11 +-
 .../apache/hadoop/yarn/webapp/TestSubViews.java |    10 +-
 .../apache/hadoop/yarn/webapp/TestWebApp.java   |    28 +-
 .../hadoop/yarn/webapp/view/TestHtmlBlock.java  |    10 +-
 .../hadoop/yarn/webapp/view/TestHtmlPage.java   |     9 +-
 .../hadoop/yarn/webapp/view/TestInfoBlock.java  |     6 +-
 .../yarn/webapp/view/TestTwoColumnCssPage.java  |     6 +-
 .../client/binding/RegistryPathUtils.java       |     2 +-
 .../hadoop/registry/client/types/Endpoint.java  |     4 +-
 .../registry/client/types/ServiceRecord.java    |     4 +-
 .../pom.xml                                     |     4 -
 .../ApplicationHistoryClientService.java        |     8 +-
 .../ApplicationHistoryManagerImpl.java          |     8 +-
 ...pplicationHistoryManagerOnTimelineStore.java |     8 +-
 .../ApplicationHistoryServer.java               |    10 +-
 .../FileSystemApplicationHistoryStore.java      |    22 +-
 .../webapp/AHSErrorsAndWarningsPage.java        |     2 +-
 .../webapp/AHSLogsPage.java                     |     2 +-
 .../webapp/AHSView.java                         |     4 +-
 .../webapp/AHSWebServices.java                  |     7 +-
 .../webapp/AboutBlock.java                      |     8 +-
 .../webapp/AboutPage.java                       |     5 +-
 .../webapp/AppAttemptPage.java                  |     2 +-
 .../webapp/AppPage.java                         |     2 +-
 .../webapp/ContainerPage.java                   |     2 +-
 .../webapp/NavBlock.java                        |    36 +-
 .../timeline/KeyValueBasedTimelineStore.java    |     8 +-
 .../server/timeline/LeveldbTimelineStore.java   |    35 +-
 .../yarn/server/timeline/RollingLevelDB.java    |    15 +-
 .../timeline/RollingLevelDBTimelineStore.java   |    72 +-
 .../server/timeline/TimelineDataManager.java    |     7 +-
 .../recovery/LeveldbTimelineStateStore.java     |    30 +-
 .../timeline/security/TimelineACLsManager.java  |     7 +-
 ...lineDelegationTokenSecretManagerService.java |     8 +-
 .../timeline/webapp/TimelineWebServices.java    |     7 +-
 .../TestFileSystemApplicationHistoryStore.java  |     8 +-
 .../timeline/TestLeveldbTimelineStore.java      |     2 +-
 .../hadoop-yarn-server-common/pom.xml           |    63 +-
 .../hadoop/yarn/server/api/ServerRMProxy.java   |     4 +-
 .../failover/FederationProxyProviderUtil.java   |   133 +
 .../FederationRMFailoverProxyProvider.java      |   221 +
 .../federation/failover/package-info.java       |    17 +
 .../AbstractConfigurableFederationPolicy.java   |   155 +
 .../policies/ConfigurableFederationPolicy.java  |    41 +
 .../FederationPolicyInitializationContext.java  |   130 +
 ...ionPolicyInitializationContextValidator.java |    76 +
 .../policies/FederationPolicyUtils.java         |   203 +
 .../federation/policies/RouterPolicyFacade.java |   265 +
 .../amrmproxy/AbstractAMRMProxyPolicy.java      |    47 +
 .../amrmproxy/BroadcastAMRMProxyPolicy.java     |    85 +
 .../amrmproxy/FederationAMRMProxyPolicy.java    |    65 +
 .../LocalityMulticastAMRMProxyPolicy.java       |   608 +
 .../amrmproxy/RejectAMRMProxyPolicy.java        |    67 +
 .../policies/amrmproxy/package-info.java        |    19 +
 .../policies/dao/WeightedPolicyInfo.java        |   251 +
 .../federation/policies/dao/package-info.java   |    19 +
 .../exceptions/FederationPolicyException.java   |    33 +
 ...FederationPolicyInitializationException.java |    33 +
 .../NoActiveSubclustersException.java           |    27 +
 .../exceptions/UnknownSubclusterException.java  |    28 +
 .../policies/exceptions/package-info.java       |    19 +
 .../policies/manager/AbstractPolicyManager.java |   190 +
 .../manager/FederationPolicyManager.java        |   118 +
 .../manager/HashBroadcastPolicyManager.java     |    38 +
 .../manager/PriorityBroadcastPolicyManager.java |    66 +
 .../manager/RejectAllPolicyManager.java         |    40 +
 .../manager/UniformBroadcastPolicyManager.java  |    44 +
 .../manager/WeightedLocalityPolicyManager.java  |    67 +
 .../policies/manager/package-info.java          |    19 +
 .../federation/policies/package-info.java       |    19 +
 .../policies/router/AbstractRouterPolicy.java   |    66 +
 .../policies/router/FederationRouterPolicy.java |    52 +
 .../policies/router/HashBasedRouterPolicy.java  |   102 +
 .../policies/router/LoadBasedRouterPolicy.java  |   112 +
 .../policies/router/PriorityRouterPolicy.java   |    72 +
 .../policies/router/RejectRouterPolicy.java     |    76 +
 .../router/UniformRandomRouterPolicy.java       |   104 +
 .../router/WeightedRandomRouterPolicy.java      |    94 +
 .../policies/router/package-info.java           |    19 +
 .../resolver/AbstractSubClusterResolver.java    |    67 +
 .../resolver/DefaultSubClusterResolverImpl.java |   164 +
 .../federation/resolver/SubClusterResolver.java |    58 +
 .../federation/resolver/package-info.java       |    17 +
 ...ederationApplicationHomeSubClusterStore.java |   121 +
 .../store/FederationMembershipStateStore.java   |   117 +
 .../federation/store/FederationPolicyStore.java |    77 +
 .../federation/store/FederationStateStore.java  |    64 +
 .../FederationStateStoreException.java          |    50 +
 ...derationStateStoreInvalidInputException.java |    48 +
 .../FederationStateStoreRetriableException.java |    44 +
 .../store/exception/package-info.java           |    17 +
 .../store/impl/MemoryFederationStateStore.java  |   315 +
 .../store/impl/SQLFederationStateStore.java     |   942 +
 .../federation/store/impl/package-info.java     |    17 +
 .../server/federation/store/package-info.java   |    17 +
 .../AddApplicationHomeSubClusterRequest.java    |    72 +
 .../AddApplicationHomeSubClusterResponse.java   |    65 +
 .../records/ApplicationHomeSubCluster.java      |   124 +
 .../DeleteApplicationHomeSubClusterRequest.java |    65 +
 ...DeleteApplicationHomeSubClusterResponse.java |    43 +
 .../GetApplicationHomeSubClusterRequest.java    |    64 +
 .../GetApplicationHomeSubClusterResponse.java   |    73 +
 .../GetApplicationsHomeSubClusterRequest.java   |    40 +
 .../GetApplicationsHomeSubClusterResponse.java  |    75 +
 .../store/records/GetSubClusterInfoRequest.java |    62 +
 .../records/GetSubClusterInfoResponse.java      |    62 +
 ...SubClusterPoliciesConfigurationsRequest.java |    35 +
 ...ubClusterPoliciesConfigurationsResponse.java |    66 +
 ...GetSubClusterPolicyConfigurationRequest.java |    63 +
 ...etSubClusterPolicyConfigurationResponse.java |    65 +
 .../records/GetSubClustersInfoRequest.java      |    70 +
 .../records/GetSubClustersInfoResponse.java     |    66 +
 ...SetSubClusterPolicyConfigurationRequest.java |    61 +
 ...etSubClusterPolicyConfigurationResponse.java |    36 +
 .../records/SubClusterDeregisterRequest.java    |    89 +
 .../records/SubClusterDeregisterResponse.java   |    42 +
 .../records/SubClusterHeartbeatRequest.java     |   149 +
 .../records/SubClusterHeartbeatResponse.java    |    45 +
 .../federation/store/records/SubClusterId.java  |   100 +
 .../store/records/SubClusterIdInfo.java         |    75 +
 .../store/records/SubClusterInfo.java           |   325 +
 .../records/SubClusterPolicyConfiguration.java  |   162 +
 .../records/SubClusterRegisterRequest.java      |    74 +
 .../records/SubClusterRegisterResponse.java     |    44 +
 .../store/records/SubClusterState.java          |    85 +
 .../UpdateApplicationHomeSubClusterRequest.java |    74 +
 ...UpdateApplicationHomeSubClusterResponse.java |    43 +
 ...dApplicationHomeSubClusterRequestPBImpl.java |   132 +
 ...ApplicationHomeSubClusterResponsePBImpl.java |   117 +
 .../pb/ApplicationHomeSubClusterPBImpl.java     |   167 +
 ...eApplicationHomeSubClusterRequestPBImpl.java |   130 +
 ...ApplicationHomeSubClusterResponsePBImpl.java |    78 +
 ...tApplicationHomeSubClusterRequestPBImpl.java |   139 +
 ...ApplicationHomeSubClusterResponsePBImpl.java |   132 +
 ...ApplicationsHomeSubClusterRequestPBImpl.java |    78 +
 ...pplicationsHomeSubClusterResponsePBImpl.java |   190 +
 .../impl/pb/GetSubClusterInfoRequestPBImpl.java |   125 +
 .../pb/GetSubClusterInfoResponsePBImpl.java     |   134 +
 ...sterPoliciesConfigurationsRequestPBImpl.java |    95 +
 ...terPoliciesConfigurationsResponsePBImpl.java |   191 +
 ...ClusterPolicyConfigurationRequestPBImpl.java |   103 +
 ...lusterPolicyConfigurationResponsePBImpl.java |   143 +
 .../pb/GetSubClustersInfoRequestPBImpl.java     |   108 +
 .../pb/GetSubClustersInfoResponsePBImpl.java    |   184 +
 ...ClusterPolicyConfigurationRequestPBImpl.java |   142 +
 ...lusterPolicyConfigurationResponsePBImpl.java |    93 +
 .../pb/SubClusterDeregisterRequestPBImpl.java   |   156 +
 .../pb/SubClusterDeregisterResponsePBImpl.java  |    77 +
 .../pb/SubClusterHeartbeatRequestPBImpl.java    |   192 +
 .../pb/SubClusterHeartbeatResponsePBImpl.java   |    77 +
 .../records/impl/pb/SubClusterIdPBImpl.java     |    75 +
 .../records/impl/pb/SubClusterInfoPBImpl.java   |   251 +
 .../pb/SubClusterPolicyConfigurationPBImpl.java |   138 +
 .../pb/SubClusterRegisterRequestPBImpl.java     |   134 +
 .../pb/SubClusterRegisterResponsePBImpl.java    |    77 +
 ...eApplicationHomeSubClusterRequestPBImpl.java |   132 +
 ...ApplicationHomeSubClusterResponsePBImpl.java |    78 +
 .../store/records/impl/pb/package-info.java     |    17 +
 .../federation/store/records/package-info.java  |    17 +
 ...cationHomeSubClusterStoreInputValidator.java |   180 +
 ...ationMembershipStateStoreInputValidator.java |   315 +
 .../FederationPolicyStoreInputValidator.java    |   143 +
 .../store/utils/FederationStateStoreUtils.java  |   214 +
 .../federation/store/utils/package-info.java    |    17 +
 .../utils/FederationStateStoreFacade.java       |   602 +
 .../server/federation/utils/package-info.java   |    17 +
 .../yarn/server/uam/UnmanagedAMPoolManager.java |   311 +
 .../server/uam/UnmanagedApplicationManager.java |   607 +
 .../hadoop/yarn/server/uam/package-info.java    |    18 +
 .../yarn/server/utils/AMRMClientUtils.java      |   189 +
 .../server/utils/YarnServerSecurityUtils.java   |    41 +-
 .../yarn/server/webapp/AppAttemptBlock.java     |    31 +-
 .../hadoop/yarn/server/webapp/AppBlock.java     |    80 +-
 .../hadoop/yarn/server/webapp/AppsBlock.java    |    14 +-
 .../yarn/server/webapp/ContainerBlock.java      |    23 +-
 .../server/webapp/ErrorsAndWarningsBlock.java   |    50 +-
 .../hadoop/yarn/server/webapp/dao/AppInfo.java  |    14 +
 .../proto/yarn_server_federation_protos.proto   |   165 +
 .../java/org/apache/hadoop/yarn/TestRPC.java    |     9 +
 .../yarn/server/MockResourceManagerFacade.java  |   855 +
 .../policies/BaseFederationPoliciesTest.java    |   186 +
 ...ionPolicyInitializationContextValidator.java |   138 +
 .../policies/TestRouterPolicyFacade.java        |   222 +
 .../TestBroadcastAMRMProxyFederationPolicy.java |   112 +
 .../TestLocalityMulticastAMRMProxyPolicy.java   |   602 +
 .../amrmproxy/TestRejectAMRMProxyPolicy.java    |    78 +
 .../policies/manager/BasePolicyManagerTest.java |   101 +
 .../TestHashBasedBroadcastPolicyManager.java    |    40 +
 .../TestPriorityBroadcastPolicyManager.java     |    72 +
 .../manager/TestRejectAllPolicyManager.java     |    40 +
 .../TestUniformBroadcastPolicyManager.java      |    40 +
 .../TestWeightedLocalityPolicyManager.java      |    79 +
 .../policies/router/BaseRouterPoliciesTest.java |   118 +
 .../router/TestHashBasedRouterPolicy.java       |    83 +
 .../router/TestLoadBasedRouterPolicy.java       |   106 +
 .../router/TestPriorityRouterPolicy.java        |    85 +
 .../policies/router/TestRejectRouterPolicy.java |    63 +
 .../router/TestUniformRandomRouterPolicy.java   |    64 +
 .../router/TestWeightedRandomRouterPolicy.java  |   137 +
 .../resolver/TestDefaultSubClusterResolver.java |   189 +
 .../impl/FederationStateStoreBaseTest.java      |   578 +
 .../store/impl/HSQLDBFederationStateStore.java  |   252 +
 .../impl/TestMemoryFederationStateStore.java    |    35 +
 .../store/impl/TestSQLFederationStateStore.java |    49 +
 .../records/TestFederationProtocolRecords.java  |   265 +
 .../TestFederationStateStoreInputValidator.java |  1260 +
 .../utils/FederationPoliciesTestUtil.java       |   227 +
 .../utils/FederationStateStoreTestUtil.java     |   181 +
 .../utils/TestFederationStateStoreFacade.java   |   192 +
 .../TestFederationStateStoreFacadeRetry.java    |   146 +
 .../uam/TestUnmanagedApplicationManager.java    |   335 +
 .../src/test/resources/nodes                    |     8 +
 .../src/test/resources/nodes-malformed          |     3 +
 .../hadoop-yarn-server-nodemanager/pom.xml      |    11 +
 .../src/CMakeLists.txt                          |     1 +
 .../nodemanager/LinuxContainerExecutor.java     |    21 +-
 .../nodemanager/NodeStatusUpdaterImpl.java      |    11 +-
 .../amrmproxy/DefaultRequestInterceptor.java    |    30 +-
 .../amrmproxy/FederationInterceptor.java        |  1150 +
 .../containermanager/ContainerManagerImpl.java  |    31 +-
 .../container/ContainerImpl.java                |     4 +
 .../PrivilegedOperationException.java           |    10 +-
 .../CGroupsCpuResourceHandlerImpl.java          |    20 +-
 .../linux/resources/CGroupsHandler.java         |    15 +
 .../linux/resources/CGroupsHandlerImpl.java     |    26 +-
 .../CGroupsMemoryResourceHandlerImpl.java       |    35 +-
 .../linux/resources/ResourceHandlerModule.java  |    58 +-
 .../runtime/DockerLinuxContainerRuntime.java    |    67 +-
 .../linux/runtime/docker/DockerRunCommand.java  |     6 +
 .../localizer/ContainerLocalizer.java           |    52 +-
 .../monitor/ContainerMetrics.java               |     2 +-
 .../runtime/ContainerExecutionException.java    |    10 +-
 ...locationBasedResourceUtilizationTracker.java |    31 +-
 .../scheduler/ContainerScheduler.java           |   144 +-
 .../recovery/NMLeveldbStateStoreService.java    |     6 +-
 .../util/CgroupsLCEResourcesHandler.java        |    53 +-
 .../nodemanager/webapp/AllApplicationsPage.java |    28 +-
 .../nodemanager/webapp/AllContainersPage.java   |    30 +-
 .../nodemanager/webapp/ApplicationPage.java     |    25 +-
 .../nodemanager/webapp/ContainerLogsPage.java   |    17 +-
 .../nodemanager/webapp/ContainerPage.java       |    31 +-
 .../webapp/NMErrorsAndWarningsPage.java         |     2 +-
 .../yarn/server/nodemanager/webapp/NMView.java  |     4 +-
 .../server/nodemanager/webapp/NavBlock.java     |    28 +-
 .../server/nodemanager/webapp/NodePage.java     |    28 +-
 .../impl/container-executor.c                   |   121 +-
 .../impl/container-executor.h                   |    17 +-
 .../impl/utils/string-utils.c                   |    86 +
 .../impl/utils/string-utils.h                   |    32 +
 .../test/test-container-executor.c              |   224 +-
 .../TestLinuxContainerExecutorWithMocks.java    |    89 +
 .../nodemanager/TestNodeManagerResync.java      |    30 +-
 .../amrmproxy/MockRequestInterceptor.java       |    14 +-
 .../amrmproxy/MockResourceManagerFacade.java    |   514 -
 .../amrmproxy/TestAMRMProxyService.java         |     1 +
 .../amrmproxy/TestFederationInterceptor.java    |   496 +
 .../TestableFederationInterceptor.java          |   139 +
 .../containermanager/TestAuxServices.java       |     2 +-
 .../containermanager/TestContainerManager.java  |   145 +-
 .../TestContainerManagerRecovery.java           |    24 +-
 .../TestCGroupsCpuResourceHandlerImpl.java      |    23 +
 .../linux/resources/TestCGroupsHandlerImpl.java |    25 +
 .../TestCGroupsMemoryResourceHandlerImpl.java   |    45 +-
 .../runtime/TestDockerContainerRuntime.java     |    58 +-
 .../localizer/TestContainerLocalizer.java       |    43 +-
 ...locationBasedResourceUtilizationTracker.java |    93 +
 .../TestContainerSchedulerQueuing.java          |    85 +
 .../util/TestCgroupsLCEResourcesHandler.java    |    33 +-
 .../resourcemanager/AMSProcessingChain.java     |   102 +
 ...ActiveStandbyElectorBasedElectorService.java |    12 +-
 .../server/resourcemanager/AdminService.java    |    71 +-
 .../ApplicationMasterService.java               |   443 +-
 .../CuratorBasedElectorService.java             |    10 +-
 .../resourcemanager/DefaultAMSProcessor.java    |   456 +
 ...pportunisticContainerAllocatorAMService.java |   184 +-
 .../resourcemanager/RMActiveServiceContext.java |    36 +-
 .../server/resourcemanager/RMAppManager.java    |    56 +-
 .../yarn/server/resourcemanager/RMContext.java  |     3 +-
 .../server/resourcemanager/RMContextImpl.java   |   312 +-
 .../resourcemanager/RMServiceContext.java       |   162 +
 .../server/resourcemanager/ResourceManager.java |    68 +-
 .../FederationStateStoreHeartbeat.java          |   108 +
 .../federation/FederationStateStoreService.java |   304 +
 .../federation/package-info.java                |    17 +
 .../metrics/TimelineServiceV2Publisher.java     |     6 +-
 .../capacity/FifoCandidatesSelector.java        |     6 +-
 .../ProportionalCapacityPreemptionPolicy.java   |     7 +-
 .../placement/PlacementFactory.java             |    45 +
 .../recovery/FileSystemRMStateStore.java        |     2 +-
 .../recovery/LeveldbRMStateStore.java           |     2 +-
 .../recovery/MemoryRMStateStore.java            |     1 +
 .../resourcemanager/recovery/RMStateStore.java  |    10 +-
 .../recovery/ZKRMStateStore.java                |     2 +-
 .../resource/ResourceWeights.java               |     4 +-
 .../resourcemanager/rmapp/RMAppEvent.java       |    24 -
 .../resourcemanager/rmapp/RMAppEventType.java   |     1 +
 .../server/resourcemanager/rmapp/RMAppImpl.java |     8 +-
 .../rmapp/attempt/RMAppAttemptImpl.java         |    20 +-
 .../scheduler/AbstractYarnScheduler.java        |    11 +-
 .../scheduler/AppSchedulingInfo.java            |     6 +-
 .../scheduler/SchedulerApplicationAttempt.java  |     2 +-
 .../scheduler/SchedulerUtils.java               |    35 +-
 .../scheduler/activities/ActivitiesLogger.java  |    33 +-
 .../scheduler/capacity/AbstractCSQueue.java     |     8 +-
 .../scheduler/capacity/CapacityScheduler.java   |    95 +-
 .../CapacitySchedulerConfiguration.java         |    50 +
 .../scheduler/capacity/LeafQueue.java           |    83 +-
 .../scheduler/capacity/ParentQueue.java         |     7 +-
 .../scheduler/common/fica/FiCaSchedulerApp.java |    13 +
 .../scheduler/fair/FSAppAttempt.java            |    17 +-
 .../scheduler/fair/FSContext.java               |     2 +-
 .../scheduler/fair/FSLeafQueue.java             |     2 -
 .../scheduler/fair/FSPreemptionThread.java      |    28 +-
 .../scheduler/fair/FSSchedulerNode.java         |    68 +-
 .../scheduler/fair/FairScheduler.java           |    20 +-
 .../DominantResourceFairnessPolicy.java         |     2 +
 .../fair/policies/FairSharePolicy.java          |   122 +-
 .../RMTimelineCollectorManager.java             |    10 +-
 .../resourcemanager/webapp/AboutBlock.java      |    20 +-
 .../resourcemanager/webapp/AboutPage.java       |     2 +-
 .../resourcemanager/webapp/AppAttemptPage.java  |     2 +-
 .../webapp/AppLogAggregationStatusPage.java     |     2 +-
 .../server/resourcemanager/webapp/AppPage.java  |     2 +-
 .../webapp/AppsBlockWithMetrics.java            |     5 +-
 .../webapp/CapacitySchedulerPage.java           |   220 +-
 .../resourcemanager/webapp/ContainerPage.java   |     2 +-
 .../webapp/DefaultSchedulerPage.java            |    58 +-
 .../resourcemanager/webapp/ErrorBlock.java      |     2 +-
 .../webapp/FairSchedulerAppsBlock.java          |    18 +-
 .../webapp/FairSchedulerPage.java               |   118 +-
 .../webapp/MetricsOverviewTable.java            |   124 +-
 .../server/resourcemanager/webapp/NavBlock.java |    34 +-
 .../resourcemanager/webapp/NodeIDsInfo.java     |     5 +-
 .../resourcemanager/webapp/NodeLabelsPage.java  |    18 +-
 .../resourcemanager/webapp/NodesPage.java       |    16 +-
 .../webapp/RMAppAttemptBlock.java               |    48 +-
 .../resourcemanager/webapp/RMAppBlock.java      |    28 +-
 .../webapp/RMAppLogAggregationStatusBlock.java  |    34 +-
 .../resourcemanager/webapp/RMAppsBlock.java     |    23 +-
 .../webapp/RMErrorsAndWarningsPage.java         |     2 +-
 .../resourcemanager/webapp/RMWSConsts.java      |    15 +
 .../resourcemanager/webapp/RMWebAppUtil.java    |   224 +
 .../webapp/RMWebServiceProtocol.java            |   133 +-
 .../resourcemanager/webapp/RMWebServices.java   |   183 +-
 .../webapp/RedirectionErrorPage.java            |     2 +-
 .../server/resourcemanager/webapp/RmView.java   |     4 +-
 .../webapp/SchedulerPageUtil.java               |     8 +-
 .../webapp/dao/AppAttemptInfo.java              |     5 +-
 .../resourcemanager/webapp/dao/AppInfo.java     |    13 +
 .../webapp/dao/ClusterMetricsInfo.java          |     5 +-
 .../webapp/dao/FairSchedulerQueueInfo.java      |    23 +
 .../webapp/dao/LabelsToNodesInfo.java           |     6 +-
 .../yarn/server/resourcemanager/MockRM.java     |    16 +-
 .../resourcemanager/MockRMMemoryStateStore.java |    32 +
 .../server/resourcemanager/NodeManager.java     |     9 +
 .../resourcemanager/TestAMAuthorization.java    |     9 +
 .../resourcemanager/TestApplicationCleanup.java |    30 +-
 .../TestApplicationMasterLauncher.java          |    15 +-
 .../TestApplicationMasterService.java           |   163 +-
 .../resourcemanager/TestClientRMService.java    |     4 +-
 .../TestContainerResourceUsage.java             |     8 +-
 .../TestNodeBlacklistingOnAMFailures.java       |     8 +-
 ...pportunisticContainerAllocatorAMService.java |     8 +
 .../resourcemanager/TestRMEmbeddedElector.java  |     8 +-
 .../yarn/server/resourcemanager/TestRMHA.java   |    28 +-
 .../server/resourcemanager/TestRMRestart.java   |   240 +-
 .../TestWorkPreservingRMRestart.java            |   127 +-
 .../applicationsmanager/TestAMRestart.java      |    29 +-
 .../TestFederationRMStateStoreService.java      |   176 +
 .../TestSystemMetricsPublisherForV2.java        |    13 +-
 .../recovery/RMStateStoreTestBase.java          |     8 +-
 .../recovery/TestFSRMStateStore.java            |     1 +
 .../recovery/TestLeveldbRMStateStore.java       |     1 +
 .../recovery/TestZKRMStateStore.java            |    15 +-
 .../TestReservationInputValidator.java          |    10 +-
 .../rmapp/TestApplicationLifetimeMonitor.java   |     7 +-
 .../rmapp/TestRMAppTransitions.java             |    17 +
 .../attempt/TestRMAppAttemptTransitions.java    |    33 +-
 .../scheduler/TestAbstractYarnScheduler.java    |     7 +-
 .../scheduler/TestQueueMetrics.java             |    14 +-
 .../scheduler/TestSchedulerUtils.java           |     4 +-
 .../CapacitySchedulerPreemptionTestBase.java    |     7 +-
 .../capacity/TestApplicationPriority.java       |    18 +-
 .../capacity/TestCapacityScheduler.java         |   455 +-
 .../TestCapacitySchedulerAsyncScheduling.java   |   296 +
 .../TestCapacitySchedulerDynamicBehavior.java   |     2 +-
 ...TestCapacitySchedulerSurgicalPreemption.java |    99 +-
 .../scheduler/capacity/TestLeafQueue.java       |    12 +-
 ...TestWorkPreservingRMRestartForNodeLabel.java |    10 +-
 .../scheduler/fair/TestFSSchedulerNode.java     |    52 +
 .../scheduler/fair/TestFairScheduler.java       |     8 +-
 .../scheduler/fair/TestSchedulingPolicy.java    |    19 +-
 .../security/TestDelegationTokenRenewer.java    |     5 +-
 .../security/TestRMDelegationTokens.java        |     9 +-
 .../webapp/TestRMWebServicesApps.java           |     2 +-
 .../hadoop/yarn/webapp/TestRMWithXFSFilter.java |    14 +-
 .../hadoop-yarn-server-router/pom.xml           |   110 +
 .../hadoop/yarn/server/router/Router.java       |   179 +
 .../yarn/server/router/RouterServerUtil.java    |    63 +
 .../AbstractClientRequestInterceptor.java       |   127 +
 .../clientrm/ClientRequestInterceptor.java      |    65 +
 .../DefaultClientRequestInterceptor.java        |   311 +
 .../clientrm/FederationClientInterceptor.java   |   677 +
 .../router/clientrm/RouterClientRMService.java  |   546 +
 .../server/router/clientrm/package-info.java    |    20 +
 .../hadoop/yarn/server/router/package-info.java |    20 +
 .../AbstractRMAdminRequestInterceptor.java      |    90 +
 .../DefaultRMAdminRequestInterceptor.java       |   215 +
 .../rmadmin/RMAdminRequestInterceptor.java      |    65 +
 .../router/rmadmin/RouterRMAdminService.java    |   423 +
 .../server/router/rmadmin/package-info.java     |    20 +
 .../webapp/AbstractRESTRequestInterceptor.java  |    89 +
 .../webapp/DefaultRequestInterceptorREST.java   |   496 +
 .../yarn/server/router/webapp/HTTPMethods.java  |    34 +
 .../router/webapp/RESTRequestInterceptor.java   |   125 +
 .../yarn/server/router/webapp/RouterWebApp.java |    48 +
 .../router/webapp/RouterWebServiceUtil.java     |   227 +
 .../server/router/webapp/RouterWebServices.java |   876 +
 .../yarn/server/router/webapp/package-info.java |    20 +
 .../router/clientrm/BaseRouterClientRMTest.java |   586 +
 .../clientrm/MockClientRequestInterceptor.java  |    36 +
 .../PassThroughClientRequestInterceptor.java    |   267 +
 .../TestFederationClientInterceptor.java        |   403 +
 .../TestFederationClientInterceptorRetry.java   |   295 +
 .../clientrm/TestRouterClientRMService.java     |   210 +
 .../TestableFederationClientInterceptor.java    |    75 +
 .../router/rmadmin/BaseRouterRMAdminTest.java   |   346 +
 .../rmadmin/MockRMAdminRequestInterceptor.java  |    36 +
 .../PassThroughRMAdminRequestInterceptor.java   |   148 +
 .../rmadmin/TestRouterRMAdminService.java       |   219 +
 .../webapp/BaseRouterWebServicesTest.java       |   601 +
 .../yarn/server/router/webapp/JavaProcess.java  |    52 +
 .../webapp/MockRESTRequestInterceptor.java      |   340 +
 .../PassThroughRESTRequestInterceptor.java      |   339 +
 .../router/webapp/TestRouterWebServices.java    |   269 +
 .../webapp/TestRouterWebServicesREST.java       |  1298 +
 .../src/test/resources/capacity-scheduler.xml   |   111 +
 .../src/test/resources/log4j.properties         |    19 +
 .../src/test/resources/yarn-site.xml            |    30 +
 .../sharedcachemanager/CleanerService.java      |     7 +-
 .../server/sharedcachemanager/CleanerTask.java  |     7 +-
 .../ClientProtocolService.java                  |     7 +-
 .../SCMAdminProtocolService.java                |     8 +-
 .../sharedcachemanager/SharedCacheManager.java  |     9 +-
 .../metrics/CleanerMetrics.java                 |     7 +-
 .../metrics/ClientSCMMetrics.java               |     7 +-
 .../metrics/SharedCacheUploaderMetrics.java     |     8 +-
 .../store/InMemorySCMStore.java                 |     7 +-
 .../webapp/SCMOverviewPage.java                 |    26 +-
 .../sharedcachemanager/webapp/SCMWebServer.java |     7 +-
 .../hadoop/yarn/server/MiniYARNCluster.java     |    13 +-
 .../server/TestContainerManagerSecurity.java    |    74 +-
 .../timeline/EntityGroupFSTimelineStore.java    |    23 +-
 .../timeline/LevelDBCacheTimelineStore.java     |    14 +-
 .../TestEntityGroupFSTimelineStore.java         |    99 +-
 ...stTimelineReaderWebServicesHBaseStorage.java |    30 +-
 .../reader/filter/TimelineFilterUtils.java      |     7 +-
 .../storage/HBaseTimelineReaderImpl.java        |     8 +-
 .../storage/HBaseTimelineWriterImpl.java        |     8 +-
 .../storage/TimelineSchemaCreator.java          |     7 +-
 .../storage/application/ApplicationTable.java   |     7 +-
 .../storage/apptoflow/AppToFlowTable.java       |     7 +-
 .../storage/common/ColumnHelper.java            |     8 +-
 .../common/HBaseTimelineStorageUtils.java       |     8 +-
 .../storage/entity/EntityTable.java             |     7 +-
 .../storage/flow/FlowActivityTable.java         |     7 +-
 .../storage/flow/FlowRunCoprocessor.java        |     7 +-
 .../storage/flow/FlowRunTable.java              |     7 +-
 .../storage/flow/FlowScanner.java               |     7 +-
 .../storage/reader/TimelineEntityReader.java    |     7 +-
 .../collector/AppLevelTimelineCollector.java    |     7 +-
 .../collector/NodeTimelineCollectorManager.java |     8 +-
 .../PerNodeTimelineCollectorsAuxService.java    |    10 +-
 .../collector/TimelineCollector.java            |     7 +-
 .../collector/TimelineCollectorManager.java     |     8 +-
 .../collector/TimelineCollectorWebService.java  |     8 +-
 .../reader/TimelineReaderServer.java            |     9 +-
 .../reader/TimelineReaderWebServices.java       |     8 +-
 .../storage/FileSystemTimelineReaderImpl.java   |     8 +-
 .../storage/common/TimelineStorageUtils.java    |     4 -
 .../hadoop/yarn/server/webproxy/ProxyUtils.java |    16 +-
 .../server/webproxy/WebAppProxyServlet.java     |    14 +-
 .../server/webproxy/amfilter/AmIpFilter.java    |    60 +-
 .../server/webproxy/amfilter/TestAmFilter.java  |    70 +-
 .../hadoop-yarn/hadoop-yarn-server/pom.xml      |     1 +
 .../src/site/markdown/Federation.md             |   289 +
 .../src/site/markdown/GracefulDecommission.md   |    12 +-
 .../src/site/markdown/NodeManagerCgroups.md     |    17 +-
 .../src/site/markdown/ResourceManagerHA.md      |     2 +-
 .../src/site/markdown/TimelineServer.md         |     4 +-
 .../site/markdown/WritingYarnApplications.md    |     4 +-
 .../hadoop-yarn-site/src/site/markdown/YARN.md  |     5 +-
 .../src/site/markdown/registry/yarn-registry.md |    14 +-
 .../resources/images/amrmproxy_architecture.png |   Bin 0 -> 35010 bytes
 .../images/federation_architecture.png          |   Bin 0 -> 46964 bytes
 .../images/federation_sequence_diagram.png      |   Bin 0 -> 47910 bytes
 hadoop-yarn-project/hadoop-yarn/pom.xml         |     2 +-
 hadoop-yarn-project/pom.xml                     |     4 +
 pom.xml                                         |     7 +-
 start-build-env.sh                              |     2 +-
 1223 files changed, 96984 insertions(+), 9279 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/b114f248/hadoop-common-project/hadoop-common/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b114f248/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b114f248/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
----------------------------------------------------------------------
diff --cc 
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
index 0cd5b84,fef968b..21733b3
--- 
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
+++ 
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
@@@ -331,17 -331,8 +331,17 @@@ public class FileContext 
            return AbstractFileSystem.get(uri, conf);
          }
        });
 +    } catch (RuntimeException ex) {
 +      // RTEs can wrap other exceptions; if there is an IOException inner,
 +      // throw it direct.
 +      Throwable cause = ex.getCause();
 +      if (cause instanceof IOException) {
 +        throw (IOException) cause;
 +      } else {
 +        throw ex;
 +      }
      } catch (InterruptedException ex) {
-       LOG.error(ex);
+       LOG.error(ex.toString());
        throw new IOException("Failed to get the AbstractFileSystem for path: "
            + uri, ex);
      }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b114f248/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b114f248/hadoop-project/pom.xml
----------------------------------------------------------------------
diff --cc hadoop-project/pom.xml
index 8fcdf0c,8151016..e6a3605
mode 100644,100755..100755
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml

http://git-wip-us.apache.org/repos/asf/hadoop/blob/b114f248/hadoop-tools/hadoop-aws/pom.xml
----------------------------------------------------------------------
diff --cc hadoop-tools/hadoop-aws/pom.xml
index 6cb0202,91e94a6..62371c3
--- a/hadoop-tools/hadoop-aws/pom.xml
+++ b/hadoop-tools/hadoop-aws/pom.xml
@@@ -444,46 -334,6 +444,26 @@@
        <scope>compile</scope>
      </dependency>
      <dependency>
-       <groupId>com.fasterxml.jackson.core</groupId>
-       <artifactId>jackson-core</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>com.fasterxml.jackson.core</groupId>
-       <artifactId>jackson-databind</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>com.fasterxml.jackson.core</groupId>
-       <artifactId>jackson-annotations</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>com.fasterxml.jackson.dataformat</groupId>
-       <artifactId>jackson-dataformat-cbor</artifactId>
-     </dependency>
-     <dependency>
-       <groupId>joda-time</groupId>
-       <artifactId>joda-time</artifactId>
-     </dependency>
-     <dependency>
 +      <groupId>com.amazonaws</groupId>
 +      <artifactId>DynamoDBLocal</artifactId>
 +      <version>${dynamodb.local.version}</version>
 +      <scope>test</scope>
 +      <exclusions>
 +        <exclusion>
 +          <groupId>org.hamcrest</groupId>
 +          <artifactId>hamcrest-core</artifactId>
 +        </exclusion>
 +        <exclusion>
 +          <groupId>org.eclipse.jetty</groupId>
 +          <artifactId>jetty-http</artifactId>
 +        </exclusion>
 +        <exclusion>
 +          <groupId>org.apache.commons</groupId>
 +          <artifactId>commons-lang3</artifactId>
 +        </exclusion>
 +      </exclusions>
 +    </dependency>
 +    <dependency>
        <groupId>junit</groupId>
        <artifactId>junit</artifactId>
        <scope>test</scope>


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

Reply via email to