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 dr...@apache.org on 2016/10/10 21:31:52 UTC
[10/23] hadoop git commit: Merge branch 'trunk' into HADOOP-12756
Merge branch 'trunk' into HADOOP-12756
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dbb28eb1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dbb28eb1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dbb28eb1
Branch: refs/heads/trunk
Commit: dbb28eb1f2125b4a2e43977d9add80a45f359c28
Parents: 60f66a9 501a778
Author: Kai Zheng <ka...@intel.com>
Authored: Sun Sep 18 19:03:39 2016 +0800
Committer: Kai Zheng <ka...@intel.com>
Committed: Sun Sep 18 19:03:39 2016 +0800
----------------------------------------------------------------------
.gitattributes | 18 +-
dev-support/checkstyle/suppressions.xml | 21 -
.../main/resources/checkstyle/checkstyle.xml | 10 +-
.../main/resources/checkstyle/suppressions.xml | 21 +
.../server/AuthenticationFilter.java | 3 +
.../java/org/apache/hadoop/fs/FileSystem.java | 125 ++-
.../apache/hadoop/io/retry/RetryPolicies.java | 14 +
.../org/apache/hadoop/io/retry/RetryUtils.java | 118 ++-
.../apache/hadoop/ipc/ProtobufRpcEngine.java | 5 +-
.../main/java/org/apache/hadoop/ipc/RPC.java | 13 +-
.../main/java/org/apache/hadoop/ipc/Server.java | 4 +-
.../hadoop/security/UserGroupInformation.java | 4 +-
.../java/org/apache/hadoop/util/RunJar.java | 6 +-
.../src/main/resources/core-default.xml | 6 -
.../src/site/markdown/Benchmarking.md | 1 +
.../apache/hadoop/fs/TestFilterFileSystem.java | 1 +
.../org/apache/hadoop/fs/TestHarFileSystem.java | 1 +
.../io/retry/TestConnectionRetryPolicy.java | 154 ++++
.../org/apache/hadoop/ipc/RPCCallBenchmark.java | 38 +-
.../hadoop/ipc/TestMultipleProtocolServer.java | 236 +----
.../apache/hadoop/ipc/TestRPCCallBenchmark.java | 13 -
.../apache/hadoop/ipc/TestRPCCompatibility.java | 242 +----
.../apache/hadoop/ipc/TestRPCWaitForProxy.java | 44 +-
.../hadoop/ipc/TestReuseRpcConnections.java | 166 ++++
.../java/org/apache/hadoop/ipc/TestRpcBase.java | 77 +-
.../java/org/apache/hadoop/ipc/TestSaslRPC.java | 74 +-
.../hadoop/security/TestDoAsEffectiveUser.java | 291 +++---
.../security/TestUserGroupInformation.java | 28 +-
.../hadoop-common/src/test/proto/test.proto | 4 +-
.../src/test/proto/test_rpc_service.proto | 8 +-
.../apache/hadoop/hdfs/web/JsonUtilClient.java | 42 +-
.../hadoop/hdfs/web/WebHdfsFileSystem.java | 87 +-
.../hadoop/fs/http/client/HttpFSFileSystem.java | 56 +-
.../hadoop/fs/http/client/HttpFSUtils.java | 2 +
.../hadoop/fs/http/server/FSOperations.java | 62 ++
.../http/server/HttpFSParametersProvider.java | 20 +
.../hadoop/fs/http/server/HttpFSServer.java | 17 +
.../service/hadoop/FileSystemAccessService.java | 4 +-
.../fs/http/client/BaseTestHttpFSWith.java | 62 +-
.../hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java | 2 +-
.../server/datanode/BlockPoolSliceStorage.java | 16 +-
.../hdfs/server/datanode/BlockReceiver.java | 2 +-
.../hdfs/server/datanode/BlockScanner.java | 4 +
.../hdfs/server/datanode/BlockSender.java | 7 +-
.../hadoop/hdfs/server/datanode/DNConf.java | 95 +-
.../hadoop/hdfs/server/datanode/DataNode.java | 135 +--
.../server/datanode/DataNodeFaultInjector.java | 2 +-
.../hdfs/server/datanode/DataStorage.java | 4 +-
.../hdfs/server/datanode/DirectoryScanner.java | 10 +-
.../hdfs/server/datanode/FinalizedReplica.java | 27 +-
.../hdfs/server/datanode/LocalReplica.java | 479 ++++++++++
.../server/datanode/LocalReplicaInPipeline.java | 417 +++++++++
.../server/datanode/ReplicaBeingWritten.java | 16 +-
.../hdfs/server/datanode/ReplicaBuilder.java | 252 +++++
.../hdfs/server/datanode/ReplicaHandler.java | 6 +-
.../hdfs/server/datanode/ReplicaInPipeline.java | 324 ++-----
.../datanode/ReplicaInPipelineInterface.java | 86 --
.../hdfs/server/datanode/ReplicaInfo.java | 370 ++++----
.../server/datanode/ReplicaUnderRecovery.java | 30 +-
.../datanode/ReplicaWaitingToBeRecovered.java | 27 +-
.../server/datanode/fsdataset/FsDatasetSpi.java | 9 +-
.../datanode/fsdataset/impl/BlockPoolSlice.java | 74 +-
.../impl/FsDatasetAsyncDiskService.java | 71 +-
.../datanode/fsdataset/impl/FsDatasetImpl.java | 908 +++++++------------
.../datanode/fsdataset/impl/FsDatasetUtil.java | 18 +
.../datanode/fsdataset/impl/FsVolumeImpl.java | 154 +++-
.../datanode/fsdataset/impl/FsVolumeList.java | 4 +-
.../impl/RamDiskAsyncLazyPersistService.java | 34 +-
.../hdfs/server/namenode/FSDirectory.java | 2 +-
.../hadoop/hdfs/server/namenode/NNStorage.java | 2 +-
.../hdfs/server/namenode/NameNodeRpcServer.java | 3 -
.../hadoop/hdfs/tools/DiskBalancerCLI.java | 25 +-
.../org/apache/hadoop/hdfs/web/JsonUtil.java | 34 +-
.../src/site/markdown/HDFSDiskbalancer.md | 109 ++-
.../hadoop-hdfs/src/site/markdown/WebHDFS.md | 183 ++--
.../org/apache/hadoop/hdfs/AppendTestUtil.java | 18 +-
.../TestClientProtocolForPipelineRecovery.java | 4 +-
.../apache/hadoop/hdfs/TestCrcCorruption.java | 6 +-
.../TestClientProtocolWithDelegationToken.java | 119 ---
.../server/datanode/SimulatedFSDataset.java | 30 +-
.../server/datanode/TestBPOfferService.java | 4 +-
.../datanode/TestBlockPoolSliceStorage.java | 6 +-
.../hdfs/server/datanode/TestBlockRecovery.java | 2 +-
.../datanode/TestDataNodeRollingUpgrade.java | 6 +-
.../TestDataXceiverLazyPersistHint.java | 5 +-
.../server/datanode/TestDirectoryScanner.java | 17 +-
.../server/datanode/TestSimulatedFSDataset.java | 2 +-
.../hdfs/server/datanode/TestTransferRbw.java | 4 +-
.../extdataset/ExternalDatasetImpl.java | 6 +-
.../extdataset/ExternalReplicaInPipeline.java | 26 +-
.../extdataset/TestExternalDataset.java | 4 +-
.../fsdataset/impl/FsDatasetImplTestUtils.java | 43 +-
.../fsdataset/impl/FsDatasetTestUtil.java | 20 +-
.../fsdataset/impl/TestFsDatasetImpl.java | 6 +-
.../fsdataset/impl/TestWriteToReplica.java | 4 +-
.../command/TestDiskBalancerCommand.java | 29 +-
.../mapreduce/v2/hs/server/HSAdminServer.java | 3 -
.../java/org/apache/hadoop/fs/TestDFSIO.java | 159 +++-
.../services/org.apache.hadoop.fs.FileSystem | 16 +
.../hadoop/yarn/client/cli/RMAdminCLI.java | 1 +
.../hadoop/yarn/client/cli/TestRMAdminCLI.java | 10 +-
.../nodemanager/DefaultContainerExecutor.java | 2 +-
.../containermanager/ContainerManagerImpl.java | 51 +-
.../containermanager/container/Container.java | 6 +
.../container/ContainerEventType.java | 3 +-
.../container/ContainerImpl.java | 274 +++++-
.../container/ContainerReInitEvent.java | 62 ++
.../container/ContainerState.java | 2 +-
.../launcher/ContainersLauncher.java | 1 +
.../launcher/ContainersLauncherEventType.java | 1 +
.../localizer/ResourceLocalizationService.java | 3 +-
.../containermanager/localizer/ResourceSet.java | 43 +-
.../ContainerLocalizationRequestEvent.java | 4 +-
.../recovery/NMLeveldbStateStoreService.java | 23 +-
.../TestContainerManagerWithLCE.java | 36 +
.../BaseContainerManagerTest.java | 6 +-
.../containermanager/TestContainerManager.java | 238 ++++-
.../TestNMLeveldbStateStoreService.java | 84 +-
.../nodemanager/webapp/MockContainer.java | 15 +
.../security/TestClientToAMTokens.java | 108 ++-
pom.xml | 2 +-
121 files changed, 4772 insertions(+), 2781 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org