hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [29/29] hadoop git commit: Merge branch 'trunk' into HADOOP-12111
Date Sat, 25 Jul 2015 17:36:36 GMT
Merge branch 'trunk' into HADOOP-12111


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8d6dbbb2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8d6dbbb2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8d6dbbb2

Branch: refs/heads/HADOOP-12111
Commit: 8d6dbbb28a5f0c5c783c1f27a36ac080e290e211
Parents: 1e4f361 156f24e
Author: Allen Wittenauer <aw@apache.org>
Authored: Sat Jul 25 10:35:51 2015 -0700
Committer: Allen Wittenauer <aw@apache.org>
Committed: Sat Jul 25 10:35:51 2015 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt |  16 +
 .../hadoop-common/src/JNIFlags.cmake            | 124 ---
 .../apache/hadoop/fs/AbstractFileSystem.java    |  13 +
 .../java/org/apache/hadoop/fs/FileContext.java  |  20 +
 .../java/org/apache/hadoop/fs/FileSystem.java   |  30 +-
 .../org/apache/hadoop/fs/FilterFileSystem.java  |   6 +
 .../java/org/apache/hadoop/fs/FilterFs.java     |   6 +
 .../org/apache/hadoop/fs/viewfs/ChRootedFs.java |   6 +
 .../org/apache/hadoop/fs/viewfs/ViewFs.java     |  15 +
 .../org/apache/hadoop/ipc/CallQueueManager.java |  27 +-
 .../hadoop-common/src/site/markdown/Metrics.md  |   1 +
 .../src/site/markdown/filesystem/filesystem.md  |   4 +
 .../hadoop/fs/FileSystemContractBaseTest.java   |  11 +-
 .../org/apache/hadoop/fs/TestHarFileSystem.java |   3 +
 .../apache/hadoop/ipc/TestCallQueueManager.java |   6 +-
 .../org/apache/hadoop/net/ServerSocketUtil.java |  63 ++
 .../org/apache/hadoop/hdfs/inotify/Event.java   |  95 +++
 .../hadoop/hdfs/protocol/ClientProtocol.java    | 306 ++++---
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |  12 +
 .../main/java/org/apache/hadoop/fs/Hdfs.java    |   5 +
 .../java/org/apache/hadoop/hdfs/DFSClient.java  |  18 +
 .../hadoop/hdfs/DistributedFileSystem.java      |  19 +
 .../server/blockmanagement/BlockManager.java    |   4 +
 .../blockmanagement/UnderReplicatedBlocks.java  |  36 +-
 .../hdfs/server/namenode/FSNamesystem.java      |   9 +-
 .../hadoop/hdfs/TestBlockStoragePolicy.java     |  17 +
 .../hdfs/TestDFSInotifyEventInputStream.java    |  26 +
 .../TestUnderReplicatedBlocks.java              |  48 ++
 hadoop-yarn-project/CHANGES.txt                 |  31 +
 .../hadoop-yarn/hadoop-yarn-common/pom.xml      |   2 +-
 .../yarn/webapp/view/TwoColumnLayout.java       |   2 +-
 .../main/proto/server/yarn_security_token.proto |  70 --
 .../src/main/proto/yarn_security_token.proto    |  70 ++
 .../pom.xml                                     |   2 +-
 .../nodemanager/LocalDirsHandlerService.java    |  35 +-
 .../webapp/TestContainerLogsPage.java           |  48 ++
 .../hadoop-yarn-server-resourcemanager/pom.xml  |   2 +-
 .../server/resourcemanager/RMContextImpl.java   |   3 +-
 .../ProportionalCapacityPreemptionPolicy.java   |   9 +-
 .../reservation/AbstractReservationSystem.java  |   2 +
 .../reservation/GreedyReservationAgent.java     | 390 ---------
 .../reservation/InMemoryPlan.java               |  13 +-
 .../InMemoryReservationAllocation.java          |   8 +-
 .../resourcemanager/reservation/Plan.java       |   1 +
 .../reservation/PlanContext.java                |   2 +
 .../resourcemanager/reservation/PlanView.java   |  31 +-
 .../resourcemanager/reservation/Planner.java    |  47 --
 .../RLESparseResourceAllocation.java            |  55 +-
 .../reservation/ReservationAgent.java           |  72 --
 .../ReservationSchedulerConfiguration.java      |   6 +-
 .../reservation/ReservationSystem.java          |   5 +-
 .../reservation/ReservationSystemUtil.java      |   6 +-
 .../reservation/SimpleCapacityReplanner.java    | 113 ---
 .../planning/AlignedPlannerWithGreedy.java      | 123 +++
 .../planning/GreedyReservationAgent.java        |  97 +++
 .../reservation/planning/IterativePlanner.java  | 338 ++++++++
 .../reservation/planning/Planner.java           |  49 ++
 .../reservation/planning/PlanningAlgorithm.java | 207 +++++
 .../reservation/planning/ReservationAgent.java  |  73 ++
 .../planning/SimpleCapacityReplanner.java       | 118 +++
 .../reservation/planning/StageAllocator.java    |  55 ++
 .../planning/StageAllocatorGreedy.java          | 152 ++++
 .../planning/StageAllocatorLowCostAligned.java  | 360 ++++++++
 .../planning/StageEarliestStart.java            |  46 +
 .../planning/StageEarliestStartByDemand.java    | 106 +++
 .../StageEarliestStartByJobArrival.java         |  39 +
 .../planning/TryManyReservationAgents.java      | 114 +++
 .../scheduler/ResourceLimits.java               |  19 +-
 .../scheduler/capacity/AbstractCSQueue.java     |  27 +-
 .../scheduler/capacity/CSAssignment.java        |  12 +-
 .../capacity/CapacityHeadroomProvider.java      |  16 +-
 .../scheduler/capacity/CapacityScheduler.java   |  16 +-
 .../scheduler/capacity/LeafQueue.java           | 833 +++----------------
 .../scheduler/capacity/ParentQueue.java         |  16 +-
 .../scheduler/capacity/ReservationQueue.java    |   4 -
 .../scheduler/common/fica/FiCaSchedulerApp.java | 721 +++++++++++++++-
 .../webapp/CapacitySchedulerPage.java           |   7 +-
 .../webapp/DefaultSchedulerPage.java            |   4 +-
 .../webapp/FairSchedulerPage.java               |  10 +-
 .../webapp/dao/FairSchedulerQueueInfo.java      |   4 +-
 ...estProportionalCapacityPreemptionPolicy.java |   6 +-
 .../resourcemanager/recovery/TestProtos.java    |  36 +
 .../reservation/ReservationSystemTestUtil.java  |   5 +-
 .../reservation/TestCapacityOverTimePolicy.java |   2 +-
 .../TestCapacitySchedulerPlanFollower.java      |   1 +
 .../reservation/TestFairReservationSystem.java  |   1 -
 .../TestFairSchedulerPlanFollower.java          |   1 +
 .../reservation/TestGreedyReservationAgent.java | 604 --------------
 .../reservation/TestInMemoryPlan.java           |   2 +
 .../reservation/TestNoOverCommitPolicy.java     |   1 +
 .../TestRLESparseResourceAllocation.java        |  51 +-
 .../TestSchedulerPlanFollowerBase.java          |   1 +
 .../TestSimpleCapacityReplanner.java            | 162 ----
 .../planning/TestAlignedPlanner.java            | 820 ++++++++++++++++++
 .../planning/TestGreedyReservationAgent.java    | 611 ++++++++++++++
 .../planning/TestSimpleCapacityReplanner.java   | 170 ++++
 .../capacity/TestApplicationLimits.java         |  15 +-
 .../capacity/TestCapacityScheduler.java         |   3 +-
 .../capacity/TestContainerAllocation.java       |  85 +-
 .../scheduler/capacity/TestLeafQueue.java       | 191 +----
 .../capacity/TestReservationQueue.java          |  26 +-
 .../scheduler/capacity/TestReservations.java    | 111 +--
 .../scheduler/capacity/TestUtils.java           |  25 +-
 .../webapp/dao/TestFairSchedulerQueueInfo.java  |  59 ++
 .../yarn/server/webproxy/AppReportFetcher.java  |  79 +-
 .../server/webproxy/TestAppReportFetcher.java   | 117 +++
 106 files changed, 5853 insertions(+), 2869 deletions(-)
----------------------------------------------------------------------



Mime
View raw message