You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xk...@apache.org on 2018/05/04 19:28:17 UTC

[49/50] [abbrv] hadoop git commit: Merge branch 'trunk' into HDFS-12943

Merge branch 'trunk' into HDFS-12943

# Conflicts:
#	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
#	hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java


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

Branch: refs/heads/HDFS-12943
Commit: a38fde5d0a9c0a8d20204c9b546e6f0de58b6a2a
Parents: f8ee212 96c843f
Author: Erik Krogen <xk...@apache.org>
Authored: Fri May 4 12:25:45 2018 -0700
Committer: Erik Krogen <xk...@apache.org>
Committed: Fri May 4 12:25:45 2018 -0700

----------------------------------------------------------------------
 BUILDING.txt                                    |     2 +
 LICENSE.txt                                     |    68 +
 dev-support/bin/dist-layout-stitching           |    22 +-
 dev-support/docker/Dockerfile                   |     3 +
 .../assemblies/hadoop-src-with-hdsl.xml         |    56 +
 .../main/resources/assemblies/hadoop-src.xml    |     2 +
 .../ensure-jars-have-correct-contents.sh        |     6 +
 .../hadoop-client-minicluster/pom.xml           |     7 +
 .../hadoop-client-runtime/pom.xml               |     1 +
 .../src/main/bin/hadoop-functions.sh            |    14 +-
 .../hadoop-common/src/main/conf/hadoop-env.sh   |    17 +
 .../src/main/conf/log4j.properties              |    34 +
 .../org/apache/hadoop/conf/Configuration.java   |    11 +-
 .../crypto/key/kms/KMSClientProvider.java       |   212 +-
 .../crypto/key/kms/KMSDelegationToken.java      |    22 +-
 .../crypto/key/kms/KMSLegacyTokenRenewer.java   |    56 +
 .../hadoop/crypto/key/kms/KMSTokenRenewer.java  |   103 +
 .../hadoop/crypto/key/kms/package-info.java     |    18 +
 .../apache/hadoop/fs/ChecksumFileSystem.java    |     9 +-
 .../hadoop/fs/CommonConfigurationKeys.java      |     4 +
 .../fs/CommonConfigurationKeysPublic.java       |    10 +
 .../hadoop/fs/CompositeCrcFileChecksum.java     |    82 +
 .../java/org/apache/hadoop/fs/FileSystem.java   |     2 +-
 .../main/java/org/apache/hadoop/fs/Options.java |    11 +
 .../org/apache/hadoop/fs/shell/Command.java     |    69 +-
 .../apache/hadoop/fs/shell/CopyCommands.java    |     6 +
 .../java/org/apache/hadoop/fs/shell/Ls.java     |    26 +-
 .../org/apache/hadoop/fs/shell/PathData.java    |    27 +
 .../main/java/org/apache/hadoop/ipc/Client.java |    16 +-
 .../apache/hadoop/ipc/ProtobufRpcEngine.java    |     5 +-
 .../main/java/org/apache/hadoop/ipc/RPC.java    |    46 +-
 .../main/java/org/apache/hadoop/ipc/Server.java |    11 +-
 .../apache/hadoop/ipc/WritableRpcEngine.java    |     2 +-
 .../apache/hadoop/ipc/metrics/RpcMetrics.java   |    11 +-
 .../hadoop/metrics2/impl/MetricsConfig.java     |    50 +-
 .../java/org/apache/hadoop/net/NetUtils.java    |    16 +
 .../AuthenticationFilterInitializer.java        |    10 +-
 .../hadoop/security/UserGroupInformation.java   |    10 +-
 .../web/DelegationTokenAuthenticatedURL.java    |    21 +-
 .../DelegationTokenAuthenticationHandler.java   |     8 +-
 .../web/DelegationTokenAuthenticator.java       |     2 +-
 .../hadoop/service/launcher/IrqHandler.java     |     2 +-
 .../java/org/apache/hadoop/util/ConfTest.java   |    10 +-
 .../org/apache/hadoop/util/CrcComposer.java     |   187 +
 .../java/org/apache/hadoop/util/CrcUtil.java    |   220 +
 .../org/apache/hadoop/util/DataChecksum.java    |    18 +
 .../hadoop/util/GenericOptionsParser.java       |     3 +
 .../java/org/apache/hadoop/util/KMSUtil.java    |    45 +-
 .../hadoop/util/KMSUtilFaultInjector.java       |    49 +
 .../hadoop/util/concurrent/HadoopExecutors.java |    34 +-
 ...apache.hadoop.security.token.TokenIdentifier |     1 +
 ...rg.apache.hadoop.security.token.TokenRenewer |     3 +-
 .../src/main/resources/core-default.xml         |    41 +
 .../src/site/markdown/CommandsManual.md         |    17 +
 .../src/site/markdown/HttpAuthentication.md     |     2 +-
 .../markdown/release/3.0.2/CHANGES.3.0.2.md     |    31 +
 .../release/3.0.2/RELEASENOTES.3.0.2.md         |    31 +
 .../markdown/release/3.1.0/CHANGES.3.1.0.md     |  1022 +
 .../release/3.1.0/RELEASENOTES.3.1.0.md         |   199 +
 .../conf/TestCommonConfigurationFields.java     |     3 +
 .../apache/hadoop/conf/TestConfiguration.java   |    26 +-
 ...yptoStreamsWithOpensslAesCtrCryptoCodec.java |     2 +-
 .../crypto/key/kms/TestKMSClientProvider.java   |   162 +
 .../kms/TestLoadBalancingKMSClientProvider.java |    67 +-
 .../apache/hadoop/fs/TestLocalFileSystem.java   |     2 +-
 .../fs/contract/AbstractContractCreateTest.java |    12 +-
 .../apache/hadoop/fs/shell/find/TestFind.java   |    34 +-
 .../org/apache/hadoop/http/TestHttpServer.java  |     2 +-
 .../java/org/apache/hadoop/io/TestIOUtils.java  |     2 +-
 .../java/org/apache/hadoop/ipc/TestIPC.java     |     2 +-
 .../java/org/apache/hadoop/ipc/TestRPC.java     |    58 +-
 .../metrics2/impl/TestGraphiteMetrics.java      |     2 +-
 .../hadoop/metrics2/impl/TestStatsDMetrics.java |     2 +-
 .../sink/RollingFileSystemSinkTestBase.java     |     3 +-
 .../org/apache/hadoop/net/TestNetUtils.java     |     8 +
 .../java/org/apache/hadoop/test/Whitebox.java   |   113 +
 .../org/apache/hadoop/util/TestCrcComposer.java |   242 +
 .../org/apache/hadoop/util/TestCrcUtil.java     |   232 +
 .../org/apache/hadoop/util/TestKMSUtil.java     |    65 +
 .../hadoop/crypto/key/kms/server/TestKMS.java   |   521 +-
 .../crypto/key/kms/server/TestKMSAudit.java     |     2 +-
 hadoop-common-project/hadoop-nfs/pom.xml        |     2 +
 .../org/apache/hadoop/portmap/TestPortmap.java  |     2 +-
 hadoop-dist/pom.xml                             |    83 +
 hadoop-dist/src/main/compose/ozone/.env         |    17 +
 .../src/main/compose/ozone/docker-compose.yaml  |    61 +
 .../src/main/compose/ozone/docker-config        |    35 +
 hadoop-hdds/client/pom.xml                      |    49 +
 .../apache/hadoop/hdds/scm/XceiverClient.java   |   192 +
 .../hadoop/hdds/scm/XceiverClientHandler.java   |   202 +
 .../hdds/scm/XceiverClientInitializer.java      |    72 +
 .../hadoop/hdds/scm/XceiverClientManager.java   |   218 +
 .../hadoop/hdds/scm/XceiverClientMetrics.java   |    92 +
 .../hadoop/hdds/scm/XceiverClientRatis.java     |   266 +
 .../scm/client/ContainerOperationClient.java    |   407 +
 .../hadoop/hdds/scm/client/HddsClientUtils.java |   232 +
 .../hadoop/hdds/scm/client/package-info.java    |    23 +
 .../apache/hadoop/hdds/scm/package-info.java    |    23 +
 .../hdds/scm/storage/ChunkInputStream.java      |   261 +
 .../hdds/scm/storage/ChunkOutputStream.java     |   227 +
 .../hadoop/hdds/scm/storage/package-info.java   |    23 +
 .../common/dev-support/findbugsExcludeFile.xml  |    21 +
 hadoop-hdds/common/pom.xml                      |   128 +
 .../org/apache/hadoop/hdds/HddsConfigKeys.java  |    23 +
 .../java/org/apache/hadoop/hdds/HddsUtils.java  |   318 +
 .../apache/hadoop/hdds/client/OzoneQuota.java   |   203 +
 .../hadoop/hdds/client/ReplicationFactor.java   |    63 +
 .../hadoop/hdds/client/ReplicationType.java     |    28 +
 .../apache/hadoop/hdds/client/package-info.java |    23 +
 .../hadoop/hdds/conf/HddsConfServlet.java       |   182 +
 .../hadoop/hdds/conf/OzoneConfiguration.java    |   162 +
 .../apache/hadoop/hdds/conf/package-info.java   |    18 +
 .../org/apache/hadoop/hdds/package-info.java    |    23 +
 .../hadoop/hdds/protocol/DatanodeDetails.java   |   353 +
 .../hadoop/hdds/protocol/package-info.java      |    22 +
 .../apache/hadoop/hdds/scm/ScmConfigKeys.java   |   271 +
 .../org/apache/hadoop/hdds/scm/ScmInfo.java     |    81 +
 .../hadoop/hdds/scm/XceiverClientSpi.java       |   129 +
 .../hadoop/hdds/scm/client/ScmClient.java       |   139 +
 .../hadoop/hdds/scm/client/package-info.java    |    24 +
 .../hadoop/hdds/scm/container/ContainerID.java  |    97 +
 .../common/helpers/AllocatedBlock.java          |    77 +
 .../container/common/helpers/ContainerInfo.java |   333 +
 .../common/helpers/DeleteBlockResult.java       |    51 +
 .../scm/container/common/helpers/Pipeline.java  |   253 +
 .../common/helpers/PipelineChannel.java         |   122 +
 .../helpers/StorageContainerException.java      |   104 +
 .../container/common/helpers/package-info.java  |    22 +
 .../hadoop/hdds/scm/container/package-info.java |    18 +
 .../apache/hadoop/hdds/scm/package-info.java    |    24 +
 .../hdds/scm/protocol/LocatedContainer.java     |   127 +
 .../scm/protocol/ScmBlockLocationProtocol.java  |    72 +
 .../hdds/scm/protocol/ScmLocatedBlock.java      |   100 +
 .../StorageContainerLocationProtocol.java       |   124 +
 .../hadoop/hdds/scm/protocol/package-info.java  |    19 +
 ...kLocationProtocolClientSideTranslatorPB.java |   215 +
 .../protocolPB/ScmBlockLocationProtocolPB.java  |    35 +
 ...rLocationProtocolClientSideTranslatorPB.java |   316 +
 .../StorageContainerLocationProtocolPB.java     |    36 +
 .../hdds/scm/protocolPB/package-info.java       |    24 +
 .../scm/storage/ContainerProtocolCalls.java     |   396 +
 .../hadoop/hdds/scm/storage/package-info.java   |    23 +
 .../java/org/apache/hadoop/ozone/OzoneAcl.java  |   231 +
 .../apache/hadoop/ozone/OzoneConfigKeys.java    |   241 +
 .../org/apache/hadoop/ozone/OzoneConsts.java    |   167 +
 .../apache/hadoop/ozone/common/BlockGroup.java  |    87 +
 .../ozone/common/DeleteBlockGroupResult.java    |    96 +
 .../InconsistentStorageStateException.java      |    51 +
 .../org/apache/hadoop/ozone/common/Storage.java |   248 +
 .../apache/hadoop/ozone/common/StorageInfo.java |   183 +
 .../hadoop/ozone/common/package-info.java       |    18 +
 .../InvalidStateTransitionException.java        |    42 +
 .../ozone/common/statemachine/StateMachine.java |    68 +
 .../ozone/common/statemachine/package-info.java |    21 +
 .../container/common/helpers/ChunkInfo.java     |   185 +
 .../ozone/container/common/helpers/KeyData.java |   170 +
 .../container/common/helpers/package-info.java  |    23 +
 .../org/apache/hadoop/ozone/lease/Lease.java    |   189 +
 .../ozone/lease/LeaseAlreadyExistException.java |    46 +
 .../ozone/lease/LeaseCallbackExecutor.java      |    65 +
 .../hadoop/ozone/lease/LeaseException.java      |    45 +
 .../ozone/lease/LeaseExpiredException.java      |    45 +
 .../apache/hadoop/ozone/lease/LeaseManager.java |   247 +
 .../lease/LeaseManagerNotRunningException.java  |    45 +
 .../ozone/lease/LeaseNotFoundException.java     |    46 +
 .../apache/hadoop/ozone/lease/package-info.java |    26 +
 .../org/apache/hadoop/ozone/package-info.java   |    35 +
 ...kLocationProtocolServerSideTranslatorPB.java |   170 +
 ...rLocationProtocolServerSideTranslatorPB.java |   212 +
 .../hadoop/ozone/protocolPB/package-info.java   |    24 +
 .../hadoop/ozone/web/utils/JsonUtils.java       |    71 +
 .../hadoop/ozone/web/utils/package-info.java    |    19 +
 .../apache/hadoop/utils/BackgroundService.java  |   161 +
 .../org/apache/hadoop/utils/BackgroundTask.java |    28 +
 .../hadoop/utils/BackgroundTaskQueue.java       |    64 +
 .../hadoop/utils/BackgroundTaskResult.java      |    44 +
 .../org/apache/hadoop/utils/BatchOperation.java |    90 +
 .../org/apache/hadoop/utils/EntryConsumer.java  |    38 +
 .../org/apache/hadoop/utils/LevelDBStore.java   |   380 +
 .../apache/hadoop/utils/MetadataKeyFilters.java |   118 +
 .../org/apache/hadoop/utils/MetadataStore.java  |   172 +
 .../hadoop/utils/MetadataStoreBuilder.java      |   126 +
 .../org/apache/hadoop/utils/RocksDBStore.java   |   382 +
 .../apache/hadoop/utils/RocksDBStoreMBean.java  |   144 +
 .../org/apache/hadoop/utils/package-info.java   |    18 +
 .../main/java/org/apache/ratis/RatisHelper.java |   129 +
 .../java/org/apache/ratis/package-info.java     |    22 +
 .../com/google/protobuf/ShadedProtoUtil.java    |    38 +
 .../com/google/protobuf/package-info.java       |    22 +
 .../main/proto/DatanodeContainerProtocol.proto  |   415 +
 .../main/proto/ScmBlockLocationProtocol.proto   |   166 +
 .../StorageContainerLocationProtocol.proto      |   214 +
 hadoop-hdds/common/src/main/proto/hdds.proto    |   170 +
 .../common/src/main/resources/ozone-default.xml |  1049 +
 .../apache/hadoop/hdds/scm/package-info.java    |    21 +
 .../apache/hadoop/ozone/TestMetadataStore.java  |   414 +
 .../org/apache/hadoop/ozone/TestOzoneAcls.java  |   141 +
 .../hadoop/ozone/common/TestStateMachine.java   |   106 +
 .../hadoop/ozone/lease/TestLeaseManager.java    |   374 +
 .../apache/hadoop/ozone/lease/package-info.java |    21 +
 .../org/apache/hadoop/ozone/package-info.java   |    21 +
 .../hadoop/utils/TestRocksDBStoreMBean.java     |    87 +
 .../dev-support/findbugsExcludeFile.xml         |    21 +
 hadoop-hdds/container-service/pom.xml           |   110 +
 .../apache/hadoop/hdds/scm/HddsServerUtil.java  |   325 +
 .../org/apache/hadoop/hdds/scm/VersionInfo.java |    81 +
 .../apache/hadoop/hdds/scm/package-info.java    |    19 +
 .../hadoop/ozone/HddsDatanodeService.java       |   242 +
 .../container/common/helpers/ChunkUtils.java    |   346 +
 .../container/common/helpers/ContainerData.java |   326 +
 .../common/helpers/ContainerMetrics.java        |   121 +
 .../common/helpers/ContainerReport.java         |   218 +
 .../common/helpers/ContainerUtils.java          |   442 +
 .../helpers/DeletedContainerBlocksSummary.java  |   103 +
 .../container/common/helpers/FileUtils.java     |    81 +
 .../container/common/helpers/KeyUtils.java      |   148 +
 .../container/common/helpers/package-info.java  |    22 +
 .../container/common/impl/ChunkManagerImpl.java |   235 +
 .../impl/ContainerLocationManagerImpl.java      |   150 +
 .../common/impl/ContainerManagerImpl.java       |  1113 +
 .../common/impl/ContainerReportManagerImpl.java |    90 +
 .../container/common/impl/ContainerStatus.java  |   217 +
 .../common/impl/ContainerStorageLocation.java   |   203 +
 .../ozone/container/common/impl/Dispatcher.java |   713 +
 .../container/common/impl/KeyManagerImpl.java   |   202 +
 .../RandomContainerDeletionChoosingPolicy.java  |    70 +
 .../common/impl/StorageLocationReport.java      |    63 +
 ...NOrderedContainerDeletionChoosingPolicy.java |    91 +
 .../container/common/impl/package-info.java     |    22 +
 .../common/interfaces/ChunkManager.java         |    76 +
 .../ContainerDeletionChoosingPolicy.java        |    46 +
 .../common/interfaces/ContainerDispatcher.java  |    51 +
 .../interfaces/ContainerLocationManager.java    |    58 +
 .../ContainerLocationManagerMXBean.java         |    36 +
 .../common/interfaces/ContainerManager.java     |   280 +
 .../interfaces/ContainerReportManager.java      |    32 +
 .../container/common/interfaces/KeyManager.java |    76 +
 .../common/interfaces/package-info.java         |    20 +
 .../ozone/container/common/package-info.java    |    28 +
 .../statemachine/DatanodeStateMachine.java      |   397 +
 .../statemachine/EndpointStateMachine.java      |   294 +
 .../statemachine/EndpointStateMachineMBean.java |    34 +
 .../statemachine/SCMConnectionManager.java      |   208 +
 .../SCMConnectionManagerMXBean.java             |    27 +
 .../common/statemachine/StateContext.java       |   285 +
 .../background/BlockDeletingService.java        |   239 +
 .../statemachine/background/package-info.java   |    18 +
 .../commandhandler/CloseContainerHandler.java   |   112 +
 .../commandhandler/CommandDispatcher.java       |   177 +
 .../commandhandler/CommandHandler.java          |    59 +
 .../commandhandler/ContainerReportHandler.java  |   114 +
 .../DeleteBlocksCommandHandler.java             |   211 +
 .../commandhandler/package-info.java            |    18 +
 .../common/statemachine/package-info.java       |    28 +
 .../container/common/states/DatanodeState.java  |    55 +
 .../states/datanode/InitDatanodeState.java      |   164 +
 .../states/datanode/RunningDatanodeState.java   |   175 +
 .../common/states/datanode/package-info.java    |    21 +
 .../states/endpoint/HeartbeatEndpointTask.java  |   267 +
 .../states/endpoint/RegisterEndpointTask.java   |   208 +
 .../states/endpoint/VersionEndpointTask.java    |    68 +
 .../common/states/endpoint/package-info.java    |    20 +
 .../container/common/states/package-info.java   |    18 +
 .../common/transport/server/XceiverServer.java  |   130 +
 .../transport/server/XceiverServerHandler.java  |    82 +
 .../server/XceiverServerInitializer.java        |    62 +
 .../transport/server/XceiverServerSpi.java      |    43 +
 .../common/transport/server/package-info.java   |    24 +
 .../server/ratis/ContainerStateMachine.java     |   293 +
 .../server/ratis/XceiverServerRatis.java        |   214 +
 .../transport/server/ratis/package-info.java    |    23 +
 .../container/common/utils/ContainerCache.java  |   168 +
 .../container/common/utils/package-info.java    |    18 +
 .../container/ozoneimpl/OzoneContainer.java     |   277 +
 .../ozone/container/ozoneimpl/package-info.java |    21 +
 .../org/apache/hadoop/ozone/package-info.java   |    23 +
 .../StorageContainerDatanodeProtocol.java       |    96 +
 .../protocol/StorageContainerNodeProtocol.java  |    68 +
 .../hadoop/ozone/protocol/VersionResponse.java  |   150 +
 .../commands/CloseContainerCommand.java         |    76 +
 .../protocol/commands/DeleteBlocksCommand.java  |    66 +
 .../protocol/commands/RegisteredCommand.java    |   229 +
 .../protocol/commands/ReregisterCommand.java    |    59 +
 .../ozone/protocol/commands/SCMCommand.java     |    41 +
 .../protocol/commands/SendContainerCommand.java |    80 +
 .../ozone/protocol/commands/package-info.java   |    21 +
 .../hadoop/ozone/protocol/package-info.java     |    23 +
 ...rDatanodeProtocolClientSideTranslatorPB.java |   204 +
 .../StorageContainerDatanodeProtocolPB.java     |    34 +
 ...rDatanodeProtocolServerSideTranslatorPB.java |   119 +
 .../hadoop/ozone/protocolPB/package-info.java   |    19 +
 .../StorageContainerDatanodeProtocol.proto      |   353 +
 ...m.sun.jersey.spi.container.ContainerProvider |    16 +
 .../container/common/ContainerTestUtils.java    |    68 +
 .../ozone/container/common/SCMTestUtils.java    |   120 +
 .../ozone/container/common/ScmTestMock.java     |   274 +
 .../common/TestDatanodeStateMachine.java        |   379 +
 .../testutils/BlockDeletingServiceTestImpl.java |   104 +
 .../ozone/container/testutils/package-info.java |    18 +
 .../src/test/resources/log4j.properties         |    23 +
 hadoop-hdds/framework/README.md                 |    24 +
 hadoop-hdds/framework/pom.xml                   |    70 +
 .../hadoop/hdds/server/BaseHttpServer.java      |   222 +
 .../apache/hadoop/hdds/server/ServerUtils.java  |   139 +
 .../hadoop/hdds/server/ServiceRuntimeInfo.java  |    64 +
 .../hdds/server/ServiceRuntimeInfoImpl.java     |    55 +
 .../apache/hadoop/hdds/server/package-info.java |    23 +
 .../src/main/resources/webapps/datanode/dn.js   |    92 +
 .../webapps/static/angular-1.6.4.min.js         |   332 +
 .../webapps/static/angular-nvd3-1.0.9.min.js    |     1 +
 .../webapps/static/angular-route-1.6.4.min.js   |    17 +
 .../resources/webapps/static/d3-3.5.17.min.js   |     5 +
 .../main/resources/webapps/static/dfs-dust.js   |   133 +
 .../resources/webapps/static/nvd3-1.8.5.min.css |     2 +
 .../webapps/static/nvd3-1.8.5.min.css.map       |     1 +
 .../resources/webapps/static/nvd3-1.8.5.min.js  |    11 +
 .../webapps/static/nvd3-1.8.5.min.js.map        |     1 +
 .../src/main/resources/webapps/static/ozone.css |    60 +
 .../src/main/resources/webapps/static/ozone.js  |   387 +
 .../webapps/static/templates/config.html        |    91 +
 .../resources/webapps/static/templates/jvm.html |    26 +
 .../webapps/static/templates/menu.html          |    60 +
 .../webapps/static/templates/overview.html      |    39 +
 .../webapps/static/templates/rpc-metrics.html   |    87 +
 .../hadoop/hdds/server/TestBaseHttpServer.java  |    98 +
 .../framework/src/test/resources/ozone-site.xml |    24 +
 hadoop-hdds/pom.xml                             |   117 +
 hadoop-hdds/server-scm/pom.xml                  |   159 +
 .../hadoop/hdds/scm/block/BlockManager.java     |    86 +
 .../hadoop/hdds/scm/block/BlockManagerImpl.java |   530 +
 .../hdds/scm/block/BlockmanagerMXBean.java      |    30 +
 .../block/DatanodeDeletedBlockTransactions.java |   132 +
 .../hadoop/hdds/scm/block/DeletedBlockLog.java  |   124 +
 .../hdds/scm/block/DeletedBlockLogImpl.java     |   356 +
 .../hdds/scm/block/SCMBlockDeletingService.java |   175 +
 .../hadoop/hdds/scm/block/package-info.java     |    22 +
 .../hdds/scm/container/ContainerMapping.java    |   607 +
 .../scm/container/ContainerStateManager.java    |   456 +
 .../hadoop/hdds/scm/container/Mapping.java      |   106 +
 .../scm/container/closer/ContainerCloser.java   |   192 +
 .../hdds/scm/container/closer/package-info.java |    23 +
 .../hadoop/hdds/scm/container/package-info.java |    22 +
 .../algorithms/ContainerPlacementPolicy.java    |    41 +
 .../placement/algorithms/SCMCommonPolicy.java   |   197 +
 .../SCMContainerPlacementCapacity.java          |   133 +
 .../algorithms/SCMContainerPlacementRandom.java |    89 +
 .../placement/algorithms/package-info.java      |    18 +
 .../placement/metrics/ContainerStat.java        |   165 +
 .../placement/metrics/DatanodeMetric.java       |    91 +
 .../container/placement/metrics/LongMetric.java |   162 +
 .../container/placement/metrics/NodeStat.java   |    67 +
 .../container/placement/metrics/SCMMetrics.java |   154 +
 .../placement/metrics/SCMNodeMetric.java        |   223 +
 .../placement/metrics/SCMNodeStat.java          |   139 +
 .../placement/metrics/package-info.java         |    20 +
 .../scm/container/placement/package-info.java   |    19 +
 .../replication/ContainerSupervisor.java        |   343 +
 .../container/replication/InProgressPool.java   |   313 +
 .../scm/container/replication/PeriodicPool.java |   119 +
 .../scm/container/replication/package-info.java |    23 +
 .../container/states/ContainerAttribute.java    |   245 +
 .../scm/container/states/ContainerState.java    |    96 +
 .../scm/container/states/ContainerStateMap.java |   405 +
 .../hdds/scm/container/states/package-info.java |    22 +
 .../hdds/scm/exceptions/SCMException.java       |   119 +
 .../hdds/scm/exceptions/package-info.java       |    18 +
 .../hadoop/hdds/scm/node/CommandQueue.java      |   190 +
 .../hdds/scm/node/HeartbeatQueueItem.java       |   117 +
 .../hadoop/hdds/scm/node/NodeManager.java       |   153 +
 .../hadoop/hdds/scm/node/NodeManagerMXBean.java |    57 +
 .../hadoop/hdds/scm/node/NodePoolManager.java   |    71 +
 .../hadoop/hdds/scm/node/SCMNodeManager.java    |   910 +
 .../hdds/scm/node/SCMNodePoolManager.java       |   269 +
 .../hadoop/hdds/scm/node/package-info.java      |    31 +
 .../apache/hadoop/hdds/scm/package-info.java    |    22 +
 .../hdds/scm/pipelines/PipelineManager.java     |   175 +
 .../hdds/scm/pipelines/PipelineSelector.java    |   230 +
 .../hadoop/hdds/scm/pipelines/package-info.java |    38 +
 .../scm/pipelines/ratis/RatisManagerImpl.java   |   158 +
 .../hdds/scm/pipelines/ratis/package-info.java  |    18 +
 .../standalone/StandaloneManagerImpl.java       |   145 +
 .../scm/pipelines/standalone/package-info.java  |    18 +
 .../hadoop/hdds/scm/ratis/package-info.java     |    22 +
 .../hdds/scm/server/SCMBlockProtocolServer.java |   222 +
 .../scm/server/SCMClientProtocolServer.java     |   314 +
 .../scm/server/SCMDatanodeProtocolServer.java   |   350 +
 .../hadoop/hdds/scm/server/SCMMXBean.java       |    50 +
 .../hadoop/hdds/scm/server/SCMStorage.java      |    73 +
 .../scm/server/StorageContainerManager.java     |   722 +
 .../StorageContainerManagerHttpServer.java      |    77 +
 .../hadoop/hdds/scm/server/package-info.java    |    22 +
 .../server-scm/src/main/webapps/scm/index.html  |    76 +
 .../server-scm/src/main/webapps/scm/main.html   |    20 +
 .../src/main/webapps/scm/scm-overview.html      |    60 +
 .../server-scm/src/main/webapps/scm/scm.js      |    54 +
 .../hadoop/hdds/scm/HddsServerUtilTest.java     |   308 +
 .../TestStorageContainerManagerHttpServer.java  |   143 +
 .../org/apache/hadoop/hdds/scm/TestUtils.java   |   109 +
 .../hadoop/hdds/scm/block/TestBlockManager.java |   160 +
 .../hdds/scm/block/TestDeletedBlockLog.java     |   363 +
 .../hdds/scm/container/MockNodeManager.java     |   520 +
 .../scm/container/TestContainerMapping.java     |   333 +
 .../container/closer/TestContainerCloser.java   |   228 +
 .../states/TestContainerAttribute.java          |   143 +
 .../hdds/scm/node/TestContainerPlacement.java   |   176 +
 .../hadoop/hdds/scm/node/TestNodeManager.java   |  1176 +
 .../hdds/scm/node/TestSCMNodePoolManager.java   |   160 +
 .../apache/hadoop/hdds/scm/package-info.java    |    21 +
 .../ozone/container/common/TestEndPoint.java    |   458 +
 .../placement/TestContainerPlacement.java       |   134 +
 .../placement/TestDatanodeMetrics.java          |    59 +
 .../replication/TestContainerSupervisor.java    |   272 +
 .../container/replication/package-info.java     |    18 +
 .../ReplicationDatanodeStateManager.java        |   100 +
 .../testutils/ReplicationNodeManagerMock.java   |   326 +
 .../ReplicationNodePoolManagerMock.java         |   133 +
 .../ozone/container/testutils/package-info.java |    18 +
 hadoop-hdds/tools/pom.xml                       |    65 +
 .../hadoop/hdds/scm/cli/OzoneBaseCLI.java       |    43 +
 .../hdds/scm/cli/OzoneCommandHandler.java       |    87 +
 .../apache/hadoop/hdds/scm/cli/ResultCode.java  |    31 +
 .../org/apache/hadoop/hdds/scm/cli/SCMCLI.java  |   234 +
 .../cli/container/CloseContainerHandler.java    |    83 +
 .../cli/container/ContainerCommandHandler.java  |   129 +
 .../cli/container/CreateContainerHandler.java   |    81 +
 .../cli/container/DeleteContainerHandler.java   |    92 +
 .../scm/cli/container/InfoContainerHandler.java |   114 +
 .../scm/cli/container/ListContainerHandler.java |   121 +
 .../hdds/scm/cli/container/package-info.java    |    19 +
 .../hadoop/hdds/scm/cli/package-info.java       |    19 +
 .../main/java/org/apache/hadoop/fs/Hdfs.java    |     4 +-
 .../java/org/apache/hadoop/hdfs/DFSClient.java  |    56 +-
 .../org/apache/hadoop/hdfs/DFSOutputStream.java |     0
 .../java/org/apache/hadoop/hdfs/DFSPacket.java  |     0
 .../hadoop/hdfs/DFSStripedInputStream.java      |     2 +
 .../org/apache/hadoop/hdfs/DFSUtilClient.java   |     2 +-
 .../hadoop/hdfs/DistributedFileSystem.java      |     5 +-
 .../apache/hadoop/hdfs/FileChecksumHelper.java  |   365 +-
 .../org/apache/hadoop/hdfs/ReadStatistics.java  |    29 +
 .../org/apache/hadoop/hdfs/StripeReader.java    |     8 +
 .../hdfs/client/HdfsClientConfigKeys.java       |     2 +
 .../hadoop/hdfs/client/impl/DfsClientConf.java  |    27 +
 .../hadoop/hdfs/protocol/AclException.java      |    10 +
 .../hdfs/protocol/BlockChecksumOptions.java     |    54 +
 .../hadoop/hdfs/protocol/BlockChecksumType.java |    30 +
 .../datatransfer/DataTransferProtocol.java      |    12 +-
 .../hdfs/protocol/datatransfer/Sender.java      |    11 +-
 .../hadoop/hdfs/protocolPB/PBHelperClient.java  |    44 +
 .../ha/RequestHedgingProxyProvider.java         |    14 +
 .../server/protocol/DataNodeUsageReport.java    |   181 +
 .../protocol/DataNodeUsageReportUtil.java       |   101 +
 .../hdfs/server/protocol/package-info.java      |    26 +
 .../hdfs/shortcircuit/ShortCircuitCache.java    |    11 +-
 .../src/main/proto/datatransfer.proto           |     7 +-
 .../src/main/proto/hdfs.proto                   |    21 +
 .../org/apache/hadoop/hdfs/TestDFSPacket.java   |     0
 .../ha/TestRequestHedgingProxyProvider.java     |    79 +
 .../hdfs/web/TestByteRangeInputStream.java      |     2 +-
 .../apache/hadoop/hdfs/web/TestTokenAspect.java |     2 +-
 .../src/main/native/libhdfs-tests/expect.h      |    60 +
 .../libhdfs-tests/test_libhdfs_mini_stress.c    |   253 +-
 .../src/main/native/libhdfspp/CMakeLists.txt    |     2 +-
 .../native/libhdfspp/include/hdfspp/hdfspp.h    |    53 +-
 .../native/libhdfspp/include/hdfspp/ioservice.h |   140 +
 .../native/libhdfspp/lib/bindings/c/hdfs.cc     |     7 +-
 .../native/libhdfspp/lib/common/CMakeLists.txt  |     2 +-
 .../native/libhdfspp/lib/common/async_stream.h  |    13 +-
 .../libhdfspp/lib/common/continuation/asio.h    |     5 -
 .../libhdfspp/lib/common/hdfs_ioservice.cc      |   146 -
 .../libhdfspp/lib/common/hdfs_ioservice.h       |    79 -
 .../libhdfspp/lib/common/ioservice_impl.cc      |   159 +
 .../libhdfspp/lib/common/ioservice_impl.h       |    76 +
 .../main/native/libhdfspp/lib/common/logging.h  |     3 -
 .../libhdfspp/lib/common/namenode_info.cc       |    15 +-
 .../native/libhdfspp/lib/common/namenode_info.h |     8 +-
 .../main/native/libhdfspp/lib/common/util.cc    |    14 +-
 .../src/main/native/libhdfspp/lib/common/util.h |    25 +-
 .../lib/connection/datanodeconnection.cc        |    27 +-
 .../lib/connection/datanodeconnection.h         |    26 +-
 .../main/native/libhdfspp/lib/fs/filehandle.cc  |    18 +-
 .../main/native/libhdfspp/lib/fs/filehandle.h   |    12 +-
 .../main/native/libhdfspp/lib/fs/filesystem.cc  |    67 +-
 .../main/native/libhdfspp/lib/fs/filesystem.h   |    66 +-
 .../libhdfspp/lib/fs/namenode_operations.h      |     4 +-
 .../native/libhdfspp/lib/reader/block_reader.cc |    18 +-
 .../native/libhdfspp/lib/reader/block_reader.h  |    10 +-
 .../native/libhdfspp/lib/reader/datatransfer.h  |     4 +-
 .../libhdfspp/lib/rpc/namenode_tracker.cc       |     2 +-
 .../native/libhdfspp/lib/rpc/namenode_tracker.h |     4 +-
 .../main/native/libhdfspp/lib/rpc/request.cc    |     5 +-
 .../native/libhdfspp/lib/rpc/rpc_connection.h   |     2 +-
 .../libhdfspp/lib/rpc/rpc_connection_impl.cc    |    32 +-
 .../libhdfspp/lib/rpc/rpc_connection_impl.h     |     9 +-
 .../main/native/libhdfspp/lib/rpc/rpc_engine.cc |    14 +-
 .../main/native/libhdfspp/lib/rpc/rpc_engine.h  |     9 +-
 .../main/native/libhdfspp/tests/CMakeLists.txt  |     6 +
 .../native/libhdfspp/tests/bad_datanode_test.cc |    31 +-
 .../libhdfspp/tests/hdfs_ioservice_test.cc      |    10 +-
 .../main/native/libhdfspp/tests/memcheck.supp   |    27 +
 .../native/libhdfspp/tests/mock_connection.h    |     4 +-
 .../libhdfspp/tests/remote_block_reader_test.cc |     4 +-
 .../native/libhdfspp/tests/rpc_engine_test.cc   |   112 +-
 ...uterAdminProtocolServerSideTranslatorPB.java |    67 +
 .../RouterAdminProtocolTranslatorPB.java        |    64 +-
 .../federation/metrics/FederationMetrics.java   |     4 +-
 .../federation/metrics/FederationRPCMBean.java  |     2 +
 .../metrics/FederationRPCMetrics.java           |    10 +
 .../FederationRPCPerformanceMonitor.java        |     5 +
 .../federation/metrics/NamenodeBeanMetrics.java |     3 +
 .../resolver/ActiveNamenodeResolver.java        |     8 +
 .../FederationNamenodeServiceState.java         |     3 +-
 .../resolver/FederationNamespaceInfo.java       |     5 +
 .../resolver/MembershipNamenodeResolver.java    |   110 +-
 .../federation/resolver/MountTableResolver.java |     4 +-
 .../federation/resolver/RemoteLocation.java     |    35 +-
 .../resolver/order/LocalResolver.java           |     3 +-
 .../federation/router/NameserviceManager.java   |    51 +
 .../server/federation/router/RBFConfigKeys.java |     3 +
 .../router/RemoteLocationContext.java           |     7 +
 .../federation/router/RouterAdminServer.java    |    87 +-
 .../server/federation/router/RouterClient.java  |     4 +
 .../router/RouterHeartbeatService.java          |     4 +-
 .../router/RouterPermissionChecker.java         |    59 +-
 .../federation/router/RouterRpcClient.java      |   108 +-
 .../federation/router/RouterRpcMonitor.java     |     6 +
 .../federation/router/RouterRpcServer.java      |   115 +-
 .../router/RouterSafeModeException.java         |    53 -
 .../router/SubClusterTimeoutException.java      |    33 +
 .../store/DisabledNameserviceStore.java         |    65 +
 .../federation/store/StateStoreService.java     |     5 +-
 .../driver/impl/StateStoreFileBaseImpl.java     |     2 +-
 .../store/driver/impl/StateStoreFileImpl.java   |    11 +-
 .../driver/impl/StateStoreFileSystemImpl.java   |     6 +-
 .../impl/DisabledNameserviceStoreImpl.java      |    68 +
 .../protocol/DisableNameserviceRequest.java     |    47 +
 .../protocol/DisableNameserviceResponse.java    |    50 +
 .../protocol/EnableNameserviceRequest.java      |    47 +
 .../protocol/EnableNameserviceResponse.java     |    50 +
 .../GetDisabledNameservicesRequest.java         |    30 +
 .../GetDisabledNameservicesResponse.java        |    51 +
 .../pb/DisableNameserviceRequestPBImpl.java     |    73 +
 .../pb/DisableNameserviceResponsePBImpl.java    |    74 +
 .../impl/pb/EnableNameserviceRequestPBImpl.java |    73 +
 .../pb/EnableNameserviceResponsePBImpl.java     |    73 +
 .../GetDisabledNameservicesRequestPBImpl.java   |    66 +
 .../GetDisabledNameservicesResponsePBImpl.java  |    84 +
 .../federation/store/records/BaseRecord.java    |    13 +
 .../store/records/DisabledNameservice.java      |    81 +
 .../federation/store/records/MountTable.java    |     2 +-
 .../impl/pb/DisabledNameservicePBImpl.java      |    95 +
 .../store/records/impl/pb/MountTablePBImpl.java |     2 +-
 .../hdfs/tools/federation/RouterAdmin.java      |   220 +-
 .../src/main/proto/FederationProtocol.proto     |    35 +-
 .../src/main/proto/RouterProtocol.proto         |    15 +
 .../src/main/resources/hdfs-rbf-default.xml     |     9 +
 .../main/webapps/router/federationhealth.html   |    18 +-
 .../src/main/webapps/router/federationhealth.js |     8 +-
 .../src/main/webapps/static/rbf.css             |     5 +
 .../src/site/markdown/HDFSRouterFederation.md   |    27 +-
 .../server/federation/FederationTestUtils.java  |    42 +
 .../server/federation/MiniRouterDFSCluster.java |    39 +-
 .../hdfs/server/federation/MockResolver.java    |    18 +-
 .../server/federation/StateStoreDFSCluster.java |    28 +
 .../router/TestDisableNameservices.java         |   236 +
 .../server/federation/router/TestRouter.java    |    70 +-
 .../federation/router/TestRouterAdmin.java      |   103 +-
 .../federation/router/TestRouterAdminCLI.java   |   320 +-
 .../router/TestRouterClientRejectOverload.java  |   243 +
 .../federation/router/TestRouterMountTable.java |    79 +-
 .../federation/router/TestRouterQuota.java      |     4 +
 .../router/TestRouterRPCClientRetries.java      |    93 +-
 .../server/federation/router/TestRouterRpc.java |    86 +-
 .../federation/router/TestRouterSafemode.java   |     3 +-
 .../server/federation/router/TestSafeMode.java  |    82 +
 .../TestStateStoreDisabledNameservice.java      |    71 +
 .../store/driver/TestStateStoreDriverBase.java  |    27 +-
 .../store/records/TestMountTable.java           |     4 +-
 .../src/test/resources/contract/webhdfs.xml     |     5 +
 .../jdiff/Apache_Hadoop_HDFS_3.0.2.xml          |   324 +
 .../jdiff/Apache_Hadoop_HDFS_3.1.0.xml          |   676 +
 .../org/apache/hadoop/hdfs/DFSConfigKeys.java   |    22 +-
 .../hadoop/hdfs/net/DFSNetworkTopology.java     |    10 +-
 .../hdfs/protocol/datatransfer/Receiver.java    |     8 +-
 .../protocol/datatransfer/package-info.java     |     8 +-
 .../hdfs/qjournal/server/JournalNode.java       |    62 +-
 .../qjournal/server/JournalNodeHttpServer.java  |    65 +-
 .../qjournal/server/JournalNodeRpcServer.java   |    30 +-
 .../server/blockmanagement/BlockIdManager.java  |    17 +
 .../server/blockmanagement/BlockManager.java    |     5 +-
 .../blockmanagement/BlockManagerSafeMode.java   |     2 +-
 .../hdfs/server/blockmanagement/BlocksMap.java  |    12 +-
 .../blockmanagement/CorruptReplicasMap.java     |    35 +-
 .../blockmanagement/InvalidateBlocks.java       |    13 +-
 .../common/blockaliasmap/package-info.java      |     9 +-
 .../server/datanode/BlockChecksumHelper.java    |   289 +-
 .../hdfs/server/datanode/DataXceiver.java       |    26 +-
 .../hdfs/server/datanode/LocalReplica.java      |    18 +-
 ...dBlockChecksumCompositeCrcReconstructor.java |    80 +
 ...StripedBlockChecksumMd5CrcReconstructor.java |    74 +
 .../StripedBlockChecksumReconstructor.java      |    66 +-
 .../erasurecode/StripedBlockReconstructor.java  |     1 +
 .../impl/FsDatasetAsyncDiskService.java         |     3 +-
 .../datanode/fsdataset/impl/FsDatasetImpl.java  |     9 +-
 .../datanode/fsdataset/impl/FsVolumeImpl.java   |    38 +-
 .../fsdataset/impl/FsVolumeImplBuilder.java     |    16 +-
 .../datanode/fsdataset/impl/FsVolumeList.java   |    11 +-
 .../fsdataset/impl/ProvidedVolumeImpl.java      |     2 +-
 .../fsdataset/impl/ReservedSpaceCalculator.java |   227 +
 .../datanode/metrics/DataNodeMetrics.java       |    12 +-
 .../diskbalancer/connectors/package-info.java   |     3 +-
 .../diskbalancer/datamodel/package-info.java    |     4 +-
 .../hdfs/server/diskbalancer/package-info.java  |     2 +-
 .../diskbalancer/planner/package-info.java      |     2 +-
 .../server/namenode/EncryptionZoneManager.java  |     8 +-
 .../hadoop/hdfs/server/namenode/FSDirAclOp.java |    12 +
 .../hdfs/server/namenode/FSEditLogAsync.java    |     8 +-
 .../hdfs/server/namenode/FSEditLogOp.java       |     4 +-
 .../hdfs/server/namenode/FSTreeTraverser.java   |   339 +
 .../hadoop/hdfs/server/namenode/NameNode.java   |    45 +-
 .../hdfs/server/namenode/NameNodeUtils.java     |   125 +
 .../server/namenode/ReencryptionHandler.java    |   615 +-
 .../server/namenode/ReencryptionUpdater.java    |     2 +-
 .../org/apache/hadoop/hdfs/tools/DFSck.java     |     2 +-
 .../OfflineImageReconstructor.java              |     4 +-
 .../src/main/proto/NamenodeProtocol.proto       |     5 +-
 .../src/main/resources/hdfs-default.xml         |    86 +
 .../src/main/webapps/datanode/datanode.html     |    46 +
 .../src/site/markdown/ArchivalStorage.md        |     2 +-
 .../src/site/markdown/HDFSCommands.md           |    10 +-
 .../src/site/markdown/MemoryStorage.md          |     2 +-
 .../src/site/markdown/TransparentEncryption.md  |    57 +-
 .../org/apache/hadoop/hdfs/DFSTestUtil.java     |    33 +-
 .../org/apache/hadoop/hdfs/MiniDFSCluster.java  |    25 +-
 .../apache/hadoop/hdfs/TestDFSOutputStream.java |     2 +-
 .../hadoop/hdfs/TestDistributedFileSystem.java  |     2 +-
 .../apache/hadoop/hdfs/TestEncryptionZones.java |     3 +
 .../hadoop/hdfs/TestEncryptionZonesWithKMS.java |     2 +-
 .../org/apache/hadoop/hdfs/TestFileAppend.java  |    71 +-
 .../apache/hadoop/hdfs/TestFileChecksum.java    |   101 +-
 .../hdfs/TestFileChecksumCompositeCrc.java      |    47 +
 .../hadoop/hdfs/TestLeaseRecoveryStriped.java   |     2 +-
 .../apache/hadoop/hdfs/TestMiniDFSCluster.java  |    16 +-
 .../hdfs/client/impl/BlockReaderTestUtil.java   |     5 +
 .../hdfs/client/impl/TestBlockReaderLocal.java  |    60 +
 .../hadoop/hdfs/protocolPB/TestPBHelper.java    |    14 +
 .../TestJournalNodeRespectsBindHostKeys.java    |   200 +
 .../TestDelegationTokenForProxyUser.java        |     2 +-
 .../hdfs/server/balancer/TestKeyManager.java    |     2 +-
 .../blockmanagement/BlockManagerTestUtil.java   |     2 +-
 .../blockmanagement/TestBlockInfoStriped.java   |     2 +-
 .../blockmanagement/TestBlockManager.java       |    61 +-
 .../TestBlockManagerSafeMode.java               |     3 +-
 .../TestComputeInvalidateWork.java              |     2 +-
 .../blockmanagement/TestCorruptReplicaInfo.java |    48 +-
 .../blockmanagement/TestDatanodeManager.java    |    54 +-
 .../blockmanagement/TestHostFileManager.java    |     3 +-
 .../TestPendingInvalidateBlock.java             |     3 +-
 ...constructStripedBlocksWithRackAwareness.java |     2 +-
 .../TestSequentialBlockGroupId.java             |     2 +-
 .../TestUnderReplicatedBlocks.java              |     2 +-
 .../server/datanode/TestBlockPoolManager.java   |     2 +-
 .../hdfs/server/datanode/TestDNUsageReport.java |   117 +
 .../fsdataset/impl/TestFsDatasetImpl.java       |   107 +-
 .../fsdataset/impl/TestFsVolumeList.java        |    90 +-
 .../impl/TestReservedSpaceCalculator.java       |   171 +
 .../fsdataset/impl/TestWriteToReplica.java      |    19 +-
 .../hdfs/server/namenode/NameNodeAdapter.java   |     2 +-
 .../namenode/TestAddStripedBlockInFBR.java      |     2 +-
 .../namenode/TestClientNameNodeAddress.java     |   104 +
 .../TestCommitBlockSynchronization.java         |     2 +-
 .../hdfs/server/namenode/TestDeleteRace.java    |     2 +-
 .../hdfs/server/namenode/TestFSNamesystem.java  |     2 +-
 .../hadoop/hdfs/server/namenode/TestFsck.java   |   123 +-
 .../hdfs/server/namenode/TestReencryption.java  |     5 +-
 .../namenode/TestReencryptionHandler.java       |    12 +-
 .../hdfs/server/namenode/TestSaveNamespace.java |     2 +-
 .../namenode/TestTruncateQuotaUpdate.java       |     2 +-
 .../ha/TestBootstrapStandbyWithQJM.java         |     2 +-
 .../namenode/ha/TestDFSUpgradeWithHA.java       |     2 +-
 .../namenode/ha/TestDelegationTokensWithHA.java |     2 +-
 .../hdfs/server/namenode/ha/TestHASafeMode.java |     2 +-
 .../snapshot/TestFileWithSnapshotFeature.java   |     2 +-
 .../snapshot/TestRenameWithSnapshots.java       |     2 +-
 .../shortcircuit/TestShortCircuitCache.java     |    26 +
 .../apache/hadoop/hdfs/tools/TestDFSAdmin.java  |    80 +-
 .../TestOfflineImageViewer.java                 |     7 +-
 .../org/apache/hadoop/hdfs/web/TestWebHDFS.java |     2 +-
 .../hadoop/hdfs/web/TestWebHDFSForHA.java       |     2 +-
 .../hadoop/hdfs/web/TestWebHdfsTokens.java      |     2 +-
 .../security/TestRefreshUserMappings.java       |    10 +-
 .../src/test/resources/log4j.properties         |    24 +
 .../src/test/resources/testCryptoConf.xml       |    19 +
 .../Apache_Hadoop_MapReduce_Common_3.1.0.xml    |   113 +
 .../Apache_Hadoop_MapReduce_Core_3.1.0.xml      | 28075 +++++++++++++++++
 .../Apache_Hadoop_MapReduce_JobClient_3.1.0.xml |    16 +
 .../apache/hadoop/mapred/MapReduceChildJVM.java |    73 +-
 .../jobhistory/JobHistoryEventHandler.java      |    68 +-
 .../v2/app/job/impl/TaskAttemptImpl.java        |     8 +-
 .../mapreduce/v2/app/job/impl/TaskImpl.java     |     0
 .../jobhistory/TestJobHistoryEventHandler.java  |    29 +
 .../v2/app/job/impl/TestMapReduceChildJVM.java  |    24 +-
 .../mapreduce/v2/app/job/impl/TestTaskImpl.java |     0
 .../apache/hadoop/mapreduce/v2/util/MRApps.java |    10 +
 .../apache/hadoop/mapred/FileInputFormat.java   |    25 +-
 .../java/org/apache/hadoop/mapred/JobConf.java  |    18 +
 .../apache/hadoop/mapred/pipes/Application.java |     5 +-
 .../HumanReadableHistoryViewerPrinter.java      |     3 +-
 .../jobhistory/JSONHistoryViewerPrinter.java    |     3 +-
 .../mapreduce/lib/input/FileInputFormat.java    |     8 +
 .../hadoop/mapreduce/security/TokenCache.java   |    14 +-
 .../src/main/resources/mapred-default.xml       |    67 +-
 .../src/site/markdown/MapReduceTutorial.md      |     6 +
 .../PluggableShuffleAndPluggableSort.md         |    44 +
 .../hadoop/mapred/TestFileInputFormat.java      |    17 +-
 .../jobhistory/TestHistoryViewerPrinter.java    |    76 +
 .../lib/input/TestFileInputFormat.java          |    12 +
 .../mapreduce/security/TestTokenCache.java      |    18 +-
 .../mapreduce/task/reduce/TestMergeManager.java |     2 +-
 .../HistoryServerLeveldbStateStoreService.java  |    11 -
 .../org/apache/hadoop/mapred/NotRunningJob.java |     2 +-
 .../org/apache/hadoop/mapred/YARNRunner.java    |    11 +-
 .../mapred/TestClientServiceDelegate.java       |     4 +-
 .../apache/hadoop/mapred/TestYARNRunner.java    |    29 +-
 .../mapred/pipes/TestPipeApplication.java       |    19 +-
 .../mapreduce/MiniHadoopClusterManager.java     |     1 +
 .../apache/hadoop/mapred/ShuffleHandler.java    |    12 -
 hadoop-maven-plugins/pom.xml                    |     2 +-
 hadoop-minicluster/pom.xml                      |     6 +
 hadoop-ozone/acceptance-test/README.md          |    38 +
 hadoop-ozone/acceptance-test/pom.xml            |    86 +
 .../acceptance-test/src/test/compose/.env       |    17 +
 .../src/test/compose/docker-compose.yaml        |    61 +
 .../src/test/compose/docker-config              |    35 +
 .../test/robotframework/acceptance/ozone.robot  |   116 +
 hadoop-ozone/client/pom.xml                     |    43 +
 .../apache/hadoop/ozone/client/BucketArgs.java  |   123 +
 .../apache/hadoop/ozone/client/ObjectStore.java |   211 +
 .../apache/hadoop/ozone/client/OzoneBucket.java |   363 +
 .../apache/hadoop/ozone/client/OzoneClient.java |   103 +
 .../hadoop/ozone/client/OzoneClientFactory.java |   307 +
 .../client/OzoneClientInvocationHandler.java    |    62 +
 .../apache/hadoop/ozone/client/OzoneKey.java    |   119 +
 .../apache/hadoop/ozone/client/OzoneVolume.java |   295 +
 .../apache/hadoop/ozone/client/VolumeArgs.java  |   128 +
 .../ozone/client/io/ChunkGroupInputStream.java  |   319 +
 .../ozone/client/io/ChunkGroupOutputStream.java |   495 +
 .../client/io/OzoneContainerTranslation.java    |    51 +
 .../ozone/client/io/OzoneInputStream.java       |    60 +
 .../ozone/client/io/OzoneOutputStream.java      |    64 +
 .../hadoop/ozone/client/io/package-info.java    |    23 +
 .../hadoop/ozone/client/package-info.java       |    23 +
 .../ozone/client/protocol/ClientProtocol.java   |   323 +
 .../ozone/client/protocol/package-info.java     |    23 +
 .../client/rest/DefaultRestServerSelector.java  |    36 +
 .../ozone/client/rest/OzoneExceptionMapper.java |    45 +
 .../hadoop/ozone/client/rest/RestClient.java    |   799 +
 .../ozone/client/rest/RestServerSelector.java   |    40 +
 .../client/rest/exceptions/package-info.java    |    22 +
 .../ozone/client/rest/headers/package-info.java |    22 +
 .../hadoop/ozone/client/rest/package-info.java  |    23 +
 .../hadoop/ozone/client/rpc/RpcClient.java      |   567 +
 .../hadoop/ozone/client/rpc/package-info.java   |    23 +
 .../hadoop/ozone/web/client/OzoneBucket.java    |   645 +
 .../hadoop/ozone/web/client/OzoneKey.java       |    44 +
 .../ozone/web/client/OzoneRestClient.java       |   803 +
 .../web/client/OzoneRestClientException.java    |    54 +
 .../hadoop/ozone/web/client/OzoneVolume.java    |   583 +
 .../hadoop/ozone/web/client/package-info.java   |    34 +
 .../ozone/client/TestHddsClientUtils.java       |   105 +
 .../hadoop/ozone/client/package-info.java       |    23 +
 .../common/dev-support/findbugsExcludeFile.xml  |    22 +
 hadoop-ozone/common/pom.xml                     |    88 +
 hadoop-ozone/common/src/main/bin/ozone          |   188 +
 hadoop-ozone/common/src/main/bin/start-ozone.sh |   105 +
 hadoop-ozone/common/src/main/bin/stop-ozone.sh  |    99 +
 .../common/src/main/conf/ozone-site.xml         |    24 +
 .../java/org/apache/hadoop/ozone/KsmUtils.java  |    87 +
 .../ozone/client/io/LengthInputStream.java      |    49 +
 .../hadoop/ozone/client/io/package-info.java    |    22 +
 .../ozone/client/rest/OzoneException.java       |   267 +
 .../ozone/client/rest/headers/Header.java       |    71 +
 .../ozone/client/rest/headers/package-info.java |    22 +
 .../hadoop/ozone/client/rest/package-info.java  |    22 +
 .../ozone/client/rest/response/BucketInfo.java  |   231 +
 .../ozone/client/rest/response/KeyInfo.java     |   216 +
 .../ozone/client/rest/response/VolumeInfo.java  |   215 +
 .../ozone/client/rest/response/VolumeOwner.java |    61 +
 .../client/rest/response/package-info.java      |    24 +
 .../apache/hadoop/ozone/freon/OzoneGetConf.java |   269 +
 .../apache/hadoop/ozone/freon/package-info.java |    21 +
 .../apache/hadoop/ozone/ksm/KSMConfigKeys.java  |    81 +
 .../hadoop/ozone/ksm/helpers/KsmBucketArgs.java |   233 +
 .../hadoop/ozone/ksm/helpers/KsmBucketInfo.java |   235 +
 .../hadoop/ozone/ksm/helpers/KsmKeyArgs.java    |   119 +
 .../hadoop/ozone/ksm/helpers/KsmKeyInfo.java    |   243 +
 .../ozone/ksm/helpers/KsmKeyLocationInfo.java   |   136 +
 .../ksm/helpers/KsmKeyLocationInfoGroup.java    |   118 +
 .../ozone/ksm/helpers/KsmOzoneAclMap.java       |   110 +
 .../hadoop/ozone/ksm/helpers/KsmVolumeArgs.java |   223 +
 .../ozone/ksm/helpers/OpenKeySession.java       |    50 +
 .../hadoop/ozone/ksm/helpers/ServiceInfo.java   |   237 +
 .../hadoop/ozone/ksm/helpers/VolumeArgs.java    |   140 +
 .../hadoop/ozone/ksm/helpers/package-info.java  |    18 +
 .../apache/hadoop/ozone/ksm/package-info.java   |    21 +
 .../ksm/protocol/KeySpaceManagerProtocol.java   |   245 +
 .../hadoop/ozone/ksm/protocol/package-info.java |    19 +
 ...ceManagerProtocolClientSideTranslatorPB.java |   744 +
 .../protocolPB/KeySpaceManagerProtocolPB.java   |    34 +
 .../ozone/ksm/protocolPB/package-info.java      |    19 +
 .../org/apache/hadoop/ozone/package-info.java   |    22 +
 .../hadoop/ozone/protocolPB/KSMPBHelper.java    |   113 +
 .../hadoop/ozone/protocolPB/package-info.java   |    24 +
 .../hadoop/ozone/web/handlers/BucketArgs.java   |   214 +
 .../hadoop/ozone/web/handlers/KeyArgs.java      |   117 +
 .../hadoop/ozone/web/handlers/ListArgs.java     |   142 +
 .../hadoop/ozone/web/handlers/UserArgs.java     |   168 +
 .../hadoop/ozone/web/handlers/VolumeArgs.java   |   142 +
 .../hadoop/ozone/web/handlers/package-info.java |    22 +
 .../hadoop/ozone/web/request/OzoneQuota.java    |   214 +
 .../hadoop/ozone/web/request/package-info.java  |    23 +
 .../hadoop/ozone/web/response/BucketInfo.java   |   325 +
 .../hadoop/ozone/web/response/KeyInfo.java      |   290 +
 .../hadoop/ozone/web/response/ListBuckets.java  |   154 +
 .../hadoop/ozone/web/response/ListKeys.java     |   209 +
 .../hadoop/ozone/web/response/ListVolumes.java  |   152 +
 .../hadoop/ozone/web/response/VolumeInfo.java   |   308 +
 .../hadoop/ozone/web/response/VolumeOwner.java  |    60 +
 .../hadoop/ozone/web/response/package-info.java |    23 +
 .../hadoop/ozone/web/utils/OzoneUtils.java      |   227 +
 .../hadoop/ozone/web/utils/package-info.java    |    18 +
 .../main/proto/KeySpaceManagerProtocol.proto    |   457 +
 .../src/main/shellprofile.d/hadoop-ozone.sh     |    44 +
 .../apache/hadoop/ozone/web/TestBucketInfo.java |    81 +
 .../org/apache/hadoop/ozone/web/TestQuota.java  |   116 +
 .../org/apache/hadoop/ozone/web/TestUtils.java  |   101 +
 .../hadoop/ozone/web/TestVolumeStructs.java     |    73 +
 .../apache/hadoop/ozone/web/package-info.java   |    21 +
 hadoop-ozone/integration-test/pom.xml           |    86 +
 .../container/TestContainerStateManager.java    |   309 +
 .../apache/hadoop/ozone/MiniOzoneCluster.java   |   322 +
 .../hadoop/ozone/MiniOzoneClusterImpl.java      |   425 +
 .../apache/hadoop/ozone/RatisTestHelper.java    |   110 +
 .../hadoop/ozone/TestContainerOperations.java   |    87 +
 .../hadoop/ozone/TestMiniOzoneCluster.java      |   217 +
 .../ozone/TestOzoneConfigurationFields.java     |    38 +
 .../apache/hadoop/ozone/TestOzoneHelper.java    |   413 +
 .../ozone/TestStorageContainerManager.java      |   443 +
 .../TestStorageContainerManagerHelper.java      |   179 +
 .../ozone/client/rest/TestOzoneRestClient.java  |   404 +
 .../hadoop/ozone/client/rest/package-info.java  |    23 +
 .../ozone/client/rpc/TestOzoneRpcClient.java    |   815 +
 .../hadoop/ozone/client/rpc/package-info.java   |    23 +
 .../ozone/container/ContainerTestHelper.java    |   601 +
 .../common/TestBlockDeletingService.java        |   398 +
 .../TestContainerDeletionChoosingPolicy.java    |   197 +
 .../common/impl/TestContainerPersistence.java   |   905 +
 .../TestCloseContainerHandler.java              |   114 +
 .../container/metrics/TestContainerMetrics.java |   127 +
 .../container/ozoneimpl/TestOzoneContainer.java |   587 +
 .../ozoneimpl/TestOzoneContainerRatis.java      |   142 +
 .../container/ozoneimpl/TestRatisManager.java   |   128 +
 .../container/server/TestContainerServer.java   |   262 +
 .../hadoop/ozone/freon/TestDataValidate.java    |   145 +
 .../apache/hadoop/ozone/freon/TestFreon.java    |   130 +
 .../apache/hadoop/ozone/freon/package-info.java |    21 +
 .../ozone/ksm/TestContainerReportWithKeys.java  |   143 +
 .../apache/hadoop/ozone/ksm/TestKSMMetrcis.java |   306 +
 .../apache/hadoop/ozone/ksm/TestKSMSQLCli.java  |   284 +
 .../hadoop/ozone/ksm/TestKeySpaceManager.java   |  1236 +
 .../ksm/TestKeySpaceManagerRestInterface.java   |   134 +
 .../ozone/ksm/TestKsmBlockVersioning.java       |   253 +
 .../ksm/TestMultipleContainerReadWrite.java     |   215 +
 .../hadoop/ozone/ozShell/TestOzoneShell.java    |   800 +
 .../hadoop/ozone/scm/TestAllocateContainer.java |    99 +
 .../hadoop/ozone/scm/TestContainerSQLCli.java   |   300 +
 .../ozone/scm/TestContainerSmallFile.java       |   147 +
 .../org/apache/hadoop/ozone/scm/TestSCMCli.java |   543 +
 .../apache/hadoop/ozone/scm/TestSCMMXBean.java  |   161 +
 .../apache/hadoop/ozone/scm/TestSCMMetrics.java |   258 +
 .../ozone/scm/TestXceiverClientManager.java     |   198 +
 .../ozone/scm/TestXceiverClientMetrics.java     |   168 +
 .../hadoop/ozone/scm/node/TestQueryNode.java    |   120 +
 .../ozone/web/TestDistributedOzoneVolumes.java  |   186 +
 .../hadoop/ozone/web/TestLocalOzoneVolumes.java |   185 +
 .../ozone/web/TestOzoneRestWithMiniCluster.java |   263 +
 .../hadoop/ozone/web/TestOzoneWebAccess.java    |   125 +
 .../hadoop/ozone/web/client/TestBuckets.java    |   248 +
 .../ozone/web/client/TestBucketsRatis.java      |    76 +
 .../hadoop/ozone/web/client/TestKeys.java       |   688 +
 .../hadoop/ozone/web/client/TestKeysRatis.java  |   127 +
 .../ozone/web/client/TestOzoneClient.java       |   305 +
 .../hadoop/ozone/web/client/TestVolume.java     |   433 +
 .../ozone/web/client/TestVolumeRatis.java       |   129 +
 .../src/test/resources/log4j.properties         |    18 +
 .../src/test/resources/webapps/ksm/.gitkeep     |    15 +
 .../src/test/resources/webapps/scm/.gitkeep     |    15 +
 hadoop-ozone/objectstore-service/pom.xml        |    69 +
 .../server/datanode/ObjectStoreHandler.java     |   191 +
 .../hdfs/server/datanode/package-info.java      |    22 +
 .../org/apache/hadoop/ozone/OzoneRestUtils.java |   222 +
 .../org/apache/hadoop/ozone/package-info.java   |    22 +
 .../ozone/web/ObjectStoreApplication.java       |    59 +
 .../ozone/web/OzoneHddsDatanodeService.java     |    84 +
 .../hadoop/ozone/web/exceptions/ErrorTable.java |   225 +
 .../ozone/web/exceptions/package-info.java      |    22 +
 .../ozone/web/handlers/BucketHandler.java       |   197 +
 .../web/handlers/BucketProcessTemplate.java     |   323 +
 .../hadoop/ozone/web/handlers/KeyHandler.java   |   245 +
 .../ozone/web/handlers/KeyProcessTemplate.java  |   235 +
 .../ozone/web/handlers/ServiceFilter.java       |    61 +
 .../web/handlers/StorageHandlerBuilder.java     |    76 +
 .../ozone/web/handlers/UserHandlerBuilder.java  |    75 +
 .../ozone/web/handlers/VolumeHandler.java       |   272 +
 .../web/handlers/VolumeProcessTemplate.java     |   276 +
 .../hadoop/ozone/web/handlers/package-info.java |    22 +
 .../hadoop/ozone/web/interfaces/Accounting.java |    57 +
 .../hadoop/ozone/web/interfaces/Bucket.java     |   183 +
 .../hadoop/ozone/web/interfaces/Keys.java       |   146 +
 .../ozone/web/interfaces/StorageHandler.java    |   295 +
 .../hadoop/ozone/web/interfaces/UserAuth.java   |   101 +
 .../hadoop/ozone/web/interfaces/Volume.java     |   182 +
 .../ozone/web/interfaces/package-info.java      |    22 +
 .../web/localstorage/LocalStorageHandler.java   |   379 +
 .../web/localstorage/OzoneMetadataManager.java  |  1138 +
 .../ozone/web/localstorage/package-info.java    |    18 +
 .../LengthInputStreamMessageBodyWriter.java     |    59 +
 .../web/messages/StringMessageBodyWriter.java   |    62 +
 .../hadoop/ozone/web/messages/package-info.java |    18 +
 .../web/netty/CloseableCleanupListener.java     |    46 +
 .../web/netty/ObjectStoreChannelHandler.java    |    78 +
 .../web/netty/ObjectStoreJerseyContainer.java   |   348 +
 .../ObjectStoreJerseyContainerProvider.java     |    40 +
 .../web/netty/ObjectStoreRestHttpServer.java    |   215 +
 .../web/netty/ObjectStoreURLDispatcher.java     |    61 +
 ...RequestContentObjectStoreChannelHandler.java |   117 +
 ...equestDispatchObjectStoreChannelHandler.java |   103 +
 .../hadoop/ozone/web/netty/package-info.java    |    26 +
 .../apache/hadoop/ozone/web/package-info.java   |    22 +
 .../web/storage/DistributedStorageHandler.java  |   539 +
 .../hadoop/ozone/web/storage/package-info.java  |    27 +
 .../hadoop/ozone/web/userauth/Simple.java       |   169 +
 .../hadoop/ozone/web/userauth/package-info.java |    23 +
 ...m.sun.jersey.spi.container.ContainerProvider |    16 +
 .../org/apache/hadoop/ozone/TestErrorCode.java  |    53 +
 hadoop-ozone/ozone-manager/pom.xml              |   114 +
 .../apache/hadoop/ozone/ksm/BucketManager.java  |    79 +
 .../hadoop/ozone/ksm/BucketManagerImpl.java     |   315 +
 .../org/apache/hadoop/ozone/ksm/KSMMXBean.java  |    31 +
 .../hadoop/ozone/ksm/KSMMetadataManager.java    |   253 +
 .../ozone/ksm/KSMMetadataManagerImpl.java       |   525 +
 .../org/apache/hadoop/ozone/ksm/KSMMetrics.java |   437 +
 .../org/apache/hadoop/ozone/ksm/KSMStorage.java |    90 +
 .../hadoop/ozone/ksm/KeyDeletingService.java    |   141 +
 .../org/apache/hadoop/ozone/ksm/KeyManager.java |   165 +
 .../apache/hadoop/ozone/ksm/KeyManagerImpl.java |   512 +
 .../hadoop/ozone/ksm/KeySpaceManager.java       |   901 +
 .../ozone/ksm/KeySpaceManagerHttpServer.java    |    78 +
 .../hadoop/ozone/ksm/OpenKeyCleanupService.java |   116 +
 .../ozone/ksm/ServiceListJSONServlet.java       |   103 +
 .../apache/hadoop/ozone/ksm/VolumeManager.java  |   100 +
 .../hadoop/ozone/ksm/VolumeManagerImpl.java     |   391 +
 .../ozone/ksm/exceptions/KSMException.java      |   116 +
 .../ozone/ksm/exceptions/package-info.java      |    19 +
 .../apache/hadoop/ozone/ksm/package-info.java   |    21 +
 ...ceManagerProtocolServerSideTranslatorPB.java |   539 +
 .../hadoop/ozone/protocolPB/package-info.java   |    22 +
 .../hadoop/ozone/web/ozShell/Handler.java       |    79 +
 .../apache/hadoop/ozone/web/ozShell/Shell.java  |   415 +
 .../web/ozShell/bucket/CreateBucketHandler.java |    96 +
 .../web/ozShell/bucket/DeleteBucketHandler.java |    87 +
 .../web/ozShell/bucket/InfoBucketHandler.java   |    94 +
 .../web/ozShell/bucket/ListBucketHandler.java   |   113 +
 .../web/ozShell/bucket/UpdateBucketHandler.java |    94 +
 .../ozone/web/ozShell/bucket/package-info.java  |    23 +
 .../web/ozShell/keys/DeleteKeyHandler.java      |    96 +
 .../ozone/web/ozShell/keys/GetKeyHandler.java   |   116 +
 .../ozone/web/ozShell/keys/InfoKeyHandler.java  |    98 +
 .../ozone/web/ozShell/keys/ListKeyHandler.java  |   116 +
 .../ozone/web/ozShell/keys/PutKeyHandler.java   |   106 +
 .../ozone/web/ozShell/keys/package-info.java    |    23 +
 .../hadoop/ozone/web/ozShell/package-info.java  |    27 +
 .../web/ozShell/volume/CreateVolumeHandler.java |    99 +
 .../web/ozShell/volume/DeleteVolumeHandler.java |    81 +
 .../web/ozShell/volume/InfoVolumeHandler.java   |    95 +
 .../web/ozShell/volume/ListVolumeHandler.java   |   114 +
 .../web/ozShell/volume/UpdateVolumeHandler.java |    92 +
 .../ozone/web/ozShell/volume/package-info.java  |    23 +
 .../apache/hadoop/ozone/web/package-info.java   |    24 +
 .../src/main/site/markdown/OzoneCommandShell.md |   150 +
 .../site/markdown/OzoneGettingStarted.md.vm     |   347 +
 .../src/main/site/markdown/OzoneMetrics.md      |   166 +
 .../src/main/site/markdown/OzoneOverview.md     |    88 +
 .../src/main/site/markdown/OzoneRest.md         |   549 +
 .../src/main/webapps/ksm/index.html             |    70 +
 .../src/main/webapps/ksm/ksm-metrics.html       |    44 +
 .../ozone-manager/src/main/webapps/ksm/ksm.js   |   108 +
 .../ozone-manager/src/main/webapps/ksm/main.css |    23 +
 .../src/main/webapps/ksm/main.html              |    18 +
 .../hadoop/ozone/ksm/TestBucketManagerImpl.java |   395 +
 .../hadoop/ozone/ksm/TestChunkStreams.java      |   234 +
 .../ksm/TestKeySpaceManagerHttpServer.java      |   141 +
 .../apache/hadoop/ozone/ksm/package-info.java   |    21 +
 hadoop-ozone/pom.xml                            |   169 +
 .../tools/dev-support/findbugsExcludeFile.xml   |    19 +
 hadoop-ozone/tools/pom.xml                      |    85 +
 .../org/apache/hadoop/ozone/freon/Freon.java    |  1149 +
 .../apache/hadoop/ozone/freon/package-info.java |    22 +
 .../genesis/BenchMarkContainerStateMap.java     |   171 +
 .../genesis/BenchMarkDatanodeDispatcher.java    |   280 +
 .../genesis/BenchMarkMetadataStoreReads.java    |    67 +
 .../genesis/BenchMarkMetadataStoreWrites.java   |    60 +
 .../ozone/genesis/BenchMarkRocksDbStore.java    |   115 +
 .../apache/hadoop/ozone/genesis/Genesis.java    |    59 +
 .../ozone/genesis/GenesisMemoryProfiler.java    |    59 +
 .../hadoop/ozone/genesis/GenesisUtil.java       |    90 +
 .../hadoop/ozone/genesis/package-info.java      |    25 +
 .../org/apache/hadoop/ozone/scm/cli/SQLCLI.java |   709 +
 .../hadoop/ozone/scm/cli/package-info.java      |    22 +
 .../org/apache/hadoop/test/OzoneTestDriver.java |    59 +
 hadoop-project-dist/pom.xml                     |     6 +-
 hadoop-project/pom.xml                          |   306 +-
 hadoop-project/src/site/site.xml                |    14 +
 .../src/site/resources/css/site.css             |    30 +
 .../hadoop/fs/s3a/S3ABlockOutputStream.java     |     7 +-
 .../apache/hadoop/fs/s3a/S3ARetryPolicy.java    |     6 +-
 .../fs/s3a/s3guard/DynamoDBMetadataStore.java   |    20 +-
 .../fs/s3a/s3guard/LocalMetadataStore.java      |    20 +-
 .../hadoop/fs/s3a/s3guard/MetadataStore.java    |    14 +-
 .../s3a/s3guard/MetadataStoreCapabilities.java  |    43 +
 .../fs/s3a/s3guard/NullMetadataStore.java       |     4 +
 .../hadoop/fs/s3a/s3guard/S3GuardTool.java      |    10 +-
 .../site/markdown/tools/hadoop-aws/s3guard.md   |    11 +-
 .../hadoop-aws/src/site/resources/css/site.css  |    30 +
 .../org/apache/hadoop/fs/s3a/TestInvoker.java   |    14 +-
 .../hadoop/fs/s3a/TestS3ABlockOutputStream.java |    66 +
 .../s3guard/AbstractS3GuardToolTestBase.java    |    21 +-
 .../s3a/s3guard/ITestS3GuardToolDynamoDB.java   |     9 +
 .../fs/s3a/s3guard/MetadataStoreTestBase.java   |    58 +-
 hadoop-tools/hadoop-azure-datalake/pom.xml      |     2 +-
 .../src/site/resources/css/site.css             |    30 +
 .../src/site/resources/css/site.css             |    30 +
 .../hadoop/tools/mapred/TestCopyMapper.java     |   173 +-
 .../mapred/TestCopyMapperCompositeCrc.java      |    50 +
 hadoop-tools/hadoop-ozone/pom.xml               |   199 +
 .../org/apache/hadoop/fs/ozone/Constants.java   |    48 +
 .../java/org/apache/hadoop/fs/ozone/OzFs.java   |    43 +
 .../hadoop/fs/ozone/OzoneFSInputStream.java     |    79 +
 .../hadoop/fs/ozone/OzoneFSOutputStream.java    |    59 +
 .../apache/hadoop/fs/ozone/OzoneFileSystem.java |   700 +
 .../apache/hadoop/fs/ozone/package-info.java    |    30 +
 .../hadoop/fs/ozone/TestOzoneFSInputStream.java |   155 +
 .../fs/ozone/TestOzoneFileInterfaces.java       |   230 +
 .../contract/ITestOzoneContractCreate.java      |    48 +
 .../contract/ITestOzoneContractDelete.java      |    48 +
 .../contract/ITestOzoneContractDistCp.java      |    50 +
 .../ITestOzoneContractGetFileStatus.java        |    61 +
 .../ozone/contract/ITestOzoneContractMkdir.java |    48 +
 .../ozone/contract/ITestOzoneContractOpen.java  |    47 +
 .../contract/ITestOzoneContractRename.java      |    49 +
 .../contract/ITestOzoneContractRootDir.java     |    51 +
 .../ozone/contract/ITestOzoneContractSeek.java  |    47 +
 .../hadoop/fs/ozone/contract/OzoneContract.java |   123 +
 .../src/test/resources/contract/ozone.xml       |   113 +
 .../src/test/resources/log4j.properties         |    23 +
 hadoop-tools/hadoop-sls/pom.xml                 |     1 +
 .../src/main/html/simulate.html.template        |    24 +-
 .../org/apache/hadoop/yarn/sls/SLSRunner.java   |    80 +-
 .../sls/scheduler/SLSCapacityScheduler.java     |    29 +
 .../yarn/sls/scheduler/SchedulerMetrics.java    |    42 +
 .../apache/hadoop/yarn/sls/utils/SLSUtils.java  |    24 +-
 .../apache/hadoop/yarn/sls/web/SLSWebApp.java   |    70 +-
 .../hadoop/yarn/sls/utils/TestSLSUtils.java     |    25 +
 .../test/resources/nodes-with-resources.json    |    19 +
 hadoop-tools/hadoop-tools-dist/pom.xml          |    15 +
 hadoop-tools/pom.xml                            |    12 +-
 .../MySQL/FederationStateStoreTables.sql        |     2 +-
 .../jdiff/Apache_Hadoop_YARN_Client_3.1.0.xml   |  3146 ++
 .../jdiff/Apache_Hadoop_YARN_Common_3.1.0.xml   |  3034 ++
 .../Apache_Hadoop_YARN_Server_Common_3.1.0.xml  |  1331 +
 .../hadoop/yarn/api/ApplicationConstants.java   |    10 +
 .../yarn/api/records/ApplicationReport.java     |    45 +-
 .../timelineservice/SubApplicationEntity.java   |    50 +
 .../yarn/api/resource/PlacementConstraints.java |    24 +-
 .../hadoop/yarn/conf/YarnConfiguration.java     |    48 +-
 .../src/main/proto/yarn_protos.proto            |     1 +
 .../api/resource/TestPlacementConstraints.java  |     4 +-
 .../distributedshell/ApplicationMaster.java     |    68 +-
 .../distributedshell/TestDSAppMaster.java       |     8 +-
 .../hadoop-yarn-services-api/pom.xml            |     5 +
 .../yarn/service/client/ApiServiceClient.java   |    93 +-
 .../client/SystemServiceManagerImpl.java        |   391 +
 .../hadoop/yarn/service/webapp/ApiServer.java   |   252 +-
 .../definition/YARN-Services-Examples.md        |   240 +-
 ...RN-Simplified-V1-API-Layer-For-Services.yaml |    31 +-
 .../hadoop/yarn/service/ServiceClientTest.java  |   121 +-
 .../hadoop/yarn/service/TestApiServer.java      |   141 +-
 .../service/client/TestApiServiceClient.java    |    45 +-
 .../client/TestSystemServiceManagerImpl.java    |   182 +
 .../resources/system-services/bad/bad.yarnfile  |    16 +
 .../sync/user1/example-app1.yarnfile            |    16 +
 .../sync/user1/example-app2.yarnfile            |    16 +
 .../sync/user1/example-app3.json                |    16 +
 .../sync/user2/example-app1.yarnfile            |    16 +
 .../sync/user2/example-app2.yarnfile            |    16 +
 .../hadoop-yarn-services-core/pom.xml           |     5 +
 .../hadoop/yarn/service/ClientAMProtocol.java   |     6 +
 .../hadoop/yarn/service/ClientAMService.java    |    39 +-
 .../yarn/service/ContainerFailureTracker.java   |     7 +-
 .../hadoop/yarn/service/ServiceContext.java     |    10 +
 .../hadoop/yarn/service/ServiceEvent.java       |    10 +
 .../hadoop/yarn/service/ServiceEventType.java   |     2 +-
 .../hadoop/yarn/service/ServiceManager.java     |   156 +-
 .../hadoop/yarn/service/ServiceMaster.java      |    18 +-
 .../hadoop/yarn/service/ServiceScheduler.java   |    73 +-
 .../yarn/service/api/records/BaseResource.java  |     2 +-
 .../yarn/service/api/records/Component.java     |    21 +
 .../yarn/service/api/records/ConfigFile.java    |     3 +-
 .../service/api/records/ContainerState.java     |     2 +-
 .../service/api/records/ReadinessCheck.java     |     1 +
 .../yarn/service/api/records/Service.java       |    24 +
 .../yarn/service/api/records/ServiceState.java  |     3 +-
 .../yarn/service/client/ClientAMProxy.java      |     5 +-
 .../yarn/service/client/ServiceClient.java      |   347 +-
 .../yarn/service/component/Component.java       |   251 +-
 .../yarn/service/component/ComponentEvent.java  |    10 +
 .../service/component/ComponentEventType.java   |     2 +-
 .../component/instance/ComponentInstance.java   |    77 +-
 .../instance/ComponentInstanceEventType.java    |     3 +-
 .../yarn/service/conf/RestApiConstants.java     |    12 +
 .../yarn/service/conf/YarnServiceConf.java      |    87 +
 .../yarn/service/conf/YarnServiceConstants.java |     1 +
 .../containerlaunch/ContainerLaunchService.java |   100 +-
 .../yarn/service/exceptions/ErrorStrings.java   |     2 +
 .../pb/client/ClientAMProtocolPBClientImpl.java |    14 +
 .../service/ClientAMProtocolPBServiceImpl.java  |    12 +
 .../ComponentHealthThresholdMonitor.java        |   151 +
 .../yarn/service/monitor/ServiceMonitor.java    |     7 +-
 .../service/monitor/probe/DefaultProbe.java     |    99 +
 .../yarn/service/monitor/probe/HttpProbe.java   |    37 +-
 .../yarn/service/monitor/probe/MonitorKeys.java |    12 +
 .../service/monitor/probe/MonitorUtils.java     |    14 +-
 .../yarn/service/monitor/probe/PortProbe.java   |    24 +-
 .../yarn/service/monitor/probe/Probe.java       |    18 +-
 .../provider/AbstractClientProvider.java        |    23 +-
 .../provider/AbstractProviderService.java       |    40 +-
 .../yarn/service/provider/ProviderService.java  |     7 +-
 .../yarn/service/provider/ProviderUtils.java    |   118 +-
 .../provider/docker/DockerProviderService.java  |    17 +-
 .../yarn/service/utils/CoreFileSystem.java      |     7 +
 .../yarn/service/utils/ServiceApiUtil.java      |    70 +-
 .../service/utils/ServiceRegistryUtils.java     |    60 +
 .../src/main/proto/ClientAMProtocol.proto       |    11 +
 .../hadoop/yarn/service/MockServiceAM.java      |    25 +
 .../hadoop/yarn/service/ServiceTestUtils.java   |    26 +-
 .../hadoop/yarn/service/TestServiceAM.java      |    55 +
 .../hadoop/yarn/service/TestServiceManager.java |   122 +-
 .../yarn/service/TestYarnNativeServices.java    |   268 +-
 .../yarn/service/client/TestServiceCLI.java     |   192 +-
 .../yarn/service/client/TestServiceClient.java  |   205 +-
 .../yarn/service/component/TestComponent.java   |   265 +
 .../instance/TestComponentInstance.java         |    88 +
 .../service/monitor/TestServiceMonitor.java     |     1 +
 .../service/monitor/probe/TestDefaultProbe.java |   155 +
 .../service/provider/TestProviderUtils.java     |   164 +
 .../providers/TestAbstractClientProvider.java   |    44 +
 .../hadoop/yarn/client/api/AppAdminClient.java  |    27 +-
 .../yarn/client/api/impl/AMRMClientImpl.java    |     1 -
 .../hadoop/yarn/client/cli/ApplicationCLI.java  |    65 +
 .../hadoop/yarn/client/ProtocolHATestBase.java  |     2 +-
 .../yarn/client/api/impl/TestAHSClient.java     |     8 +-
 .../yarn/client/api/impl/TestYarnClient.java    |     8 +-
 .../hadoop/yarn/client/cli/TestYarnCLI.java     |    63 +-
 .../impl/pb/ApplicationReportPBImpl.java        |    11 +
 .../PlacementConstraintTransformations.java     |     4 +-
 .../yarn/client/api/TimelineV2Client.java       |    47 +-
 .../client/api/impl/TimelineClientImpl.java     |    23 +-
 .../client/api/impl/TimelineV2ClientImpl.java   |    30 +-
 .../java/org/apache/hadoop/yarn/util/Apps.java  |   115 +-
 .../yarn/util/DockerClientConfigHandler.java    |    19 +-
 .../apache/hadoop/yarn/util/RackResolver.java   |    49 +-
 .../yarn/util/timeline/TimelineUtils.java       |     3 +-
 .../src/main/resources/yarn-default.xml         |    17 +-
 .../hadoop/yarn/api/TestApplicatonReport.java   |     2 +-
 .../org/apache/hadoop/yarn/util/TestApps.java   |   136 +
 .../hadoop/registry/server/dns/RegistryDNS.java |     3 +
 .../ApplicationHistoryManagerImpl.java          |     2 +-
 .../TestFileSystemApplicationHistoryStore.java  |    18 +-
 .../http/RMAuthenticationFilterInitializer.java |    51 +-
 .../server/service/SystemServiceManager.java    |    25 +
 .../yarn/server/service/package-info.java       |    27 +
 ...TimelineAuthenticationFilterInitializer.java |    47 +-
 .../hadoop/yarn/server/utils/BuilderUtils.java  |     3 +-
 .../hadoop/yarn/server/webapp/AppBlock.java     |     7 +-
 .../hadoop/yarn/server/webapp/AppsBlock.java    |     5 +-
 .../hadoop/yarn/server/webapp/WebPageUtils.java |     2 +-
 .../hadoop/yarn/server/webapp/dao/AppInfo.java  |     6 +
 .../server/nodemanager/ContainerExecutor.java   |    11 +
 .../nodemanager/DefaultContainerExecutor.java   |     6 +
 .../server/nodemanager/DirectoryCollection.java |    39 +-
 .../nodemanager/LinuxContainerExecutor.java     |   132 +-
 .../nodemanager/amrmproxy/AMRMProxyService.java |     2 +-
 .../containermanager/AuxServices.java           |   175 +-
 .../containermanager/ContainerManagerImpl.java  |     3 +-
 .../container/ContainerImpl.java                |     3 +-
 .../launcher/ContainerLaunch.java               |    57 +-
 .../launcher/ContainerRelaunch.java             |    38 +-
 .../linux/privileged/PrivilegedOperation.java   |     4 +-
 .../runtime/DefaultLinuxContainerRuntime.java   |    11 +-
 .../DelegatingLinuxContainerRuntime.java        |     9 +
 .../runtime/DockerLinuxContainerRuntime.java    |    97 +-
 .../JavaSandboxLinuxContainerRuntime.java       |    10 +
 .../linux/runtime/docker/DockerClient.java      |    55 +
 .../linux/runtime/docker/DockerCommand.java     |    32 +
 .../runtime/docker/DockerCommandExecutor.java   |    38 +-
 .../runtime/docker/DockerInspectCommand.java    |    19 +
 .../linux/runtime/docker/DockerRmCommand.java   |    16 +
 .../runtime/docker/DockerStartCommand.java      |    29 +
 .../localizer/ResourceLocalizationService.java  |    20 +
 .../runtime/ContainerRuntime.java               |    10 +
 .../scheduler/ContainerScheduler.java           |     7 +-
 .../recovery/NMLeveldbStateStoreService.java    |    16 +-
 .../timelineservice/NMTimelinePublisher.java    |    15 +-
 .../impl/container-executor.c                   |    46 +-
 .../impl/container-executor.h                   |    10 +-
 .../main/native/container-executor/impl/main.c  |    47 +-
 .../container-executor/impl/utils/docker-util.c |   141 +-
 .../container-executor/impl/utils/docker-util.h |    11 +
 .../test/utils/test_docker_util.cc              |   117 +-
 .../nodemanager/TestLinuxContainerExecutor.java |    12 +
 .../amrmproxy/BaseAMRMProxyTest.java            |     5 +
 .../amrmproxy/TestAMRMProxyService.java         |    42 +
 .../containermanager/TestAuxServices.java       |   167 +-
 .../TestContainerManagerRecovery.java           |    51 +
 .../launcher/TestContainerRelaunch.java         |     2 +-
 .../launcher/TestContainersLauncher.java        |     2 +-
 .../runtime/TestDockerContainerRuntime.java     |   325 +-
 .../docker/TestDockerCommandExecutor.java       |    94 +-
 .../runtime/docker/TestDockerStartCommand.java  |    53 +
 .../TestResourceLocalizationService.java        |   125 +
 .../TestContainersMonitorResourceChange.java    |     5 +
 .../TestNMLeveldbStateStoreService.java         |    16 +
 .../TestNMTimelinePublisher.java                |     1 -
 .../server/resourcemanager/RMServerUtils.java   |     5 +-
 .../server/resourcemanager/ResourceManager.java |    56 +-
 .../resourcemanager/amlauncher/AMLauncher.java  |    23 +-
 .../metrics/TimelineServiceV1Publisher.java     |     2 +
 .../metrics/TimelineServiceV2Publisher.java     |     2 +
 .../recovery/FileSystemRMStateStore.java        |     4 +-
 .../recovery/LeveldbRMStateStore.java           |    14 +-
 .../recovery/MemoryRMStateStore.java            |     2 +-
 .../resourcemanager/recovery/RMStateStore.java  |    18 +-
 .../recovery/ZKRMStateStore.java                |     4 +-
 .../recovery/records/ApplicationStateData.java  |    24 +-
 .../impl/pb/ApplicationStateDataPBImpl.java     |    13 +
 .../AbstractSchedulerPlanFollower.java          |     5 +-
 .../server/resourcemanager/rmapp/RMApp.java     |    10 +-
 .../resourcemanager/rmapp/RMAppEvent.java       |     6 +
 .../resourcemanager/rmapp/RMAppEventType.java   |     1 +
 .../server/resourcemanager/rmapp/RMAppImpl.java |    41 +-
 .../rmapp/attempt/RMAppAttemptEvent.java        |     7 +
 .../rmapp/attempt/RMAppAttemptImpl.java         |    51 +-
 .../rmapp/attempt/RMAppAttemptMetrics.java      |     9 +-
 .../rmcontainer/RMContainerImpl.java            |    30 +-
 .../resourcemanager/scheduler/Allocation.java   |    12 +
 .../scheduler/SchedulerApplicationAttempt.java  |    13 +-
 .../scheduler/SchedulerUtils.java               |    33 +-
 .../capacity/AutoCreatedLeafQueue.java          |     3 +-
 .../AutoCreatedQueueManagementPolicy.java       |    12 +-
 .../scheduler/capacity/CapacityScheduler.java   |    11 +-
 .../CapacitySchedulerConfiguration.java         |    36 +
 .../scheduler/capacity/LeafQueue.java           |    11 +
 .../scheduler/capacity/ManagedParentQueue.java  |     5 +-
 .../allocator/AbstractContainerAllocator.java   |     9 +-
 .../allocator/RegularContainerAllocator.java    |    42 +-
 .../GuaranteedOrZeroCapacityOverTimePolicy.java |   573 +-
 .../scheduler/common/fica/FiCaSchedulerApp.java |    10 +
 .../constraint/PlacementConstraintsUtil.java    |     8 +-
 .../scheduler/fair/AllocationConfiguration.java |    20 -
 .../placement/PendingAskUpdateResult.java       |     8 +
 .../security/DelegationTokenRenewer.java        |     4 +
 .../webapp/FairSchedulerAppsBlock.java          |     2 +
 .../resourcemanager/webapp/NodesPage.java       |     2 +-
 .../resourcemanager/webapp/RMAppsBlock.java     |     2 +
 .../resourcemanager/webapp/RMWebServices.java   |    13 +-
 .../resourcemanager/webapp/dao/AppInfo.java     |     6 +
 .../yarn_server_resourcemanager_recovery.proto  |     1 +
 .../yarn/server/resourcemanager/MockAM.java     |     2 +-
 .../yarn/server/resourcemanager/MockNM.java     |    15 +
 .../server/resourcemanager/TestAppManager.java  |    20 +-
 .../TestApplicationMasterLauncher.java          |    80 +-
 .../resourcemanager/TestClientRMService.java    |    14 +-
 .../resourcemanager/TestRMAdminService.java     |     2 +
 .../applicationsmanager/MockAsm.java            |    15 +-
 .../TestCombinedSystemMetricsPublisher.java     |    26 +
 .../metrics/TestSystemMetricsPublisher.java     |     1 +
 .../TestSystemMetricsPublisherForV2.java        |     1 +
 .../TestPreemptionForQueueWithPriorities.java   |   147 +
 ...pacityPreemptionPolicyInterQueueWithDRF.java |    68 +
 .../TestUserGroupMappingPlacementRule.java      |     0
 .../recovery/RMStateStoreTestBase.java          |    18 +-
 .../recovery/TestFSRMStateStore.java            |     3 +-
 .../recovery/TestLeveldbRMStateStore.java       |     1 +
 .../recovery/TestZKRMStateStore.java            |     3 +-
 .../server/resourcemanager/rmapp/MockRMApp.java |     6 +
 .../rmapp/TestRMAppTransitions.java             |     2 +-
 .../TestCapacitySchedulerAsyncScheduling.java   |    91 +
 ...stCapacitySchedulerAutoCreatedQueueBase.java |   241 +-
 .../TestCapacitySchedulerAutoQueueCreation.java |   233 +-
 ...TestCapacitySchedulerSurgicalPreemption.java |   150 +
 .../TestQueueManagementDynamicEditPolicy.java   |    30 +-
 .../TestPlacementConstraintsUtil.java           |    88 +
 .../fair/TestAllocationFileLoaderService.java   |    35 -
 ...stSingleConstraintAppPlacementAllocator.java |    36 +-
 .../security/TestDelegationTokenRenewer.java    |    19 +
 .../security/TestRMAuthenticationFilter.java    |    81 +
 .../resourcemanager/webapp/TestRMWebApp.java    |     2 +-
 .../webapp/TestRMWebServicesApps.java           |    14 +-
 .../webapp/FederationInterceptorREST.java       |    52 +-
 .../MockDefaultRequestInterceptorREST.java      |    16 +
 .../webapp/TestFederationInterceptorREST.java   |    56 +
 ...stTimelineReaderWebServicesHBaseStorage.java |     7 +-
 .../TestHBaseTimelineStorageEntities.java       |     3 +-
 .../storage/HBaseTimelineWriterImpl.java        |     3 +-
 .../storage/TimelineSchemaCreator.java          |    10 +
 .../storage/domain/DomainTableRW.java           |    92 +
 .../storage/domain/package-info.java            |    28 +
 .../storage/domain/DomainColumn.java            |   111 +
 .../storage/domain/DomainColumnFamily.java      |    52 +
 .../storage/domain/DomainRowKey.java            |   179 +
 .../storage/domain/DomainTable.java             |    45 +
 .../storage/domain/package-info.java            |    28 +
 .../storage/common/TestRowKeys.java             |    32 +
 .../collector/TimelineCollectorWebService.java  |    19 +-
 .../reader/TimelineParserForCompareExpr.java    |     7 +-
 .../reader/TimelineParserForEqualityExpr.java   |     7 +-
 .../reader/TimelineReaderServer.java            |     2 +-
 ...TestPerNodeTimelineCollectorsAuxService.java |     2 +
 .../TestTimelineReaderWebServicesUtils.java     |    25 +
 .../server/webproxy/amfilter/AmIpFilter.java    |    13 +-
 .../server/webproxy/amfilter/TestAmFilter.java  |    40 +
 .../src/site/markdown/CapacityScheduler.md      |    18 +-
 .../src/site/markdown/NodeManager.md            |    49 +-
 .../site/markdown/PlacementConstraints.md.vm    |    82 +-
 .../src/site/markdown/TimelineServiceV2.md      |     2 +-
 .../src/site/markdown/yarn-service/Concepts.md  |     6 +-
 .../markdown/yarn-service/Configurations.md     |   131 +-
 .../src/site/markdown/yarn-service/Overview.md  |    14 +-
 .../site/markdown/yarn-service/QuickStart.md    |    55 +-
 .../site/markdown/yarn-service/RegistryDNS.md   |     4 +-
 .../markdown/yarn-service/ServiceDiscovery.md   |     4 +-
 .../markdown/yarn-service/SystemServices.md     |    66 +
 .../markdown/yarn-service/YarnServiceAPI.md     |   117 +-
 .../main/webapp/app/components/nodes-heatmap.js |     4 +-
 .../main/webapp/app/components/timeline-view.js |    45 +-
 .../webapp/app/controllers/yarn-app-attempt.js  |     9 +-
 .../webapp/app/controllers/yarn-app/attempts.js |    11 +-
 .../app/controllers/yarn-component-instance.js  |     3 +-
 .../app/controllers/yarn-component-instances.js |     3 +-
 .../webapp/app/controllers/yarn-nodes/table.js  |     8 +-
 .../app/controllers/yarn-tools/yarn-conf.js     |    10 +-
 .../src/main/webapp/app/helpers/node-name.js    |    46 -
 .../src/main/webapp/app/initializers/loader.js  |     2 +
 .../main/webapp/app/models/yarn-app-attempt.js  |     5 +
 .../app/models/yarn-queue/capacity-queue.js     |     2 +-
 .../templates/components/app-attempt-table.hbs  |     2 +-
 .../app/templates/components/timeline-view.hbs  |    12 +-
 .../webapp/app/templates/yarn-app-attempt.hbs   |     2 +
 .../webapp/app/templates/yarn-app/attempts.hbs  |     2 +
 .../src/main/webapp/app/templates/yarn-node.hbs |    25 +
 .../webapp/app/templates/yarn-node/info.hbs     |     2 -
 .../app/templates/yarn-node/yarn-nm-gpu.hbs     |     2 -
 .../app/templates/yarn-tools/yarn-conf.hbs      |     6 +-
 .../src/main/webapp/tests/helpers/resolver.js   |     2 +-
 .../src/main/webapp/tests/index.html            |     1 +
 .../components/breadcrumb-bar-test.js           |    31 +-
 .../unit/adapters/yarn-app-attempt-test.js      |    59 +
 .../webapp/tests/unit/adapters/yarn-app-test.js |    36 +-
 .../unit/adapters/yarn-container-log-test.js    |    18 +-
 .../tests/unit/adapters/yarn-container-test.js  |    38 +
 .../tests/unit/adapters/yarn-node-app-test.js   |    42 +-
 .../unit/adapters/yarn-node-container-test.js   |    40 +-
 .../tests/unit/adapters/yarn-node-test.js       |    15 +-
 .../tests/unit/adapters/yarn-rm-node-test.js    |    13 +-
 .../tests/unit/controllers/yarn-app-test.js     |    13 +-
 .../webapp/tests/unit/helpers/node-name-test.js |    28 -
 .../webapp/tests/unit/initializers/env-test.js  |     5 +-
 .../tests/unit/initializers/hosts-test.js       |     5 +-
 .../tests/unit/initializers/jquery-test.js      |    41 -
 .../tests/unit/models/cluster-info-test.js      |    37 +
 .../tests/unit/models/cluster-metric-test.js    |    81 +
 .../tests/unit/models/yarn-app-attempt-test.js  |    65 +
 .../webapp/tests/unit/models/yarn-app-test.js   |    61 +-
 .../unit/models/yarn-container-log-test.js      |    18 -
 .../tests/unit/models/yarn-container-test.js    |    49 +
 .../tests/unit/models/yarn-node-app-test.js     |    14 +-
 .../unit/models/yarn-node-container-test.js     |    16 +-
 .../webapp/tests/unit/models/yarn-node-test.js  |    18 -
 .../webapp/tests/unit/models/yarn-queue-test.js |   122 +
 .../tests/unit/models/yarn-rm-node-test.js      |    14 +-
 .../webapp/tests/unit/models/yarn-user-test.js  |    32 +
 .../tests/unit/routes/cluster-overview-test.js  |   143 +
 .../tests/unit/routes/yarn-app-attempt-test.js  |    30 +
 .../webapp/tests/unit/routes/yarn-app-test.js   |   152 +
 .../webapp/tests/unit/routes/yarn-apps-test.js  |   113 +-
 .../webapp/tests/unit/routes/yarn-node-test.js  |    19 +-
 .../webapp/tests/unit/routes/yarn-nodes-test.js |    13 +-
 .../tests/unit/routes/yarn-queues-test.js       |   286 +-
 .../tests/unit/serializers/cluster-info-test.js |    70 +
 .../unit/serializers/cluster-metric-test.js     |    90 +
 .../unit/serializers/yarn-app-attempt-test.js   |   101 +
 .../tests/unit/serializers/yarn-app-test.js     |    62 +-
 .../unit/serializers/yarn-container-test.js     |    30 +
 .../unit/serializers/yarn-node-app-test.js      |    13 +-
 .../serializers/yarn-node-container-test.js     |    13 +-
 .../tests/unit/serializers/yarn-rm-node-test.js |    14 +-
 pom.xml                                         |    99 +
 1416 files changed, 167327 insertions(+), 4681 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/a38fde5d/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a38fde5d/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
----------------------------------------------------------------------
diff --cc hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
index 4b03990,70fde60..2734a95
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
@@@ -416,12 -416,12 +416,13 @@@ public class ProtobufRpcEngine implemen
          Configuration conf, String bindAddress, int port, int numHandlers,
          int numReaders, int queueSizePerHandler, boolean verbose,
          SecretManager<? extends TokenIdentifier> secretManager, 
 -        String portRangeConfig)
 +        String portRangeConfig, AlignmentContext alignmentContext)
          throws IOException {
        super(bindAddress, port, null, numHandlers,
-           numReaders, queueSizePerHandler, conf, classNameBase(protocolImpl
-               .getClass().getName()), secretManager, portRangeConfig);
+           numReaders, queueSizePerHandler, conf,
+           serverNameFromClass(protocolImpl.getClass()), secretManager,
+           portRangeConfig);
 +      setAlignmentContext(alignmentContext);
        this.verbose = verbose;  
        registerProtocolAndImpl(RPC.RpcKind.RPC_PROTOCOL_BUFFER, protocolClass,
            protocolImpl);

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a38fde5d/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/RPC.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/a38fde5d/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
----------------------------------------------------------------------
diff --cc hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
index ff4a63a,76d9c40..ab7eccc
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
@@@ -140,8 -140,11 +140,12 @@@ public abstract class Server 
    private RpcSaslProto negotiateResponse;
    private ExceptionsHandler exceptionsHandler = new ExceptionsHandler();
    private Tracer tracer;
 +  private AlignmentContext alignmentContext;
-   
+   /**
+    * Logical name of the server used in metrics and monitor.
+    */
+   private final String serverName;
 -  
++
    /**
     * Add exception classes for which server won't log stack traces.
     *


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