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:51 UTC
[09/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/60f66a93
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/60f66a93
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/60f66a93
Branch: refs/heads/trunk
Commit: 60f66a930626255d60dea7acc828975061ec37de
Parents: e671a0f f0876b8
Author: Kai Zheng <ka...@intel.com>
Authored: Wed Sep 14 16:12:40 2016 +0800
Committer: Kai Zheng <ka...@intel.com>
Committed: Wed Sep 14 16:12:40 2016 +0800
----------------------------------------------------------------------
.../dev-support/findbugsExcludeFile.xml | 10 +-
.../hadoop-common/src/main/bin/hadoop | 13 +-
.../src/main/bin/hadoop-functions.sh | 144 +++++-
.../hadoop-common/src/main/conf/hadoop-env.sh | 31 +-
.../org/apache/hadoop/conf/ConfServlet.java | 21 +-
.../hadoop/crypto/CryptoOutputStream.java | 22 +-
.../hadoop/fs/CommonConfigurationKeys.java | 12 +-
.../main/java/org/apache/hadoop/fs/Path.java | 20 +-
.../fs/crypto/CryptoFSDataOutputStream.java | 8 +-
.../main/java/org/apache/hadoop/ipc/Client.java | 178 +++++--
.../apache/hadoop/ipc/ProtobufRpcEngine.java | 5 +-
.../main/java/org/apache/hadoop/ipc/RPC.java | 15 +-
.../main/java/org/apache/hadoop/ipc/Server.java | 4 +-
.../apache/hadoop/security/SaslRpcClient.java | 25 +-
.../hadoop/security/UserGroupInformation.java | 26 +-
.../apache/hadoop/util/AutoCloseableLock.java | 36 +-
.../org/apache/hadoop/util/DataChecksum.java | 2 +-
.../hadoop/util/NodeHealthScriptRunner.java | 3 +-
.../src/main/resources/core-default.xml | 17 +-
.../src/site/markdown/ClusterSetup.md | 19 +-
.../src/site/markdown/UnixShellGuide.md | 34 +-
.../hadoop/cli/util/ExactLineComparator.java | 44 ++
.../org/apache/hadoop/conf/TestConfServlet.java | 24 +
.../crypto/TestCryptoOutputStreamClosing.java | 57 +++
.../fs/TestLocalFileSystemPermission.java | 149 +++---
.../java/org/apache/hadoop/fs/TestPath.java | 20 +
.../org/apache/hadoop/ipc/RPCCallBenchmark.java | 38 +-
.../java/org/apache/hadoop/ipc/TestIPC.java | 86 +++-
.../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 | 52 +-
.../hadoop/util/TestNodeHealthScriptRunner.java | 7 -
.../hadoop-common/src/test/proto/test.proto | 4 +-
.../src/test/proto/test_rpc_service.proto | 4 +-
.../test/scripts/hadoop_add_client_opts.bats | 40 ++
.../test/scripts/hadoop_subcommand_opts.bats | 68 +++
.../scripts/hadoop_subcommand_secure_opts.bats | 52 ++
.../src/test/scripts/hadoop_verify_user.bats | 53 ++
.../org/apache/hadoop/hdfs/DFSInputStream.java | 68 ++-
.../hadoop/hdfs/DFSStripedInputStream.java | 24 +-
.../hadoop/hdfs/util/StripedBlockUtil.java | 177 ++++---
.../hadoop/hdfs/web/URLConnectionFactory.java | 1 +
.../hadoop/fs/http/client/HttpFSFileSystem.java | 21 +-
.../hadoop/fs/http/server/FSOperations.java | 186 ++-----
.../fs/http/client/BaseTestHttpFSWith.java | 227 +++++----
.../org/apache/hadoop/test/TestHdfsHelper.java | 23 +-
.../src/main/native/libhdfs/hdfs.c | 10 +-
.../hadoop-hdfs/src/main/bin/hdfs | 47 +-
.../hadoop-hdfs/src/main/bin/hdfs-config.sh | 28 +-
.../org/apache/hadoop/hdfs/DFSConfigKeys.java | 5 +
.../apache/hadoop/hdfs/InstrumentedLock.java | 185 +++++++
.../server/blockmanagement/BlockManager.java | 4 +-
.../hdfs/server/datanode/BPServiceActor.java | 7 +-
.../hdfs/server/datanode/DiskBalancer.java | 50 +-
.../datanode/fsdataset/impl/FsDatasetImpl.java | 16 +-
.../datanode/fsdataset/impl/FsVolumeList.java | 18 +-
.../diskbalancer/DiskBalancerException.java | 3 +-
.../diskbalancer/command/CancelCommand.java | 23 +-
.../server/diskbalancer/command/Command.java | 20 +-
.../diskbalancer/command/ExecuteCommand.java | 15 +-
.../diskbalancer/command/HelpCommand.java | 22 +-
.../diskbalancer/command/PlanCommand.java | 63 +--
.../diskbalancer/command/QueryCommand.java | 19 +-
.../diskbalancer/command/ReportCommand.java | 133 ++---
.../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 | 34 +-
.../src/site/markdown/ArchivalStorage.md | 2 +-
.../src/site/markdown/HDFSCommands.md | 4 +
.../src/site/markdown/HDFSDiskbalancer.md | 4 +-
.../markdown/HDFSHighAvailabilityWithNFS.md | 4 +-
.../src/site/markdown/HdfsImageViewer.md | 13 +-
.../src/site/markdown/HdfsMultihoming.md | 4 +-
.../src/site/markdown/HdfsNfsGateway.md | 4 +-
.../hadoop-hdfs/src/site/markdown/ViewFs.md | 2 +-
.../hadoop/hdfs/TestDFSStripedInputStream.java | 121 ++++-
.../hadoop/hdfs/TestInstrumentedLock.java | 166 +++++++
.../TestClientProtocolWithDelegationToken.java | 119 +++++
.../fsdataset/impl/TestFsDatasetImpl.java | 78 +--
.../server/diskbalancer/TestDiskBalancer.java | 492 ++++++++++++-------
.../TestDiskBalancerWithMockMover.java | 17 +-
.../command/TestDiskBalancerCommand.java | 65 ++-
.../namenode/TestAddStripedBlockInFBR.java | 109 ++++
.../TestOfflineImageViewer.java | 24 +-
.../hadoop/hdfs/util/TestStripedBlockUtil.java | 22 +-
.../src/test/resources/testAclCLI.xml | 34 +-
hadoop-mapreduce-project/bin/mapred | 25 +-
hadoop-mapreduce-project/bin/mapred-config.sh | 10 +-
hadoop-mapreduce-project/conf/mapred-env.sh | 4 +-
.../java/org/apache/hadoop/mapred/MapTask.java | 40 +-
.../apache/hadoop/mapreduce/CryptoUtils.java | 56 ++-
.../mapreduce/v2/hs/server/HSAdminServer.java | 3 +
hadoop-project/pom.xml | 7 +
.../main/shellprofile.d/hadoop-archive-logs.sh | 2 -
hadoop-tools/hadoop-aws/pom.xml | 4 +
.../src/site/markdown/tools/hadoop-aws/index.md | 101 +++-
.../java/org/apache/hadoop/tools/DistCp.java | 4 +
.../org/apache/hadoop/tools/DistCpOptions.java | 8 +-
.../src/main/shellprofile.d/hadoop-distcp.sh | 4 -
.../apache/hadoop/tools/TestOptionsParser.java | 64 ++-
.../src/main/shellprofile.d/hadoop-extras.sh | 2 -
.../src/main/shellprofile.d/hadoop-rumen.sh | 4 -
.../hadoop-sls/src/main/bin/rumen2sls.sh | 3 +-
hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh | 3 +-
.../src/main/shellprofile.d/hadoop-streaming.sh | 4 -
hadoop-yarn-project/hadoop-yarn/bin/yarn | 53 +-
.../scheduler/fair/FairScheduler.java | 5 -
.../scheduler/fair/NewAppWeightBooster.java | 60 ---
.../scheduler/fair/WeightAdjuster.java | 36 --
119 files changed, 4521 insertions(+), 2189 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/60f66a93/hadoop-project/pom.xml
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org