hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [24/24] hadoop git commit: Merge remote-tracking branch 'apache-commit/trunk' into HDFS-7240
Date Tue, 07 Jul 2015 16:04:31 GMT
Merge remote-tracking branch 'apache-commit/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/83f39a32
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/83f39a32
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/83f39a32

Branch: refs/heads/HDFS-7240
Commit: 83f39a32c00dc10c3960ceba58210e001b41576d
Parents: 93cebb2 e0febce
Author: Arpit Agarwal <arp@apache.org>
Authored: Tue Jul 7 09:00:10 2015 -0700
Committer: Arpit Agarwal <arp@apache.org>
Committed: Tue Jul 7 09:00:10 2015 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt |  19 +-
 .../org/apache/hadoop/conf/Configuration.java   |   8 +-
 .../apache/hadoop/fs/RawLocalFileSystem.java    |  36 +--
 .../java/org/apache/hadoop/fs/shell/Mkdir.java  |   3 +-
 .../apache/hadoop/ha/ActiveStandbyElector.java  |  20 +-
 .../org/apache/hadoop/ipc/RpcClientUtil.java    |  24 ++
 .../main/java/org/apache/hadoop/ipc/Server.java |   4 +-
 .../org/apache/hadoop/net/NetworkTopology.java  |  62 ++---
 .../org/apache/hadoop/util/StringUtils.java     |   8 +
 .../org/apache/hadoop/net/unix/DomainSocket.c   |   9 +-
 .../apache/hadoop/conf/TestConfiguration.java   |  15 ++
 .../org/apache/hadoop/fs/SymlinkBaseTest.java   |  45 +++-
 .../apache/hadoop/fs/TestLocalFileSystem.java   |  26 ++-
 .../apache/hadoop/fs/TestSymlinkLocalFS.java    |  18 ++
 .../hadoop/fs/shell/TestCopyPreserveFlag.java   |  63 ++---
 .../hadoop/ha/TestActiveStandbyElector.java     |  31 +++
 .../apache/hadoop/net/TestClusterTopology.java  |  75 +++++-
 .../org/apache/hadoop/util/TestStringUtils.java |   4 +
 .../apache/hadoop/hdfs/web/JsonUtilClient.java  |  14 ++
 .../hadoop/hdfs/web/WebHdfsFileSystem.java      |   2 +-
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |  17 +-
 .../java/org/apache/hadoop/hdfs/DFSClient.java  |   2 +-
 .../org/apache/hadoop/hdfs/DFSInputStream.java  | 233 +++++++++++++------
 .../hdfs/server/blockmanagement/BlockInfo.java  |   7 +-
 .../blockmanagement/BlockInfoContiguous.java    |   9 +-
 .../BlockInfoUnderConstruction.java             |  22 +-
 .../BlockInfoUnderConstructionContiguous.java   |  13 +-
 .../server/blockmanagement/BlockManager.java    | 143 ++++++------
 .../hdfs/server/blockmanagement/BlocksMap.java  |   4 +-
 .../ContiguousBlockStorageOp.java               |   7 +-
 .../blockmanagement/CorruptReplicasMap.java     |  62 +++--
 .../hdfs/server/namenode/FSDirWriteFileOp.java  |   6 +-
 .../hadoop/hdfs/server/namenode/FSEditLog.java  |  28 ++-
 .../hdfs/server/namenode/FSEditLogLoader.java   |   2 +-
 .../hdfs/server/namenode/NamenodeFsck.java      |  12 +-
 .../apache/hadoop/hdfs/tools/DebugAdmin.java    |  10 +-
 .../org/apache/hadoop/hdfs/DFSTestUtil.java     |   6 +-
 .../hadoop/hdfs/TestDFSClientRetries.java       |   2 +-
 .../blockmanagement/BlockManagerTestUtil.java   |   7 +-
 .../server/blockmanagement/TestBlockInfo.java   |  10 +-
 .../blockmanagement/TestBlockManager.java       |  10 +-
 .../blockmanagement/TestCorruptReplicaInfo.java |  15 +-
 .../hadoop/hdfs/server/mover/TestMover.java     |  19 ++
 .../hdfs/server/namenode/FSXAttrBaseTest.java   |   5 +-
 .../hadoop/hdfs/tools/TestDebugAdmin.java       |   8 +
 .../TestOfflineImageViewerForXAttr.java         |   3 +
 .../org/apache/hadoop/tracing/TestTracing.java  |  18 +-
 hadoop-mapreduce-project/CHANGES.txt            |   5 +-
 .../apache/hadoop/mapred/ShuffleHandler.java    |   3 +-
 .../hadoop/mapred/TestShuffleHandler.java       | 101 ++++++++
 hadoop-yarn-project/CHANGES.txt                 |  20 +-
 .../logaggregation/AggregatedLogFormat.java     |  83 ++++---
 ...TimelineAuthenticationFilterInitializer.java |   5 +-
 .../nodemanager/LinuxContainerExecutor.java     |  12 +-
 .../linux/privileged/PrivilegedOperation.java   |   1 +
 .../privileged/PrivilegedOperationExecutor.java |   2 +-
 .../logaggregation/AppLogAggregatorImpl.java    |   6 +-
 .../util/CgroupsLCEResourcesHandler.java        |   6 +-
 .../container-executor/impl/configuration.c     |   8 +-
 .../test/test-container-executor.c              |   4 +-
 .../TestLinuxContainerExecutorWithMocks.java    |  13 +-
 .../TestLogAggregationService.java              |  36 +++
 .../server/resourcemanager/ResourceManager.java |  34 ---
 .../monitor/SchedulingEditPolicy.java           |   6 +-
 .../monitor/SchedulingMonitor.java              |   3 +-
 .../ProportionalCapacityPreemptionPolicy.java   |  42 ++--
 .../scheduler/ContainerPreemptEvent.java        |   8 +-
 .../scheduler/ContainerPreemptEventType.java    |  26 ---
 .../scheduler/capacity/CapacityScheduler.java   |  24 ++
 .../scheduler/event/SchedulerEventType.java     |   7 +-
 .../scheduler/fair/FSSchedulerNode.java         |  11 +-
 .../resourcemanager/TestRMDispatcher.java       |  79 +++++++
 ...estProportionalCapacityPreemptionPolicy.java |  19 +-
 ...pacityPreemptionPolicyForNodePartitions.java |  12 +-
 74 files changed, 1205 insertions(+), 537 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/83f39a32/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/83f39a32/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/83f39a32/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java
----------------------------------------------------------------------


Mime
View raw message