Merge branch 'trunk' into HDFS-7240
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0f73cd7f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0f73cd7f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0f73cd7f Branch: refs/heads/HDFS-7240 Commit: 0f73cd7ff6327a3b263af56cb84c69210177e909 Parents: 6692127 35c5943 Author: Anu Engineer <[email protected]> Authored: Thu Sep 8 19:34:51 2016 -0700 Committer: Anu Engineer <[email protected]> Committed: Thu Sep 8 19:34:51 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/fs/Path.java | 20 +- .../apache/hadoop/ipc/ProtobufRpcEngine.java | 5 +- .../main/java/org/apache/hadoop/ipc/RPC.java | 15 +- .../main/java/org/apache/hadoop/ipc/Server.java | 4 +- .../hadoop/security/UserGroupInformation.java | 4 +- .../apache/hadoop/util/AutoCloseableLock.java | 28 +- .../org/apache/hadoop/util/DataChecksum.java | 2 +- .../hadoop/util/NodeHealthScriptRunner.java | 3 +- .../java/org/apache/hadoop/fs/TestPath.java | 20 + .../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 | 37 +- .../java/org/apache/hadoop/ipc/TestRpcBase.java | 50 +- .../java/org/apache/hadoop/ipc/TestSaslRPC.java | 74 +-- .../hadoop/security/TestDoAsEffectiveUser.java | 291 +++++++---- .../security/TestUserGroupInformation.java | 28 +- .../hadoop/util/TestNodeHealthScriptRunner.java | 7 - .../hadoop-common/src/test/proto/test.proto | 4 +- .../src/test/proto/test_rpc_service.proto | 4 +- .../org/apache/hadoop/hdfs/DFSInputStream.java | 68 ++- .../hadoop/hdfs/DFSStripedInputStream.java | 24 +- .../hadoop/hdfs/util/StripedBlockUtil.java | 177 ++++--- .../hadoop/hdfs/web/URLConnectionFactory.java | 1 + .../src/main/native/libhdfs/hdfs.c | 10 +- .../hadoop-hdfs/src/main/bin/hdfs | 2 +- .../org/apache/hadoop/hdfs/DFSConfigKeys.java | 5 + .../apache/hadoop/hdfs/InstrumentedLock.java | 185 +++++++ .../datanode/fsdataset/impl/FsDatasetImpl.java | 10 +- .../diskbalancer/command/CancelCommand.java | 23 +- .../server/diskbalancer/command/Command.java | 6 +- .../diskbalancer/command/ExecuteCommand.java | 15 +- .../diskbalancer/command/HelpCommand.java | 22 +- .../diskbalancer/command/PlanCommand.java | 63 +-- .../diskbalancer/command/QueryCommand.java | 19 +- .../diskbalancer/command/ReportCommand.java | 18 +- .../hdfs/server/namenode/NameNodeRpcServer.java | 3 + .../apache/hadoop/hdfs/tools/DiskBalancer.java | 482 ------------------- .../hadoop/hdfs/tools/DiskBalancerCLI.java | 482 +++++++++++++++++++ .../FileDistributionCalculator.java | 20 +- .../FileDistributionVisitor.java | 28 +- .../offlineImageViewer/OfflineImageViewer.java | 116 ++--- .../OfflineImageViewerPB.java | 78 +-- .../src/main/resources/hdfs-default.xml | 30 +- .../src/site/markdown/HDFSCommands.md | 4 + .../src/site/markdown/HdfsImageViewer.md | 13 +- .../hadoop/hdfs/TestDFSStripedInputStream.java | 121 ++++- .../hadoop/hdfs/TestInstrumentedLock.java | 166 +++++++ .../TestClientProtocolWithDelegationToken.java | 119 +++++ .../command/TestDiskBalancerCommand.java | 16 +- .../TestOfflineImageViewer.java | 24 +- .../hadoop/hdfs/util/TestStripedBlockUtil.java | 22 +- .../mapreduce/v2/hs/server/HSAdminServer.java | 3 + 54 files changed, 2361 insertions(+), 1139 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f73cd7f/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
