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 aw...@apache.org on 2015/07/13 19:13:54 UTC
[9/9] hadoop git commit: Merge branch 'trunk' into HADOOP-12111
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/4bc87cd2
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4bc87cd2
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4bc87cd2
Branch: refs/heads/HADOOP-12111
Commit: 4bc87cd2dbf5b9a850d79a51891dc061e1201bf9
Parents: f22ec7e 19295b3
Author: Allen Wittenauer <aw...@apache.org>
Authored: Mon Jul 13 10:13:21 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Mon Jul 13 10:13:21 2015 -0700
----------------------------------------------------------------------
.../src/site/markdown/DeprecatedProperties.md | 1 +
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +
.../hdfs/server/namenode/FSDirConcatOp.java | 2 +-
.../hadoop/hdfs/server/namenode/INodeFile.java | 33 +-
.../hdfs/server/namenode/TestINodeFile.java | 9 +
hadoop-mapreduce-project/CHANGES.txt | 4 +
.../dev-support/findbugs-exclude.xml | 1 +
.../mapreduce/v2/app/job/impl/JobImpl.java | 4 +-
.../v2/app/job/impl/TaskAttemptImpl.java | 4 +-
.../mapreduce/v2/app/job/impl/TaskImpl.java | 4 +-
hadoop-yarn-project/CHANGES.txt | 18 +
.../yarn/server/api/ContainerContext.java | 19 +
.../api/ContainerInitializationContext.java | 7 +
.../server/api/ContainerTerminationContext.java | 7 +
.../hadoop/yarn/server/api/ContainerType.java | 34 ++
.../src/main/proto/yarn_protos.proto | 5 +
.../api/async/impl/NMClientAsyncImpl.java | 4 +-
.../yarn/api/records/impl/pb/ProtoUtils.java | 12 +
.../yarn/security/ContainerTokenIdentifier.java | 43 +-
.../state/InvalidStateTransitionException.java | 51 ++
.../state/InvalidStateTransitonException.java | 21 +-
.../apache/hadoop/yarn/state/StateMachine.java | 2 +-
.../hadoop/yarn/state/StateMachineFactory.java | 10 +-
.../yarn/util/ResourceCalculatorPlugin.java | 9 +-
.../main/proto/server/yarn_security_token.proto | 1 +
.../src/main/resources/yarn-default.xml | 466 ++++++++++++++++++-
.../yarn/conf/TestYarnConfigurationFields.java | 44 +-
.../yarn/security/TestYARNTokenIdentifier.java | 53 +++
.../containermanager/AuxServices.java | 6 +-
.../application/ApplicationImpl.java | 4 +-
.../container/ContainerImpl.java | 4 +-
.../localizer/LocalizedResource.java | 4 +-
.../ProportionalCapacityPreemptionPolicy.java | 4 +-
.../resourcemanager/recovery/RMStateStore.java | 4 +-
.../server/resourcemanager/rmapp/RMAppImpl.java | 4 +-
.../rmapp/attempt/RMAppAttemptImpl.java | 4 +-
.../rmcontainer/RMContainerImpl.java | 4 +-
.../resourcemanager/rmnode/RMNodeImpl.java | 4 +-
.../scheduler/SchedulerApplicationAttempt.java | 17 +-
.../scheduler/capacity/LeafQueue.java | 3 +-
.../scheduler/capacity/ParentQueue.java | 2 +-
.../security/RMContainerTokenSecretManager.java | 13 +-
.../server/resourcemanager/Application.java | 12 +
...estProportionalCapacityPreemptionPolicy.java | 253 +++++++---
...pacityPreemptionPolicyForNodePartitions.java | 114 ++++-
.../capacity/TestContainerAllocation.java | 5 +-
.../scheduler/capacity/TestQueueParsing.java | 38 ++
.../scheduler/fair/FairSchedulerTestBase.java | 31 +-
.../scheduler/fifo/TestFifoScheduler.java | 4 +
49 files changed, 1211 insertions(+), 194 deletions(-)
----------------------------------------------------------------------