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 zj...@apache.org on 2015/03/06 00:04:33 UTC
[26/27] hadoop git commit: Merge remote-tracking branch
'apache/trunk' into YARN-2928
Merge remote-tracking branch 'apache/trunk' into YARN-2928
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/848acd5f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/848acd5f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/848acd5f
Branch: refs/heads/YARN-2928
Commit: 848acd5f0642b6479ca86dd1042d56cf96a43627
Parents: d3ff7f0 952640f
Author: Zhijie Shen <zj...@apache.org>
Authored: Thu Mar 5 14:42:08 2015 -0800
Committer: Zhijie Shen <zj...@apache.org>
Committed: Thu Mar 5 14:42:08 2015 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 14 +-
.../apache/hadoop/crypto/CryptoInputStream.java | 2 +-
.../hadoop/crypto/CryptoOutputStream.java | 2 +-
.../hadoop/net/unix/DomainSocketWatcher.java | 8 +-
.../src/main/resources/core-default.xml | 20 +-
.../apache/hadoop/ha/ClientBaseWithFixes.java | 11 +-
.../net/unix/TestDomainSocketWatcher.java | 2 +-
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 27 ++
.../hadoop-hdfs/src/CMakeLists.txt | 23 +-
.../java/org/apache/hadoop/hdfs/DFSClient.java | 3 +
.../org/apache/hadoop/hdfs/DFSOutputStream.java | 238 ++-------
.../java/org/apache/hadoop/hdfs/DFSPacket.java | 270 +++++++++++
.../apache/hadoop/hdfs/RemoteBlockReader.java | 4 +-
.../apache/hadoop/hdfs/protocol/DatanodeID.java | 48 +-
.../hdfs/server/datanode/DataStorage.java | 3 +-
.../hdfs/server/datanode/DirectoryScanner.java | 2 +-
.../server/datanode/ShortCircuitRegistry.java | 2 +-
.../datanode/fsdataset/impl/FsVolumeImpl.java | 3 +-
.../hdfs/server/namenode/FSNamesystem.java | 6 +-
.../hdfs/server/namenode/NameNodeRpcServer.java | 3 +-
.../hdfs/server/namenode/NamenodeFsck.java | 2 +-
.../server/protocol/DatanodeRegistration.java | 10 +
.../hdfs/shortcircuit/DfsClientShmManager.java | 3 +-
.../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 2 +-
.../org/apache/hadoop/hdfs/web/JsonUtil.java | 217 ++++-----
.../hadoop/hdfs/web/WebHdfsFileSystem.java | 21 +-
.../hadoop-hdfs/src/main/native/libhdfs/hdfs.h | 92 +++-
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 4 +-
.../hadoop/hdfs/TestAppendSnapshotTruncate.java | 478 +++++++++++++++++++
.../apache/hadoop/hdfs/TestCrcCorruption.java | 3 +-
.../org/apache/hadoop/hdfs/TestDFSPacket.java | 68 +++
.../apache/hadoop/hdfs/TestFileCorruption.java | 2 +-
.../org/apache/hadoop/hdfs/TestReplication.java | 3 +-
.../apache/hadoop/hdfs/TestRollingUpgrade.java | 4 +-
.../blockmanagement/TestBlockManager.java | 7 -
.../TestComputeInvalidateWork.java | 16 +-
.../datanode/TestDataNodeVolumeFailure.java | 2 +-
.../TestDatanodeProtocolRetryPolicy.java | 3 +-
.../snapshot/TestSnapshotFileLength.java | 25 +-
.../apache/hadoop/hdfs/web/TestJsonUtil.java | 22 +-
hadoop-mapreduce-project/CHANGES.txt | 9 +
.../hadoop/mapreduce/v2/app/MRAppMaster.java | 4 -
.../java/org/apache/hadoop/mapreduce/Job.java | 1 +
.../hadoop/mapreduce/JobResourceUploader.java | 363 ++++++++++++++
.../apache/hadoop/mapreduce/JobSubmitter.java | 312 +-----------
.../org/apache/hadoop/fs/s3a/Constants.java | 8 +
.../hadoop/fs/s3a/S3AFastOutputStream.java | 413 ++++++++++++++++
.../org/apache/hadoop/fs/s3a/S3AFileSystem.java | 24 +-
.../src/site/markdown/tools/hadoop-aws/index.md | 46 +-
.../hadoop/fs/s3a/TestS3AFastOutputStream.java | 74 +++
.../org/apache/hadoop/tools/CopyListing.java | 4 +-
.../java/org/apache/hadoop/tools/DiffInfo.java | 90 ++++
.../java/org/apache/hadoop/tools/DistCp.java | 63 ++-
.../apache/hadoop/tools/DistCpConstants.java | 3 +
.../apache/hadoop/tools/DistCpOptionSwitch.java | 12 +-
.../org/apache/hadoop/tools/DistCpOptions.java | 34 ++
.../org/apache/hadoop/tools/DistCpSync.java | 192 ++++++++
.../org/apache/hadoop/tools/OptionsParser.java | 24 +-
.../hadoop/tools/mapred/CopyCommitter.java | 3 +-
.../org/apache/hadoop/tools/TestDistCpSync.java | 349 ++++++++++++++
.../apache/hadoop/tools/TestOptionsParser.java | 75 ++-
hadoop-yarn-project/CHANGES.txt | 25 +-
hadoop-yarn-project/hadoop-yarn/bin/yarn | 6 +
hadoop-yarn-project/hadoop-yarn/bin/yarn.cmd | 6 +
.../dev-support/findbugs-exclude.xml | 7 +
.../hadoop/yarn/conf/YarnConfiguration.java | 6 +
.../yarn/client/api/impl/YarnClientImpl.java | 19 +-
.../hadoop/yarn/client/cli/ClusterCLI.java | 157 ++++++
.../hadoop/yarn/client/ProtocolHATestBase.java | 2 +-
.../yarn/client/api/impl/TestYarnClient.java | 55 ++-
.../hadoop/yarn/client/cli/TestClusterCLI.java | 158 ++++++
.../apache/hadoop/yarn/util/CpuTimeTracker.java | 99 ++++
.../util/LinuxResourceCalculatorPlugin.java | 46 +-
.../yarn/util/ProcfsBasedProcessTree.java | 77 ++-
.../util/ResourceCalculatorProcessTree.java | 12 +-
.../yarn/util/WindowsBasedProcessTree.java | 7 +-
.../util/TestLinuxResourceCalculatorPlugin.java | 4 +-
.../yarn/util/TestProcfsBasedProcessTree.java | 38 +-
.../util/TestResourceCalculatorProcessTree.java | 5 +
.../monitor/ContainerMetrics.java | 39 +-
.../monitor/ContainersMonitorImpl.java | 18 +
.../util/NodeManagerHardwareUtils.java | 16 +-
.../recovery/ZKRMStateStore.java | 53 +-
.../rmapp/attempt/RMAppAttemptMetrics.java | 21 +-
.../resourcemanager/rmnode/RMNodeImpl.java | 34 +-
.../resourcemanager/scheduler/NodeType.java | 9 +-
.../scheduler/SchedulerApplicationAttempt.java | 15 +-
.../scheduler/capacity/LeafQueue.java | 95 ++--
.../scheduler/fair/FairScheduler.java | 1 +
.../scheduler/fair/MaxRunningAppsEnforcer.java | 40 +-
.../server/resourcemanager/webapp/AppBlock.java | 80 +++-
.../yarn/server/resourcemanager/MockNM.java | 6 +-
.../TestResourceTrackerService.java | 17 +-
.../TestZKRMStateStoreZKClientConnections.java | 33 +-
.../scheduler/capacity/TestReservations.java | 8 +-
.../scheduler/fair/TestFairScheduler.java | 310 +++++++++++-
96 files changed, 4370 insertions(+), 932 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/848acd5f/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------