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 ar...@apache.org on 2014/10/01 18:06:14 UTC
[23/50] [abbrv] git commit: Merge branch 'trunk' into HDFS-6581
Merge branch 'trunk' into HDFS-6581
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/889122bd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/889122bd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/889122bd
Branch: refs/heads/trunk
Commit: 889122bd5580b6a83d35ef945db7ec001b7b550a
Parents: 8c9860f 7b8df93
Author: arp <ar...@apache.org>
Authored: Mon Sep 22 18:00:58 2014 -0700
Committer: arp <ar...@apache.org>
Committed: Mon Sep 22 18:00:58 2014 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 4 +
.../apache/hadoop/fs/FileEncryptionInfo.java | 12 +-
.../org/apache/hadoop/net/NetworkTopology.java | 30 +-
.../apache/hadoop/net/TestClusterTopology.java | 122 +++++++++
.../hadoop/crypto/key/kms/server/MiniKMS.java | 1 -
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 21 ++
.../java/org/apache/hadoop/hdfs/DFSClient.java | 3 +-
.../hadoop/hdfs/protocol/EncryptionZone.java | 35 ++-
.../apache/hadoop/hdfs/protocolPB/PBHelper.java | 48 +++-
.../hdfs/server/datanode/DataStorage.java | 7 +
.../server/namenode/EncryptionZoneManager.java | 51 ++--
.../hdfs/server/namenode/FSDirectory.java | 152 ++++++++---
.../hdfs/server/namenode/FSEditLogLoader.java | 8 +-
.../hdfs/server/namenode/FSNamesystem.java | 28 +-
.../hdfs/server/namenode/INodesInPath.java | 3 +-
.../ha/AbstractNNFailoverProxyProvider.java | 6 +-
.../hadoop-hdfs/src/main/proto/encryption.proto | 7 +-
.../hadoop-hdfs/src/main/proto/hdfs.proto | 22 +-
.../apache/hadoop/hdfs/TestEncryptionZones.java | 10 +-
.../datanode/TestDataNodeHotSwapVolumes.java | 64 ++++-
.../hdfs/server/datanode/TestDataStorage.java | 1 +
.../datanode/TestFsDatasetCacheRevocation.java | 5 +
.../org/apache/hadoop/tracing/TestTracing.java | 14 +-
.../TestTracingShortCircuitLocalRead.java | 4 +
hadoop-mapreduce-project/CHANGES.txt | 7 +
.../org/apache/hadoop/mapred/YarnChild.java | 63 +----
.../hadoop/mapreduce/v2/app/MRAppMaster.java | 1 +
.../mapreduce/v2/app/rm/RMCommunicator.java | 12 +-
.../v2/app/rm/RMContainerAllocator.java | 272 +++++++++++--------
.../v2/app/rm/ResourceCalculatorUtils.java | 52 ++++
.../v2/app/rm/TestRMContainerAllocator.java | 82 ++++--
.../apache/hadoop/mapreduce/v2/util/MRApps.java | 61 ++++-
.../apache/hadoop/mapreduce/v2/TestUberAM.java | 7 -
hadoop-yarn-project/CHANGES.txt | 15 +
.../hadoop/yarn/util/resource/Resources.java | 4 +-
.../protocolrecords/NodeHeartbeatResponse.java | 5 +
.../impl/pb/NodeHeartbeatResponsePBImpl.java | 67 +++++
.../yarn_server_common_service_protos.proto | 1 +
.../yarn/server/nodemanager/NodeManager.java | 2 +-
.../nodemanager/NodeStatusUpdaterImpl.java | 80 +++---
.../nodemanager/TestNodeManagerResync.java | 24 +-
.../nodemanager/TestNodeStatusUpdater.java | 234 +++++++++++-----
.../resourcemanager/ResourceTrackerService.java | 7 +-
.../server/resourcemanager/rmapp/RMAppImpl.java | 12 +-
.../rmapp/attempt/RMAppAttempt.java | 23 +-
.../rmapp/attempt/RMAppAttemptImpl.java | 133 +++++++--
.../RMAppAttemptContainerFinishedEvent.java | 8 +-
.../rmcontainer/RMContainerImpl.java | 13 +-
.../resourcemanager/rmnode/RMNodeEventType.java | 3 +
...RMNodeFinishedContainersPulledByAMEvent.java | 41 +++
.../resourcemanager/rmnode/RMNodeImpl.java | 48 +++-
.../scheduler/fair/AllocationConfiguration.java | 2 +-
.../fair/AllocationFileLoaderService.java | 2 +-
.../fair/FairSchedulerConfiguration.java | 2 +-
.../webapp/FairSchedulerPage.java | 6 +-
.../TestResourceTrackerService.java | 8 +-
.../ahs/TestRMApplicationHistoryWriter.java | 24 +-
.../applicationsmanager/TestAMRestart.java | 24 +-
...estProportionalCapacityPreemptionPolicy.java | 12 +-
.../attempt/TestRMAppAttemptTransitions.java | 143 ++++++++--
.../scheduler/fair/TestFairScheduler.java | 30 +-
.../security/TestAMRMTokens.java | 2 +-
.../src/site/apt/FairScheduler.apt.vm | 4 +-
63 files changed, 1648 insertions(+), 546 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/889122bd/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/889122bd/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/889122bd/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/889122bd/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLogLoader.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/889122bd/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/889122bd/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/hdfs.proto
----------------------------------------------------------------------