Merge branch 'trunk' into HDDS-4
Conflicts:
hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManagerIntegration.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/629347be
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/629347be
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/629347be
Branch: refs/heads/HDDS-4
Commit: 629347beadf0bc69c32c61e895ad03cb082df81a
Parents: 10d3954 724c150
Author: Anu Engineer <aengin...@apache.org>
Authored: Thu Nov 8 10:10:50 2018 -0800
Committer: Anu Engineer <aengin...@apache.org>
Committed: Thu Nov 8 10:10:50 2018 -0800
----------------------------------------------------------------------
BUILDING.txt | 30 +-
...ClusterStorageCapacityExceededException.java | 51 +++
.../AbstractDelegationTokenSecretManager.java | 12 +-
hadoop-hdds/common/pom.xml | 6 +
.../hdds/scm/container/ContainerInfo.java | 8 +
.../statemachine/DatanodeStateMachine.java | 17 +-
.../common/statemachine/StateContext.java | 13 +-
.../CloseContainerCommandHandler.java | 73 ++---
.../states/endpoint/HeartbeatEndpointTask.java | 12 +-
.../StorageContainerDatanodeProtocol.proto | 2 +-
.../org/apache/hadoop/hdds/scm/ScmUtils.java | 2 +-
.../hadoop/hdds/scm/block/BlockManagerImpl.java | 2 +-
.../hdds/scm/chillmode/ChillModeExitRule.java | 32 ++
.../hdds/scm/chillmode/ChillModePrecheck.java | 68 ++++
.../scm/chillmode/ChillModeRestrictedOps.java | 41 +++
.../scm/chillmode/ContainerChillModeRule.java | 112 +++++++
.../scm/chillmode/DataNodeChillModeRule.java | 83 +++++
.../hadoop/hdds/scm/chillmode/Precheck.java | 29 ++
.../hdds/scm/chillmode/SCMChillModeManager.java | 153 +++++++++
.../hadoop/hdds/scm/chillmode/package-info.java | 18 ++
.../scm/command/CommandStatusReportHandler.java | 4 -
.../container/CloseContainerEventHandler.java | 27 --
.../scm/container/CloseContainerWatcher.java | 101 ------
.../hdds/scm/container/ContainerManager.java | 11 -
.../hdds/scm/container/ContainerReplica.java | 30 +-
.../scm/container/ContainerReportHandler.java | 202 ++++++++----
.../scm/container/ContainerStateManager.java | 4 +-
.../IncrementalContainerReportHandler.java | 98 ++++++
.../hdds/scm/container/SCMContainerManager.java | 107 -------
.../scm/container/states/ContainerStateMap.java | 7 -
.../hadoop/hdds/scm/events/SCMEvents.java | 34 +-
.../hadoop/hdds/scm/node/DeadNodeHandler.java | 37 ++-
.../hadoop/hdds/scm/node/NewNodeHandler.java | 16 +-
.../hadoop/hdds/scm/node/NodeManager.java | 50 +--
.../hadoop/hdds/scm/node/NodeReportHandler.java | 2 +-
.../hadoop/hdds/scm/node/NodeStateManager.java | 69 +---
.../hadoop/hdds/scm/node/SCMNodeManager.java | 66 +---
.../hadoop/hdds/scm/node/StaleNodeHandler.java | 2 +-
.../hdds/scm/node/states/NodeStateMap.java | 67 ++--
.../hdds/scm/pipeline/PipelineManager.java | 3 +
.../hdds/scm/pipeline/PipelineStateManager.java | 5 +
.../hdds/scm/pipeline/PipelineStateMap.java | 22 ++
.../hdds/scm/pipeline/SCMPipelineManager.java | 11 +
.../hdds/scm/server/ChillModePrecheck.java | 69 ----
.../apache/hadoop/hdds/scm/server/Precheck.java | 29 --
.../hdds/scm/server/SCMChillModeManager.java | 319 -------------------
.../scm/server/SCMClientProtocolServer.java | 1 +
.../server/SCMDatanodeHeartbeatDispatcher.java | 17 +-
.../scm/server/SCMDatanodeProtocolServer.java | 6 +-
.../scm/server/StorageContainerManager.java | 22 +-
.../scm/chillmode/TestSCMChillModeManager.java | 215 +++++++++++++
.../command/TestCommandStatusReportHandler.java | 14 -
.../hdds/scm/container/MockNodeManager.java | 66 ++--
.../container/TestContainerReportHandler.java | 15 +-
.../container/TestContainerStateManager.java | 3 +
.../scm/container/TestSCMContainerManager.java | 107 +------
.../replication/TestReplicationManager.java | 12 +-
.../hdds/scm/node/TestDeadNodeHandler.java | 24 +-
.../scm/server/TestSCMChillModeManager.java | 215 -------------
.../container/TestCloseContainerWatcher.java | 289 -----------------
.../ozone/container/common/TestEndPoint.java | 6 +-
.../testutils/ReplicationNodeManagerMock.java | 55 +---
.../org/apache/hadoop/hdfs/DataStreamer.java | 1 +
.../hdfs/protocol/QuotaExceededException.java | 5 +-
.../src/main/native/libhdfs/exception.c | 2 +-
.../federation/router/RouterHttpServer.java | 4 +-
.../server/blockmanagement/BlockManager.java | 38 +++
.../diskbalancer/planner/package-info.java | 2 +-
.../server/namenode/NameNodeHttpServer.java | 13 +-
.../hdfs/server/namenode/NamenodeFsck.java | 33 ++
.../org/apache/hadoop/hdfs/tools/DFSck.java | 10 +-
.../hadoop/hdfs/util/PersistentLongFile.java | 2 +
.../src/site/markdown/HDFSCommands.md | 3 +-
.../org/apache/hadoop/hdfs/DFSTestUtil.java | 21 ++
.../TestClientProtocolForPipelineRecovery.java | 2 +
.../TestBlocksWithNotEnoughRacks.java | 72 +++++
.../hdfs/server/namenode/TestSaveNamespace.java | 56 ++++
.../org/apache/hadoop/mapred/YarnChild.java | 28 +-
.../org/apache/hadoop/mapred/TestYarnChild.java | 118 +++++++
.../apache/hadoop/mapreduce/MRJobConfig.java | 3 +
.../src/main/resources/mapred-default.xml | 9 +
.../hs/TestJHSDelegationTokenSecretManager.java | 78 ++++-
.../apache/hadoop/mapred/ShuffleHandler.java | 4 +-
.../apache/hadoop/ozone/client/OzoneKey.java | 16 +-
.../hadoop/ozone/client/OzoneKeyDetails.java | 9 +-
.../hadoop/ozone/client/rest/RestClient.java | 6 +-
.../hadoop/ozone/client/rpc/RpcClient.java | 14 +-
.../ozone/client/rest/response/KeyInfo.java | 20 ++
.../hadoop/ozone/web/response/KeyInfo.java | 21 ++
.../main/smoketest/s3/objectmultidelete.robot | 4 +
.../TestContainerStateManagerIntegration.java | 10 +-
.../hdds/scm/pipeline/TestNode2PipelineMap.java | 4 +-
.../hdds/scm/pipeline/TestPipelineClose.java | 4 +-
.../scm/pipeline/TestPipelineStateManager.java | 61 +++-
.../commandhandler/TestBlockDeletion.java | 6 +-
.../hadoop/ozone/om/TestScmChillMode.java | 2 +-
hadoop-ozone/s3gateway/pom.xml | 4 +
.../ozone/s3/endpoint/BucketEndpoint.java | 9 +-
.../hadoop/ozone/client/OzoneBucketStub.java | 2 +-
.../ozone/s3/TestSignedChunksInputStream.java | 2 +-
hadoop-project/pom.xml | 20 ++
.../fs/azurebfs/AzureBlobFileSystemStore.java | 20 +-
.../fs/azurebfs/services/AbfsAclHelper.java | 89 +++++-
.../azurebfs/ITestAzureBlobFilesystemAcl.java | 147 ++++++++-
.../hadoop/yarn/api/ApplicationConstants.java | 22 +-
.../hadoop/yarn/conf/YarnConfiguration.java | 24 +-
.../api/records/ComponentContainers.java | 3 +-
.../src/main/resources/yarn-default.xml | 19 ++
.../resourceplugin/ResourcePluginManager.java | 34 +-
.../TestResourcePluginManager.java | 107 ++++++-
.../nodelabels/NodeAttributesManagerImpl.java | 6 +-
.../scheduler/AbstractYarnScheduler.java | 2 +-
.../scheduler/capacity/CapacityScheduler.java | 96 ++++--
.../scheduler/fair/FSPreemptionThread.java | 2 +-
.../TestCapacitySchedulerAsyncScheduling.java | 83 +++++
.../fair/TestContinuousScheduling.java | 3 +-
.../scheduler/fair/TestFairScheduler.java | 3 +-
.../security/TestRMDelegationTokens.java | 63 ++++
.../src/main/webapp/public/crossdomain.xml | 7 +-
119 files changed, 2713 insertions(+), 1958 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/629347be/hadoop-hdds/common/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/629347be/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/629347be/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rest/RestClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/629347be/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/629347be/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/hdds/scm/container/TestContainerStateManagerIntegration.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
