Commit Graph

4725 Commits

Author SHA1 Message Date
Suresh Srinivas fb1c203622 HADOOP-8958. Merge r1415784 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490147 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 05:22:37 +00:00
Suresh Srinivas 86e07b9f66 HADOOP-8982. Merge 1490124 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490125 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 04:18:13 +00:00
Suresh Srinivas 29cd270f43 HADOOP-9526. Merge 1490120 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490121 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 04:04:33 +00:00
Suresh Srinivas 6067bd1228 HADOOP-9131. Merge r1420366 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490118 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 03:49:04 +00:00
Tsz-wo Sze c2f9f05323 HDFS-4876. Fix the javadoc of FileWithSnapshot and move FileDiffList to FileWithSnapshot.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490117 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 03:35:03 +00:00
Suresh Srinivas a35a2ca335 HADOOP-8957. Merge r1420965 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490115 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 03:29:43 +00:00
Arun Murthy 0cb5e152d4 Merge -c 1485842 from trunk to branch-2 to fix HADOOP-9593 stack trace printed at ERROR for all yarn clients without hadoop.home set. Contributed by Steve Lougran.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490102 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 01:19:52 +00:00
Jing Zhao 5826b0c186 HDFS-4850. Merging change r1490080 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490084 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 23:42:11 +00:00
Luke Lu d77a2579f2 HADOOP-9616. Fix branch-2 javadoc warnings. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489951 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 16:49:04 +00:00
Thomas Graves ee792cf084 Updating release date for 0.23.8
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489902 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 15:01:24 +00:00
Tsz-wo Sze 267d7ca14e svn merge -c -1489709 for reverting HDFS-4876.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489875 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 13:53:12 +00:00
Tsz-wo Sze f974ce444d svn merge -c 1489708 from trunk for HDFS-4876. Fix the javadoc of FileWithSnapshot and move FileDiffList to FileWithSnapshot.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489709 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 05:27:58 +00:00
Aaron Myers 99faae2076 HDFS-4815. TestRBWBlockInvalidation: Double call countReplicas() to fetch corruptReplicas and liveReplicas is not needed. Contributed by Tian Hong Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489670 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 23:18:58 +00:00
Vinod Kumar Vavilapalli 6f8b6699bd YARN-724. Moved ProtoBase from api.records to api.records.impl.pb. Contributed by Jian He.
MAPREDUCE-5303. Changed MR app after moving ProtoBase to package impl.pb via YARN-724. Contributed by Jian He.
svn merge --ignore-ancestry -c 1489658 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489659 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 22:47:05 +00:00
Vinod Kumar Vavilapalli 328822b944 YARN-753. Added individual factory methods for all api protocol records and converted the records to be abstract classes. Contributed by Jian He.
svn merge --ignore-ancestry -c 1489644 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489647 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 21:54:09 +00:00
Kihwal Lee eb0707983b svn merge -c 1489634 Merging from trunk to branch-2 to fix HDFS-4840.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489642 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 21:49:09 +00:00
Vinod Kumar Vavilapalli 0b97dc1cd3 YARN-756. Remnants from moving Preemption* records to yarn.api where they really belong. Contributed by Jian He.
svn merge --ignore-ancestry -c 1489614 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489616 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 21:22:41 +00:00
Kihwal Lee a912bcad0c Merging from trunk to branch-2 to fix YARN-742.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489601 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 20:55:56 +00:00
Arun Murthy 27ed92a3fb Set version in branch-2 to 2.2.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489479 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 15:34:52 +00:00
Vinod Kumar Vavilapalli 377f3ef85b YARN-755. Renamed AllocateResponse.reboot to AllocateResponse.resync. Contributed by Bikas Saha.
svn merge --ignore-ancestry -c 1489295 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489296 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 05:55:22 +00:00
Vinod Kumar Vavilapalli 3adbeff801 YARN-756. Move Preemption* records to yarn.api where they really belong. Contributed by Jian He.
svn merge --ignore-ancestry -c 1489290 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489291 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 05:05:16 +00:00
Vinod Kumar Vavilapalli 5f20c37919 YARN-635. Renamed YarnRemoteException to YarnException. Contributed by Siddharth Seth.
MAPREDUCE-5301. Updated MR code to work with YARN-635 changes of renaming YarnRemoteException to YarnException. Contributed by Siddharth Seth.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489288 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 04:50:16 +00:00
Jason Darrell Lowe 3b6035ba83 svn merge -c 1489271 FIXES: MAPREDUCE-5283. Over 10 different tests have near identical implementations of AppContext. Contributed by Sandy Ryza
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489272 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 01:55:15 +00:00
Vinod Kumar Vavilapalli fa6ec826eb YARN-757. Changed TestRMRestart to use the default scheduler to avoid test failures. Contributed by Bikas Saha.
svn merge --ignore-ancestry -c 1489268 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489269 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 01:14:50 +00:00
Vinod Kumar Vavilapalli cafa5d8bb5 YARN-748. Moved BuilderUtils from yarn-common to yarn-server-common for eventual retirement. Contributed by Jian He.
MAPREDUCE-5297. Updated MR App since BuilderUtils is no longer public after YARN-748. Contributed by Jian He.
svn merge --ignore-ancestry -c 1489257 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489262 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 00:56:26 +00:00
Jason Darrell Lowe eb7af141e4 HADOOP-9287. Parallel-testing hadoop-common. Contributed by Andrey Klochkov
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489250 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 00:29:37 +00:00
Suresh Srinivas 198cb3ebdd HADOOP-9481. Merge r1481191 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489239 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 00:06:26 +00:00
Arun Murthy 620c7fe36f Merge -c 1489236 from trunk to branch-2 to fix MAPREDUCE-5245. Added back constants to JobConf to fix incompatibilities. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489237 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 23:57:08 +00:00
Arun Murthy 75747321b7 Merge -c 1489234 from trunk to branch-2 to fix YARN-726. Fix queue & finish time fields in web-ui for ResourceManager. Contributed by Mayank Bansal.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489235 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 23:50:54 +00:00
Arun Murthy f67731cc03 MAPREDUCE-5300. Moved to INCOMPATIBLE CHANGES section in CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489233 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 23:47:19 +00:00
Arun Murthy 5e0f224234 MAPREDUCE-5299. Changed jira number for the commit in CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489230 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 23:45:37 +00:00
Arun Murthy 6edd290758 Merge -c 1489227 from trunk to branch-2 to fix MAPREDUCE-5300. Fix backward incompatibility for o.a.h.mapreduce.filecache.DistributedCache. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489228 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 23:43:14 +00:00
Arun Murthy 1d77b6c417 Merge -c 1489219 from trunk to branch-2 to fix MAPREDUCE-5296. Fix backward incompatibility for JobControl by adding the omitted addJob. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489220 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 22:55:22 +00:00
Arun Murthy 89a1e48cd7 Merge -c 1489187 from trunk to branch-2 to fix MAPREDUCE-5220. Fix backward incompatibility for TaskCompletionEvent by adding back setTaskID. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489188 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 21:35:33 +00:00
Jonathan Turner Eagles f14bc7934e HADOOP-9614. smart-test-patch.sh hangs for new version of patch (2.7.1) (Ravi Prakash via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489153 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 20:25:11 +00:00
Arun Murthy 59d44bb72c Merge -c 1489087 from trunk to branch-2 to fix YARN-398. Make it possible to specify hard locality constraints in resource requests for CapacityScheduler. Contributed by Arun C. Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489088 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 18:15:04 +00:00
Alejandro Abdelnur 7854b322d4 YARN-326. Add multi-resource scheduling to the fair scheduler. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489072 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 17:36:20 +00:00
Thomas White f3c4f2b3e2 Merge -r 1489059:1489060 from trunk to branch-2. Fixes: MAPREDUCE-5036. Default shuffle handler port should not be 8080. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489061 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 16:55:51 +00:00
Jason Darrell Lowe f09946bd47 svn merge -c 1489012 FIXES: MAPREDUCE-5268. Improve history server startup performance. Contributed by Karthik Kambatla
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489015 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 14:51:37 +00:00
Tsz-wo Sze 6bd7b27abf svn merge -c 1431726 from trunk for HDFS-4382. Fix typo MAX_NOT_CHANGED_INTERATIONS.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488856 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 06:13:53 +00:00
Tsz-wo Sze 4519131f77 svn merge -c 1430917 from trunk for HDFS-4261. Fix bugs in Balaner causing infinite loop and TestBalancerWithNodeGroup timeing out.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488855 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 06:11:22 +00:00
Tsz-wo Sze 8dd8c00fbb svn merge -c 1416691 from trunk for HDFS-4240. For nodegroup-aware block placement, when a node is excluded, he nodes in the same nodegroup should also be excluded.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488851 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 05:50:16 +00:00
Tsz-wo Sze 9b8d329e65 svn merge -c 1417130 from trunk for HDFS-4234. Use generic code for choosing datanode in Balancer.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488850 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 05:39:04 +00:00
Tsz-wo Sze 16995501d3 Merge r1414874 and r1414878 from trunk for HDFS-3495. Update Balancer to support new NetworkTopology with NodeGroup.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488848 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 05:28:34 +00:00
Tsz-wo Sze f8bb18770b svn merge -c 1357442 from trunk for HDFS-3601. Add BlockPlacementPolicyWithNodeGroup to support block placement with 4-layer network topology.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488845 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 04:59:48 +00:00
Tsz-wo Sze 4c734a8ee8 svn merge -c 1353807 from trunk for HDFS-3498. Support replica removal in BlockPlacementPolicy and make BlockPlacementPolicyDefault extensible for reusing code in subclasses.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488844 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 04:35:04 +00:00
Arun Murthy 62ab1db78b Merge -c 1488840 from trunk to branch-2 to fix YARN-730. Fix NMClientAsync to remove completed containers. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488841 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 04:12:45 +00:00
Tsz-wo Sze 8ecc0ba26f svn merge -c 1351445 from trunk for HADOOP-8470. Add NetworkTopologyWithNodeGroup, a 4-layer implementation of NetworkTopology.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488839 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 04:05:41 +00:00
Tsz-wo Sze 1d520009e3 svn merge -c 1347867 from trunk for HADOOP-8469. Make NetworkTopology class pluggable.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488838 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 03:57:32 +00:00
Siddharth Seth f42fc8f958 merge YARN-720 and MAPREDUCE-5291 from trunk. container-log4j.properties should not refer to mapreduce properties. Update MRApp to use YARN properties for log setup. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488830 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 02:36:44 +00:00