4af31993a2
HDFS-5139. Merge r1525665 from trunk to branch-2
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525667 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 18:19:48 +00:00
8f354d141e
HDFS-5139. Merge r1525659 from trunk to branch-2
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525661 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 18:03:27 +00:00
8338e33f57
HADOOP-9977. Merging change r1525657 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525658 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 17:52:58 +00:00
fa0ecb7567
merge -c 1525626 FIXES: HDFS-5240. Separate formatting from logging in the audit logger API (daryn)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525627 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 15:34:05 +00:00
15f857c59c
merge -c 1525624 FIXES: HDFS-5239. Allow FSNamesystem lock fairness to be configurable (daryn)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525625 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 15:29:40 +00:00
9e56f8c7ab
Fix credit for YARN-1188
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525519 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 07:11:24 +00:00
6c760083ff
YARN-1188. The context of QueueMetrics becomes default when using FairScheduler (Akira Ajisaka via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525517 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 07:06:50 +00:00
e9f2112b00
YARN-1128. FifoPolicy.computeShares throws NPE on empty list of Schedulables (Karthik Kambatla via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525315 13f79535-47bb-0310-9956-ffa450edef68
2013-09-22 01:55:17 +00:00
c084582988
HDFS-5231. Merge change r1525133 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525134 13f79535-47bb-0310-9956-ffa450edef68
2013-09-20 20:35:45 +00:00
b7f0156ad8
HDFS-5234. Merging change r1525104 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525109 13f79535-47bb-0310-9956-ffa450edef68
2013-09-20 19:11:33 +00:00
d71bb8385b
YARN-1203. Changed YARN web-app proxy to handle http and https URLs from AM registration and finish correctly. Contributed by Omkar Vinit Joshi.
...
MAPREDUCE-5515. Fixed MR AM's webapp to depend on a new config mapreduce.ssl.enabled to enable https and disabling it by default as MR AM needs
to set up its own certificates etc and not depend on clusters'. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1524864 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524867 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 23:51:14 +00:00
d8ed9ef4b8
MAPREDUCE-5488. Changed MR client to keep trying to reach the application when it sees that on attempt's AM is down. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1524856 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524857 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 22:36:58 +00:00
11d0fe9722
MAPREDUCE-5504. mapred queue -info inconsistent with types (Kousuke Saruta via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524843 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 21:00:40 +00:00
2f97dced61
Merge 1524829 from trunk to branch-2 for YARN-353. Add Zookeeper-based store implementation for RMStateStore. Contributed by Bikas Saha, Jian He and Karthik Kambatla.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524831 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 20:40:52 +00:00
2cc9ef7450
HADOOP-9974: document setting mvn heap size
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524653 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 08:22:38 +00:00
fe3e796ed5
HADOOP-9791. Merging change r1524631 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524633 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 06:59:41 +00:00
7ce1a859a8
HADOOP-9929. Insufficient permission for a path reported as file not found. (Contributed by Colin Patrick McCabe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524610 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 02:03:42 +00:00
27cc6911ea
Merge change r1524581 from trunk: move HDFS-5122 from Release 2.1.1-beta to Release 2.3.0 in CHANGES.txt
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524583 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 21:34:42 +00:00
3babe7c124
HDFS-5122. Merge change r1524562 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524566 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 20:59:36 +00:00
57f5be4885
HDFS-5031. Merge change r1524553 from trunk to branch-2
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524556 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 20:21:48 +00:00
23d5e348c8
HDFS-5219. Merge change r1524498 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524499 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 17:32:20 +00:00
f0e79b8157
MAPREDUCE-5487. In task processes, JobConf is unnecessarily loaded again in Limits (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524417 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 13:58:37 +00:00
8855a3e0ee
HDFS-5212. Merge change r1524298 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524302 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 06:26:57 +00:00
0ce8f0b3c2
HDFS-5199. Merge change r1523140 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524300 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 06:19:36 +00:00
3a7e3e0881
HADOOP-9669. Merging change r1524259 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524260 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 00:15:12 +00:00
5741f754d7
moved location of HADOOP-9350 change as now in branch-2.1.1
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524007 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 12:30:47 +00:00
8ae2d66005
Added ASL2 header to releasenotes.html.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523904 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 05:43:57 +00:00
3836473c73
Preparing for hadoop-2.1.1-beta release.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523892 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 05:23:39 +00:00
1d6a45a02c
Merge -c 1523885 from trunk to branch-2 to fix HADOOP-9944. Fix RpcRequestHeaderProto.callId to be sint32 rather than uint32 since ipc.Client.CONNECTION_CONTEXT_CALL_ID is signed (i.e. -3). Contributed by Arun C. Murthy.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523886 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 04:54:04 +00:00
d03b60c61a
svn merge -c 1523875 from trunk for HDFS-5207. In BlockPlacementPolicy.chooseTarget(..), change the writer and the excludedNodes parameter types respectively to Node and Set.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523877 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 02:51:45 +00:00
629cd3b57e
YARN-1184. ClassCastException during preemption enforcement.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523864 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 01:31:18 +00:00
3828687def
YARN-1001. Added a web-service to get statistics about per application-type per state for consumption by downstream projects. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1523855 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523856 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 00:24:51 +00:00
b52ae58928
HADOOP-9935. Revert from branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523835 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 23:12:01 +00:00
db17c6ac06
Merge r1523750 from trunk to branch-2 for YARN-1027. Implement RMHAProtocolService (Karthik Kambatla via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523753 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 18:40:28 +00:00
73c69decf1
Merge -c 1523660 from trunk to branch-2 to fix MAPREDUCE-5493. Cleanup in-memory & on-disk segments to prevent leak on shuffle completion. Contributed by Jason Lowe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523661 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 14:19:33 +00:00
c061a0da55
Merge -c 1523652 from trunk to branch-2 to fix YARN-1170. YARN & MapReduce proto definitions fixed to specify protobuf package as hadoop.yarn and hadoop.mapreduce respectively. Contributed by Binglin Chang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523653 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 14:06:27 +00:00
7993c89ea8
MAPREDUCE-5379. Include token tracking ids in jobconf. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523607 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 12:20:30 +00:00
3638f42a50
HADOOP-9962. in order to avoid dependency divergence within Hadoop itself lets enable DependencyConvergence. (rvs via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523600 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 11:41:00 +00:00
89df2ae5c9
HADOOP-9961. versions of a few transitive dependencies diverged between hadoop subprojects. (rvs via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523597 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 11:31:17 +00:00
460fd2053b
YARN-1137. Add support whitelist for system users to Yarn container-executor.c. (rvs via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523589 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 11:02:13 +00:00
c2a1353c29
HADOOP-9935. Merging change r1523403 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523404 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 04:40:54 +00:00
9c98bb8175
svn merge -c 1523400 from trunk for HDFS-5188. In BlockPlacementPolicy, reduce the number of chooseTarget(..) methods; replace HashMap with Map in parameter declarations and cleanup some related code.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523401 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 04:25:50 +00:00
c5ef30971e
Merge r1523376 from trunk to branch-2 for YARN-540. Race condition causing RM to potentially relaunch already unregistered AMs on RM restart (Jian He via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523377 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 01:07:11 +00:00
7bf877f4ea
HADOOP-9557. Merging change r1523185 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523186 13f79535-47bb-0310-9956-ffa450edef68
2013-09-14 05:27:46 +00:00
d5b84644f0
svn merge -c 1523158 FIXES: YARN-1189. NMTokenSecretManagerInNM is not being told when applications have finished. Contributed by Omkar Vinit Joshi
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523159 13f79535-47bb-0310-9956-ffa450edef68
2013-09-14 00:23:20 +00:00
6a193d7f8e
HADOOP-9960. Upgrade Jersey version to 1.9. Contributed by Karthik Kambatla.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523156 13f79535-47bb-0310-9956-ffa450edef68
2013-09-14 00:15:07 +00:00
27c1c0079e
HADOOP-9945. HAServiceState should have a state for stopped services. Contributed by Karthik Kambatla.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523150 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 23:58:45 +00:00
87d09e5ebe
Merge r1523146 from trunk to branch-2 YARN-1116. Populate AMRMTokens back to AMRMTokenSecretManager after RM restarts (Jian He via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523149 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 23:57:56 +00:00
988d4c123e
HDFS-4096. Merge change r1523091 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523092 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 20:44:58 +00:00
039c10e0d9
svn merge -c 1522968 FIXES: YARN-1194. TestContainerLogsPage fails with native builds. Contributed by Roman Shaposhnik
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522971 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 15:20:38 +00:00
Arpit Agarwal
Chris Nauroth
Daryn Sharp
Sanford Ryza
Jing Zhao
Brandon Li
Vinod Kumar Vavilapalli
Thomas Graves
Hitesh Shah
Steve Loughran
Ivan Mitic
Colin McCabe
Arun Murthy
Tsz-wo Sze
Christopher Douglas
Bikas Saha
Alejandro Abdelnur
Jason Darrell Lowe
Aaron Myers