Arun Murthy
ae5df3d869
Merge -c 1493509 from trunk to branch-2 to fix YARN-787. Removed minimum resource from RegisterApplicationMasterResponse. Contributed by Alejandro Abdelnur.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493510 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 14:00:36 +00:00
Arun Murthy
a00e4a926d
Merge -c 1493445 from trunk to branch-2 to fix MAPREDUCE-5192. Allow for alternate resolutions of TaskCompletionEvents. Contributed by Chris Douglas.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493446 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 03:07:56 +00:00
Vinod Kumar Vavilapalli
dc8d2412fe
YARN-821. Renamed setFinishApplicationStatus to setFinalApplicationStatus in FinishApplicationMasterRequest for consistency. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1493315 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493316 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 04:58:45 +00:00
Alejandro Abdelnur
77ae68f84e
MAPREDUCE-5310. MRAM should not normalize allocation request capabilities. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493211 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 19:09:15 +00:00
Vinod Kumar Vavilapalli
da2a0ea3ce
YARN-806. Moved ContainerExitStatus from yarn.api to yarn.api.records. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1493138 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493139 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 16:11:36 +00:00
Arun Murthy
451f725b92
Merge -c 1492962 from trunk to branch-2 to fix MAPREDUCE-5319. Set user.name in job.xml. Contributed by Xuan Gong.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492963 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 06:27:38 +00:00
Vinod Kumar Vavilapalli
6418929696
YARN-773. Moved YarnRuntimeException from package api.yarn to api.yarn.exceptions. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1492903 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492904 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 23:26:20 +00:00
Jason Darrell Lowe
85543c3683
MAPREDUCE-4019. -list-attempt-ids is not working. Contributed by Ashwin Shankar, Devaraj K, and B Anil Kumar
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492877 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 21:35:34 +00:00
Vinod Kumar Vavilapalli
027f71eb05
MAPREDUCE-5199. Removing ApplicationTokens file as it is no longer needed. Contributed by Daryn Sharp.
...
svn merge --ignore-ancestry -c 1492848 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492849 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 20:21:03 +00:00
Vinod Kumar Vavilapalli
903f0fea8e
YARN-530. Defined Service model strictly, implemented AbstractService for robust subclassing and migrated yarn-common services. Contributed by Steve Loughran.
...
YARN-117. Migrated rest of YARN to the new service model. Contributed by Steve Louhran.
MAPREDUCE-5298. Moved MapReduce services to YARN-530 stricter lifecycle. Contributed by Steve Loughran.
svn merge --ignore-ancestry -c 1492718 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492720 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 15:56:44 +00:00
Chris Nauroth
87c96a022e
MAPREDUCE-5259. Merging change r1492364 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492367 13f79535-47bb-0310-9956-ffa450edef68
2013-06-12 19:00:05 +00:00
Alejandro Abdelnur
3af49516ca
MAPREDUCE-5304. mapreduce.Job killTask/failTask/getTaskCompletionEvents methods have incompatible signature changes. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492362 13f79535-47bb-0310-9956-ffa450edef68
2013-06-12 18:50:46 +00:00
Jason Darrell Lowe
12f72e0ba6
svn merge -c 1491611 FIXES: MAPREDUCE-5308. Shuffling to memory can get out-of-sync when fetching multiple compressed map outputs. Contributed by Nathan Roberts
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491614 13f79535-47bb-0310-9956-ffa450edef68
2013-06-10 21:45:35 +00:00
Alejandro Abdelnur
f55574bfdf
MAPREDUCE-5312. TestRMNMInfo is failing. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491044 13f79535-47bb-0310-9956-ffa450edef68
2013-06-08 19:43:11 +00:00
Bikas Saha
485c04d0a4
Merge r1490470 from trunk to branch-2 for YARN-759. Create Command enum in AllocateResponse (bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490473 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 23:43:38 +00:00
Bikas Saha
09c12434a2
Merge r1490392 from trunk to branch-2 for YARN-750. Allow for black-listing resources in YARN API and Impl in CS (acmurthy via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490396 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 19:03:27 +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
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
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
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
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
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
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
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
Arun Murthy
7246cf9b41
Merge -c 1488806 from trunk to branch-2 to fix YARN-749. Rename ResourceRequest.(get,set)HostName to ResourceRequest.(get,set)ResourceName. Contributed by Arun C. Murthy.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488807 13f79535-47bb-0310-9956-ffa450edef68
2013-06-02 22:55:31 +00:00
Vinod Kumar Vavilapalli
17476d2fa7
MAPREDUCE-5274. Bring back SecureShuffleUtils.toHex in mapreduce for binary compatibility with 1.x APIs. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1488625 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488626 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 22:22:27 +00:00
Vinod Kumar Vavilapalli
3de04e6401
MAPREDUCE-5229. Put back FileOutputCommitter.TEMP_DIR_NAME in mapreduce for binary compatibility with 1.x APIs. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1488621 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488623 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 22:12:25 +00:00
Vinod Kumar Vavilapalli
41ed12124c
YARN-717. Put object creation factories for Token in the class itself and remove useless derivations for specific tokens. Contributed by Jian He.
...
MAPREDUCE-5289. Updated MR App to use Token directly after YARN-717. Contributed by Jian He.
svn merge --ignore-ancestry -c 1488616 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488617 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 21:45:24 +00:00
Konstantin Boudnik
6e0b55c5b7
Setting artifact versions to 2.1.0-SNAPSHOT to refrecl recent release of 2,0.5-alpha
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488586 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 20:06:41 +00:00
Vinod Kumar Vavilapalli
4e0ac70cea
MAPREDUCE-5280. Bring back removed constructor and a method in mapreduce ClusterMetrics for binary compatibility with 1.x APIs. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1488458 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488459 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 03:59:23 +00:00
Vinod Kumar Vavilapalli
089b3edd0e
MAPREDUCE-5273. Bring back a couple of protected variables in mapred and mapreduce CombineFileRecordReader for binary compatibility with 1.x APIs. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1488442 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488443 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 00:34:24 +00:00
Siddharth Seth
cdab92d0c3
merge YARN-735 from trunk. Make ApplicationAttemptId, ContainerId and NodeId immutable. Contributed by Jian He.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488440 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 00:15:53 +00:00
Vinod Kumar Vavilapalli
75a96a140a
MAPREDUCE-5231. Bring back a constructor in mapred's DBInputFormat.DBRecordReader for binary compatibility with 1.x mapred APIs. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1488436 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488437 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 23:57:42 +00:00
Vinod Kumar Vavilapalli
297e916f41
MAPREDUCE-5275. Bring back a couple of APIs in mapreduce.security.TokenCache for binary compatibility with 1.x mapreduce APIs. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1488369 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488370 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 19:48:30 +00:00
Christopher Douglas
1711348e48
MAPREDUCE-5176. Add annotation for tagging tasks as responsive to
...
preemption. Contributed by Carlo Curino, cdouglas
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488105 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 06:07:37 +00:00
Siddharth Seth
36ef457902
merge MAPREDUCE-5286 from trunk. Change MapReduce to use ContainerTokenIdentifier instead of the entire Container in the startContainer call - YARN-684. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488088 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 04:18:50 +00:00
Vinod Kumar Vavilapalli
1a8872e1e0
MAPREDUCE-5228. Bring back FileInputFormat.Counter and FileOuputFormat.Counter for binary compatibility with 1.x mapred APIs. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1488060 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488061 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 23:54:06 +00:00
Vinod Kumar Vavilapalli
d95c5a23d9
MAPREDUCE-5261. Reverting the patch as it is no longer needed.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488033 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 21:54:28 +00:00
Vinod Kumar Vavilapalli
a099537780
YARN-716. Making ApplicationID immutable. Contributed by Siddharth Seth.
...
MAPREDUCE-5282. Updating MR App to use immutable ApplicationID after YARN-716. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1487994 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487995 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 20:19:53 +00:00
Siddharth Seth
0fb465cbc4
merge YARN-719 from trunk. Move RMIdentifier from Container to ContainerTokenIdentifier. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487746 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 05:01:40 +00:00
Vinod Kumar Vavilapalli
6cb1cf3d1a
MAPREDUCE-5263. Bring back old methods and fields in filecache.DistributedCache for binary compatibility with mapred in 1.x. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1487695 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487696 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 01:24:15 +00:00
Vinod Kumar Vavilapalli
71cc411340
MAPREDUCE-5237. Add methods that were removed from ClusterStatus back into 2.x so as to be compatible with 1.x. Contributed by Zhijie Shen.
...
Incompatible as ClusterStatus.UNINITIALIZED_MEMORY_VALUE is a long now and so breaks 0.23.x but it shouldn't be a big deal in reality.
svn merge --ignore-ancestry -c 1487175 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487176 13f79535-47bb-0310-9956-ffa450edef68
2013-05-29 00:43:47 +00:00
Vinod Kumar Vavilapalli
a2303831b4
MAPREDUCE-5270. Migrated MR app from using BuilderUtil factory methods to individual record factory methods. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1486271 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487158 13f79535-47bb-0310-9956-ffa450edef68
2013-05-28 22:38:14 +00:00
Vinod Kumar Vavilapalli
6c5055fe92
YARN-571. Remove user from ContainerLaunchContext. Contributed by Omkar Vinit Joshi.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486251 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 23:11:25 +00:00
Suresh Srinivas
599b00e087
MAPREDUCE-5191. Merge r1484575 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486245 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 22:47:19 +00:00
Suresh Srinivas
1a895a3fd6
HADOOP-8562. Merge r1477427 for HDFS-4610, r1477408 for YARN-506, r1477403 for MAPREDUCE-5177
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486241 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 22:29:49 +00:00
Suresh Srinivas
3694a73ff8
HADOOP-9290. Merge r1476586 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486159 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:37:58 +00:00
Suresh Srinivas
5e007776f6
MAPREDUCE-4987. Merge r1470003 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486106 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 16:19:53 +00:00
Suresh Srinivas
02205fa797
HADOOP-8562. Merge r1457069 for HDFS-4604, r1459514 for YARN-488, r1459520 for YARN-490, r1459526 for YARN-491, r1459544 for MAPREDUCE-5078 and r1459573 for HDFS-4607
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485911 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 00:51:31 +00:00
Vinod Kumar Vavilapalli
004a9d5567
MAPREDUCE-5230. Bring back NLineInputFormat.createFileSplit for binary compatibility with mapred in 1.x Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1485906 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485908 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 00:42:53 +00:00
Suresh Srinivas
a1235b5ba9
HADOOP-8562. Merge r1453486 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485845 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 20:41:53 +00:00
Vinod Kumar Vavilapalli
35dc9545e1
YARN-563. Add the concept of an application-type for each application. Contributed by Mayank Bansal.
...
MAPREDUCE-5246. Specify application-type at the time of job submission after YARN-563. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1485790 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485792 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 18:02:45 +00:00
Vinod Kumar Vavilapalli
28822c2f64
MAPREDUCE-5233. Add methods that are changed or removed from JobControl.Job when compared to 1.x. This breaks 0.23.x users of one API in Job. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1485491 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485494 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 23:13:19 +00:00
Vinod Kumar Vavilapalli
f71593ae2c
MAPREDUCE-5156. Change hadoop examples ProgramDriver to be able to run 1.x examples jar on top of YARN. This change breaks 0.23.x direct usages of ProgramDriver. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1485085 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485086 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 06:37:01 +00:00
Vinod Kumar Vavilapalli
c28a0860e2
MAPREDUCE-5261. Fix issues in TestRMContainerAllocator after YARN-617. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1485079 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485080 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 06:25:03 +00:00
Vinod Kumar Vavilapalli
89f809bdff
MAPREDUCE-5235. Bring back old fields and exceptions in Counters for binary compatibility with mapred in 1.x. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1484992 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1484993 13f79535-47bb-0310-9956-ffa450edef68
2013-05-21 22:01:02 +00:00
Vinod Kumar Vavilapalli
543bab20ed
MAPREDUCE-5257. Fix issues in TestContainerLauncherImpl after YARN-617. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1484349 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1484351 13f79535-47bb-0310-9956-ffa450edef68
2013-05-19 21:15:54 +00:00
Jason Darrell Lowe
759e518509
svn merge -c 1483974 FIXES: MAPREDUCE-4927. Historyserver 500 error due to NPE when accessing specific counters page for failed job. Contributed by Ashwin Shankar
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483976 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 20:26:13 +00:00
Vinod Kumar Vavilapalli
d180262cf9
MAPREDUCE-5234. Change mapred.TaskReport and mapreduce.TaskReport for binary compatibility with mapred in 1.x but incompatible with 0.23.x. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1483940
../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483941 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 18:17:57 +00:00
Vinod Kumar Vavilapalli
f0bd8da38b
YARN-617. Made ContainerTokens to be used for validation at NodeManager also in unsecure mode to prevent AMs from faking resource requirements in unsecure mode. Contributed by Omkar Vinit Joshi.
...
Merge from trunk revision 1483667 with little test modifications for proper merge.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483668 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 06:38:03 +00:00
Alejandro Abdelnur
2ed6ce3bfb
MAPREDUCE-5244. Two functions changed their visibility in JobStatus. (zjshen via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482624 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 22:14:15 +00:00
Vinod Kumar Vavilapalli
44a9273286
MAPREDUCE-5222. Bring back some methods and constants in Jobclient for binary compatibility with mapred in 1.x. Contributed by Karthik Kambatla.
...
svn merge --ignore-ancestry -c 1482208 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482209 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 05:52:46 +00:00
Siddharth Seth
1f922d3c51
merge YARN-615 from trunk. Rename ContainerLaunchContext.containerTokens to tokens. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482200 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 04:13:00 +00:00
Vinod Kumar Vavilapalli
6706e58f61
MAPREDUCE-5240. Fix a bug in MRAppMaster because of which OutputCommitter could not access credentials set by the user. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1482175 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482176 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 02:50:27 +00:00
Alejandro Abdelnur
7db8233722
MAPREDUCE-5220. Setter methods in TaskCompletionEvent are public in MR1 and protected in MR2. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482143 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 23:09:05 +00:00
Vinod Kumar Vavilapalli
3691cf65af
MAPREDUCE-5208. Bug-fix on branch-2 - tests weren't compiling.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482091 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 20:38:18 +00:00
Vinod Kumar Vavilapalli
99275f172a
MAPREDUCE-4067. Changed MRClientProtocol api to throw IOException only (Xuan Gong via vinodkv)
...
svn merge --ignore-ancestry -c 1481695 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481696 13f79535-47bb-0310-9956-ffa450edef68
2013-05-13 03:36:15 +00:00
Vinod Kumar Vavilapalli
621db3a3cc
MAPREDUCE-5208. Modified ShuffleHandler to use SecureIOUtils for reading local files. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1481657 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481658 13f79535-47bb-0310-9956-ffa450edef68
2013-05-12 21:59:48 +00:00
Vinod Kumar Vavilapalli
2594db460f
YARN-634. Modified YarnRemoteException to be not backed by PB and introduced a separate SerializedException record. Contributed by Siddharth Seth.
...
MAPREDUCE-5239. Updated MR App to reflect YarnRemoteException changes after YARN-634. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1481205 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481209 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 21:51:32 +00:00
Alejandro Abdelnur
c56c50df3f
MAPREDUCE-4942. mapreduce.Job has a bunch of methods that throw InterruptedException so its incompatible with MR1. (rkanter via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480754 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 20:11:33 +00:00
Vinod Kumar Vavilapalli
6aa0edc793
YARN-630. Changed AMRMProtocol api to throw IOException and YarnRemoteException. Contributed by Xuan Gong.
...
MAPREDUCE-5226. Handling YarnRemoteException separately from IOException in MR App's use of AMRMProtocol after YARN-630. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1480529 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480530 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 05:32:52 +00:00
Vinod Kumar Vavilapalli
fc693ff519
YARN-631. Changed ClientRMProtocol api to throw IOException and YarnRemoteException. Contributed by Xuan Gong.
...
MAPREDUCE-5212. Handling YarnRemoteException separately from IOException in MR App after YARN-631. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1480494 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480495 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 22:54:07 +00:00
Vinod Kumar Vavilapalli
4a0965323c
MAPREDUCE-5157. Bring back old sampler related code so that we can support binary compatibility with hadoop-1 sorter example. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1480474 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480476 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 21:43:40 +00:00
Christopher Douglas
5cf0e57849
MAPREDUCE-5209. Fix units in a ShuffleScheduler log message.
...
Contributed by Tsuyoshi OZAWA
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480472 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 21:36:43 +00:00
Vinod Kumar Vavilapalli
2f7c04f53a
MAPREDUCE-5159. Change ValueAggregatorJob to add APIs which can support binary compatibility with hadoop-1 examples. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1480394 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480396 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 18:29:10 +00:00
Vinod Kumar Vavilapalli
486391f766
YARN-629. Make YarnRemoteException not be rooted at IOException. Contributed by Xuan Gong.
...
MAPREDUCE-5204. Handling YarnRemoteException separately from IOException in MR app after YARN-629. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1479680 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479684 13f79535-47bb-0310-9956-ffa450edef68
2013-05-06 19:20:02 +00:00
Vinod Kumar Vavilapalli
fb8d3fb0e4
MAPREDUCE-5205. Fixed MR App to load tokens correctly. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1479016 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479018 13f79535-47bb-0310-9956-ffa450edef68
2013-05-04 00:29:34 +00:00
Vinod Kumar Vavilapalli
0b64df0630
YARN-625. Move the utility method unwrapAndThrowException from YarnRemoteExceptionPBImpl to RPCUtil. Contributed by Siddharth Seth.
...
svn merge --ignore-ancestry -c 1478594 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478595 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 22:45:30 +00:00
Thomas White
0411165008
Merge -r 1478421:1478422 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@1478424 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 16:00:15 +00:00
Aaron Myers
96be135ffe
MAPREDUCE-5193. A few MR tests use block sizes which are smaller than the default minimum block size. Contributed by Andrew Wang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478251 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 02:00:44 +00:00
Vinod Kumar Vavilapalli
868362c9b1
MAPREDUCE-5145. Changed default max-attempts to be more than one for MR jobs inline with YARN. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1477889 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477890 13f79535-47bb-0310-9956-ffa450edef68
2013-05-01 00:44:13 +00:00
Vinod Kumar Vavilapalli
e11dd72dc1
MAPREDUCE-5179. Fix unit test in TestHSWebServices which fails when versionInfo has parantheses like when running on a git checkout. Contributed by Hitesh Shah.
...
svn merge --ignore-ancestry -c 1476835 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476836 13f79535-47bb-0310-9956-ffa450edef68
2013-04-28 21:03:01 +00:00
Vinod Kumar Vavilapalli
ffe3368d94
YARN-562. Modified NM to reject any containers allocated by a previous ResourceManager. Contributed by Jian He.
...
MAPREDUCE-5167. Update MR App after YARN-562 to use the new builder API for the container. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476346 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 19:08:44 +00:00
Vinod Kumar Vavilapalli
a1fe9a0c9f
YARN-577. Add application-progress also to ApplicationReport. Contributed by Hitesh Shah.
...
MAPREDUCE-5178. Update MR App to set progress in ApplicationReport after YARN-577. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1475636 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475637 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 05:45:15 +00:00
Siddharth Seth
b392a65e2e
merge MAPREDUCE-5181 from trunk. RMCommunicator should not use AMToken from the env. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471817 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 02:51:08 +00:00
Arun Murthy
c281269d0e
Merge -c 1471796 from trunk to branch-2 to fix MAPREDUCE-5166. Fix ConcurrentModificationException due to insufficient synchronization on updates to task Counters. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471797 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 00:55:00 +00:00
Arun Murthy
1fb58d2322
Merge -c 1471556 from trunk to branch-2 to fix MAPREDUCE-4737. Ensure that mapreduce APIs are semantically consistent with mapred API w.r.t Mapper.cleanup and Reducer.cleanup; in the sense that cleanup is now called even if there is an error. The old mapred API already ensures that Mapper.close and Reducer.close are invoked during error handling. Note that it is an incompatible change, however end-users can override Mapper.run and Reducer.run to get the old (inconsistent) behaviour. Contributed by Arun C. Murthy.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471557 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 17:39:28 +00:00
Robert Joseph Evans
8b23e7e10c
svn merge -c 1471424 FIXES: MAPREDUCE-5069. add concrete common implementations of CombineFileInputFormat (Sangjin Lee via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471429 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 14:23:00 +00:00
Vinod Kumar Vavilapalli
2dfecb78e5
YARN-561. Modified NodeManager to set key information into the environment of every container that it launches. Contributed by Xuan Gong.
...
MAPREDUCE-5175. Updated MR App to not set envs that will be set by NMs anyways after YARN-561. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471207 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 00:01:08 +00:00
Thomas White
d53afdb144
Merge -r 1470693:1470694 from trunk to branch-2. Fixes: MAPREDUCE-5146. application classloader may be used too early to load classes. Contributed by Sangjin Lee.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470696 13f79535-47bb-0310-9956-ffa450edef68
2013-04-22 20:09:44 +00:00
Arun Murthy
b65a090174
Merge -c 1470216 from trunk to branch-2 to fix MAPREDUCE-5066. Added a timeout for the job.end.notification.url. Contributed by Ivan Mitic.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470217 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 19:19:16 +00:00
Thomas Graves
d5a1fb4663
MAPREDUCE-5147. Maven build should create hadoop-mapreduce-client-app-VERSION.jar directly (Robert Parker via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470038 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 20:55:05 +00:00
Vinod Kumar Vavilapalli
1bfb6af49f
YARN-441. Removed unused utility methods for collections from two API records. Contributed by Xuan Gong.
...
MAPREDUCE-5163. Update MR App to not use API utility methods for collections after YARN-441. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1469657 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469658 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 01:34:04 +00:00
Alejandro Abdelnur
d516caf788
MAPREDUCE-4932. mapreduce.job#getTaskCompletionEvents incompatible with Hadoop 1. (rkanter via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469589 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 21:43:59 +00:00
Vinod Kumar Vavilapalli
0df869e1f7
MAPREDUCE-5152. Make MR App to simply pass through the container from RM instead of extracting and populating information itself to start any container. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1469544 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469545 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 20:14:22 +00:00
Alejandro Abdelnur
df24059512
MAPREDUCE-4898. FileOutputFormat.checkOutputSpecs and FileOutputFormat.setOutputPath incompatible with MR1. (rkanter via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469524 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 18:53:36 +00:00
Alejandro Abdelnur
9b4f1a0c10
MAPREDUCE-5128. mapred-default.xml is missing a bunch of history server configs. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469096 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 23:15:22 +00:00
Bikas Saha
2108a35d28
Merge -c r1469060 from trunk to branch-2 for MAPREDUCE-5140. MR part of YARN-514 (Zhijie Shen via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469064 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 20:32:15 +00:00
Vinod Kumar Vavilapalli
7f3fd5f03d
Reverting my accidental revert of MAPREDUCE-5059 in the previous commit of YARN-500 from branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468743 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 04:22:34 +00:00
Vinod Kumar Vavilapalli
3d2430fad1
YARN-500. Fixed YARN webapps to not roll-over ports when explicitly asked to use non-ephemeral ports. Contributed by Kenji Kikushima.
...
svn merge --ignore-ancestry -c 1468739 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468740 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 04:17:49 +00:00
Thomas Graves
fd6956c3bd
MAPREDUCE-5015. Coverage fix for org.apache.hadoop.mapreduce.tools.CLI (Aleksey Gorshkov via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468484 13f79535-47bb-0310-9956-ffa450edef68
2013-04-16 16:12:25 +00:00
Vinod Kumar Vavilapalli
8cc3b081fa
YARN-444. Moved special container exit codes from YarnConfiguration to API where they belong. Contributed by Sandy Ryza.
...
MAPREDUCE-5151. Updated MR AM to use standard exit codes from the API after YARN-444. Contributed by Sandy Ryza.
svn merge --ignore-ancestry -c 1468276 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468277 13f79535-47bb-0310-9956-ffa450edef68
2013-04-15 23:55:26 +00:00
Robert Joseph Evans
a7fba8fcd7
svn merge -c 1468232 FIXES: MAPREDUCE-4974. Optimising the LineRecordReader initialize() method (Gelesh via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468235 13f79535-47bb-0310-9956-ffa450edef68
2013-04-15 21:36:31 +00:00
Konstantin Shvachko
7e12ea395e
MAPREDUCE-4985. Add compression option to TestDFSIO usage. Contributed by Plamen Jeliazkov.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467146 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 23:50:15 +00:00
Vinod Kumar Vavilapalli
a84c8bcbd4
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467130 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 23:04:09 +00:00
Vinod Kumar Vavilapalli
0c54bb343d
MAPREDUCE-5094. Disabled memory monitoring by default in MiniMRYarnCluster to avoid some downstream tests failing. Contributed by Siddharth Seth.
...
svn merge --ignore-ancestry -c 1467124 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467126 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 22:55:52 +00:00
Vinod Kumar Vavilapalli
ff4b1aa99e
MAPREDUCE-5059. Change average merge time on Job overview page to be the time delta between the end of the shuffle and the start of the reduce. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1467120 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467122 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 22:28:53 +00:00
Jason Darrell Lowe
74880e24c5
svn merge -c 1467061 FIXES: MAPREDUCE-5136. TestJobImpl->testJobNoTasks fails with IBM JAVA. Contributed by Amir Sanjar
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467062 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 19:18:55 +00:00
Jason Darrell Lowe
9f3feed745
MAPREDUCE-5137. AM web UI: clicking on Map Task results in 500 error. Contributed by Thomas Graves
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466952 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 16:29:34 +00:00
Siddharth Seth
422133edf7
merge MAPREDUCE-5079 from trunk. Changes job recovery to restore state directly from job history, instaed of simulating state machine events. Contributed by Jason Lowe and Robert Parker.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466770 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 05:02:45 +00:00
Arun Murthy
91a676fc41
Setting version in branch-2 to be 2.0.5-SNAPSHOT.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466320 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 03:16:30 +00:00
Vinod Kumar Vavilapalli
76d72db5eb
YARN-112. Fixed a race condition during localization that fails containers. Contributed by Omkar Vinit Joshi.
...
MAPREDUCE-5138. Fix LocalDistributedCacheManager after YARN-112. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1466196 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466197 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 19:57:10 +00:00
Jason Darrell Lowe
45fa8302f4
MAPREDUCE-5086. MR app master deletes staging dir when sent a reboot command from the RM. Contributed by Jian He
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465674 13f79535-47bb-0310-9956-ffa450edef68
2013-04-08 16:12:32 +00:00
Arun Murthy
b66abebca2
Merge -c 1465188 from trunk to branch-2 to fix MAPREDUCE-5129. Allow tags to JobHistory for deeper analytics. Contributed by Billie Rinaldi.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465189 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 05:33:41 +00:00
Thomas Graves
003ecf8137
MAPREDUCE-5007. fix coverage org.apache.hadoop.mapreduce.v2.hs (Aleksey Gorshkov via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465016 13f79535-47bb-0310-9956-ffa450edef68
2013-04-05 15:43:38 +00:00
Konstantin Boudnik
347d9f6b98
MAPREDUCE-5088. MR Client gets an renewer token exception while Oozie is submitting a job (daryn)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464147 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 18:35:31 +00:00
Vinod Kumar Vavilapalli
523e98d914
MAPREDUCE-5117. Changed MRClientProtocolPBClientImpl to be closeable and thus fix failures in renewal of HistoryServer's delegations tokens. Contributed by Siddharth Seth.
...
svn merge --ignore-ancestry -c 1463828 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463829 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 05:40:21 +00:00
Robert Joseph Evans
ca4b6ee8c6
Reverted MAPREDUCE-4974 because of test failures.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463360 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 02:15:08 +00:00
Robert Joseph Evans
f47bdbded7
svn merge -c 1463221 FIXES: MAPREDUCE-4974. Optimising the LineRecordReader initialize() method (Gelesh via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463222 13f79535-47bb-0310-9956-ffa450edef68
2013-04-01 17:47:19 +00:00
Bikas Saha
ad1695cb1e
Merge -c 1462271 from trunk to branch-2 for YARN-450. Define value for * in the scheduling protocol (Zhijie Shen via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1462274 13f79535-47bb-0310-9956-ffa450edef68
2013-03-28 19:48:52 +00:00
Thomas White
b1c781b2be
MAPREDUCE-5006. Fix failing streaming tests due to MAPREDUCE-4994. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461537 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 11:42:32 +00:00
Siddharth Seth
6e9e2f0c7f
MAPREDUCE-5077. Remove mapreduce.util.ResourceCalculatorPlugin and related code. Contributed by Karthik Kambatla.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461254 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 18:18:44 +00:00
Robert Joseph Evans
4bc46b766d
svn merge -c 1461146 FIXES: MAPREDUCE-4875. coverage fixing for org.apache.hadoop.mapred (Aleksey Gorshkov via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461149 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 14:17:59 +00:00
Vinod Kumar Vavilapalli
7410551629
MAPREDUCE-5062. Fix MR AM to read max-retries from the RM. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1460923 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460924 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 22:34:45 +00:00
Hitesh Shah
c983b07753
MAPREDUCE-5083. MiniMRCluster should use a random component when creating an actual cluster. Contributed by Siddharth Seth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459935 13f79535-47bb-0310-9956-ffa450edef68
2013-03-22 19:14:07 +00:00
Siddharth Seth
7892e1aabd
merge MAPREDUCE-3872 from trunk. Fix an event handling races in ContainerLauncherImpl. Contributed by Robert Kanter.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459548 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 21:57:12 +00:00
Hitesh Shah
1de797794e
merge -c 1459040 from trunk to branch-2 to fix YARN-396. Rationalize AllocateResponse in RM Scheduler API. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459044 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 20:46:22 +00:00
Robert Joseph Evans
05fabc2013
svn merge -c 1458906 FIXES: MAPREDUCE-4972. Coverage fixing for org.apache.hadoop.mapreduce.jobhistory (Aleksey Gorshkov via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458915 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 16:11:58 +00:00
Alejandro Abdelnur
35bc29813f
Reverting MAPREDUCE-5028 (commit 1457919)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458438 13f79535-47bb-0310-9956-ffa450edef68
2013-03-19 18:00:38 +00:00
Jonathan Turner Eagles
3fdeec0bd3
MAPREDUCE-5053. java.lang.InternalError from decompression codec cause reducer to fail (Robert Parker via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458351 13f79535-47bb-0310-9956-ffa450edef68
2013-03-19 15:48:36 +00:00
Alejandro Abdelnur
1036f637cc
MAPREDUCE-5028. Maps fail when io.sort.mb is set to high value. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457919 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 18:59:22 +00:00
Alejandro Abdelnur
60fcbe2e05
MAPREDUCE-4990. Construct debug strings conditionally in ShuffleHandler.Shuffle#sendMapOutput(). (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457916 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 18:46:36 +00:00
Aaron Myers
eb6a563194
HDFS-4521. Invalid network toploogies should not be cached. Contributed by Colin Patrick McCabe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457883 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 17:26:45 +00:00
Robert Joseph Evans
9a9d40200f
svn merge -c 1457119 FIXES: MAPREDUCE-5042. Reducer unable to fetch for a map task that was recovered (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457121 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 21:11:45 +00:00
Alejandro Abdelnur
3eeb720b2f
MAPREDUCE-4716. TestHsWebServicesJobsQuery.testJobsQueryStateInvalid fails with jdk7. (tgraves via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457068 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 18:58:21 +00:00
Alejandro Abdelnur
1a00fa6e3a
MAPREDUCE-4571. TestHsWebServicesJobs fails on jdk7. (tgraves via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457063 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 18:51:22 +00:00
Robert Joseph Evans
3508e8e7dd
svn merge -c 1456536 FIXES: YARN-237. Refreshing the RM page forgets how many rows I had in my Datatables (jian he via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456537 13f79535-47bb-0310-9956-ffa450edef68
2013-03-14 16:57:10 +00:00
Jason Darrell Lowe
77e23898f1
svn merge -c 1455740 FIXES: MAPREDUCE-5060. Fetch failures that time out only count against the first map task. Contributed by Robert Joseph Evans
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1455742 13f79535-47bb-0310-9956-ffa450edef68
2013-03-12 22:56:57 +00:00
Thomas Graves
d46bbdd43f
MAPREDUCE-5023. History Server Web Services missing Job Counters (Ravi Prakash via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1454157 13f79535-47bb-0310-9956-ffa450edef68
2013-03-07 23:03:10 +00:00
Arun Murthy
851a425b2a
Merge -c 1453365 from trunk to branch-2 to fix MAPREDUCE-3685. Fix bugs in MergeManager to ensure compression codec is appropriately used and that on-disk segments are correctly sorted on file-size. Contributed by Anty Rao and Ravi Prakash.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453367 13f79535-47bb-0310-9956-ffa450edef68
2013-03-06 15:03:29 +00:00
Jonathan Turner Eagles
ea7aa7f80f
MAPREDUCE-5027. Shuffle does not limit number of outstanding connections (Robert Parker via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453099 13f79535-47bb-0310-9956-ffa450edef68
2013-03-06 00:07:25 +00:00
Robert Joseph Evans
611d6d543e
svn merge -c 1452372 FIXES: MAPREDUCE-5043. Fetch failure processing can cause AM event queue to backup and eventually OOM (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1452451 13f79535-47bb-0310-9956-ffa450edef68
2013-03-04 19:06:26 +00:00
Jonathan Turner Eagles
a5985e4b0e
MAPREDUCE-4794. DefaultSpeculator generates error messages on normal shutdown (Jason Lowe via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451831 13f79535-47bb-0310-9956-ffa450edef68
2013-03-02 03:45:21 +00:00
Alejandro Abdelnur
6072cb98a9
MAPREDUCE-4896. mapred queue -info spits out ugly exception when queue does not exist. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451453 13f79535-47bb-0310-9956-ffa450edef68
2013-03-01 01:28:50 +00:00
Alejandro Abdelnur
9db8505b19
HADOOP-9349. Confusing output when running hadoop version from one hadoop installation when HADOOP_HOME points to another. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451449 13f79535-47bb-0310-9956-ffa450edef68
2013-03-01 01:21:30 +00:00
Jonathan Turner Eagles
07680cdb13
MAPREDUCE-4871. AM uses mapreduce.jobtracker.split.metainfo.maxsize but mapred-default has mapreduce.job.split.metainfo.maxsize (Jason Lowe via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451319 13f79535-47bb-0310-9956-ffa450edef68
2013-02-28 19:57:10 +00:00
Siddharth Seth
b775d49f35
merge MAPREDUCE-4693 from trunk. Historyserver should include counters for failed tasks. Contributed by Xuan Gong.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450957 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 21:04:29 +00:00
Vinod Kumar Vavilapalli
c3981d3f2c
MAPREDUCE-4892. Modify CombineFileInputFormat to not skew input slits' allocation on small clusters. Contributed by Bikas Saha.
...
svn merge --ignore-ancestry -c 1450912 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450915 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 18:53:03 +00:00
Thomas White
7b943682fb
Merge -r 1450722:1450723 from trunk to branch-2. Fixes: MAPREDUCE-5008. Merger progress miscounts with respect to EOF_MARKER. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450724 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 10:40:52 +00:00
Suresh Srinivas
6485664b15
HADOOP-9334. Merge change 1450463 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450475 13f79535-47bb-0310-9956-ffa450edef68
2013-02-26 22:02:30 +00:00
Thomas White
96b3905afd
Merge -r 1448614:1448615 from trunk to branch. Fixes: MAPREDUCE-4951. Container preemption interpreted as task failure. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448618 13f79535-47bb-0310-9956-ffa450edef68
2013-02-21 12:04:46 +00:00
Thomas White
a9f552cb33
Merge -r 1448601:1448602 from trunk to branch-2. Fixes: MAPREDUCE-5013. mapred.JobStatus compatibility: MR2 missing constructors from MR1. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448604 13f79535-47bb-0310-9956-ffa450edef68
2013-02-21 11:44:50 +00:00
Thomas White
af07edf1ab
Merge -r 1448596:1448597 from trunk to branch-2. Fixes: MAPREDUCE-4846. Some JobQueueInfo methods are public in MR1 but protected in MR2. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448598 13f79535-47bb-0310-9956-ffa450edef68
2013-02-21 11:36:26 +00:00
Jonathan Turner Eagles
e3afdf5aa9
MAPREDUCE-5009. Killing the Task Attempt slated for commit does not clear the value from the Task commitAttempt member (Robert Parker via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1447969 13f79535-47bb-0310-9956-ffa450edef68
2013-02-19 23:42:40 +00:00
Alejandro Abdelnur
7f9b4c4e8b
MAPREDUCE-4994. Addendum fixing testcases failures. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446043 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 04:22:41 +00:00
Alejandro Abdelnur
1709c222d9
HADOOP-9117. replace protoc ant plugin exec with a maven plugin. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446021 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 01:36:47 +00:00
Siddharth Seth
d53d4cbca3
merge MAPREDUCE-5000 from trunk. Fixes getCounters when speculating by fixing the selection of the best attempt for a task. Contributed by Jason Lowe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445873 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 19:23:50 +00:00
Jason Darrell Lowe
e3924c623f
svn merge -c 1445456 FIXES: MAPREDUCE-4992. AM hangs in RecoveryService when recovering tasks with speculative attempts. Contributed by Robert Parker
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445457 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 02:17:24 +00:00
Jason Darrell Lowe
a6f31c1d91
svn merge -c 1445448 FIXES: MAPREDUCE-4989. JSONify DataTables input data for Attempts page. Contributed by Ravi Prakash
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445450 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 01:21:58 +00:00
Alejandro Abdelnur
a6925b3fdd
MAPREDUCE-4994. -jt generic command line option does not work. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445331 13f79535-47bb-0310-9956-ffa450edef68
2013-02-12 20:16:43 +00:00
Siddharth Seth
288dd9b025
merge MAPREDUCE-4671 from trunk. AM does not tell the RM about container requests which are no longer needed. Contributed by Bikas Saha.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443324 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 07:08:30 +00:00
Jason Darrell Lowe
2db13d61c2
svn merge -c 1443257 FIXES: MAPREDUCE-4822. Unnecessary conversions in History Events. Contributed by Chu Tong
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443269 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 22:58:09 +00:00
Alejandro Abdelnur
f5503bd44a
MAPREDUCE-4977. Documentation for pluggable shuffle and pluggable sort. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443170 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 19:53:06 +00:00
Robert Joseph Evans
dcbad333ad
svn merge -c 1443027. FIXES: MAPREDUCE-4905. test org.apache.hadoop.mapred.pipes (Aleksey Gorshkov via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443033 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:57:46 +00:00
Arun Murthy
196341fc09
Setting version to 2.0.4-SNAPSHOT in branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442956 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 13:23:45 +00:00
Siddharth Seth
392a96bd64
merge MAPREDUCE-4971 from trunk. Minor extensibility enhancements to Counters & FileOutputFormat. Contributed by Arun C Murthy
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1441672 13f79535-47bb-0310-9956-ffa450edef68
2013-02-02 00:49:17 +00:00
Hitesh Shah
6eead06fa2
merge -c 1441668 from trunk to branch-2 to fix YARN-372. Move InlineDispatcher from hadoop-yarn-server-resourcemanager to hadoop-yarn-common. Contributed by Siddharth Seth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1441669 13f79535-47bb-0310-9956-ffa450edef68
2013-02-02 00:45:37 +00:00
Suresh Srinivas
a83b272a36
MAPREDUCE-4969. Merge change 1441069 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1441070 13f79535-47bb-0310-9956-ffa450edef68
2013-01-31 17:17:21 +00:00
Vinod Kumar Vavilapalli
a11e8bef64
MAPREDUCE-4893. Fixed MR ApplicationMaster to do optimal assignment of containers to get maximum locality. Contributed by Bikas Saha.
...
svn merge --ignore-ancestry -c 1440749 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1440752 13f79535-47bb-0310-9956-ffa450edef68
2013-01-31 00:29:36 +00:00
Alejandro Abdelnur
1cc2fcd3b2
MAPREDUCE-2264. Job status exceeds 100% in some cases. (devaraj.k and sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1440080 13f79535-47bb-0310-9956-ffa450edef68
2013-01-29 19:40:20 +00:00
Siddharth Seth
6f146b15d3
merge MAPREDUCE-4838 from trunk. Add additional fields like Locality, Avataar to the JobHistory logs. Contributed by Zhijie Shen
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439715 13f79535-47bb-0310-9956-ffa450edef68
2013-01-29 00:23:27 +00:00
Siddharth Seth
6431b24f04
merge MAPREDUCE-4803 from trunk. Remove duplicate copy of TestIndexCache. Contributed by Mariappan Asokan
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439591 13f79535-47bb-0310-9956-ffa450edef68
2013-01-28 19:19:52 +00:00
Alejandro Abdelnur
26e597010f
Reverting MAPREDUCE-2264
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439564 13f79535-47bb-0310-9956-ffa450edef68
2013-01-28 18:59:32 +00:00
Alejandro Abdelnur
7ac9d3b1c5
MAPREDUCE-2264. Job status exceeds 100% in some cases. (devaraj.k and sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438800 13f79535-47bb-0310-9956-ffa450edef68
2013-01-26 00:50:17 +00:00
Alejandro Abdelnur
d8cdee8360
MAPREDUCE-4808. Refactor MapOutput and MergeManager to facilitate reuse by Shuffle implementations. (masokan via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438796 13f79535-47bb-0310-9956-ffa450edef68
2013-01-26 00:41:12 +00:00
Alejandro Abdelnur
cf67cccd7c
MAPREDUCE-4807. Allow MapOutputBuffer to be pluggable. (masokan via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438795 13f79535-47bb-0310-9956-ffa450edef68
2013-01-26 00:40:21 +00:00
Alejandro Abdelnur
7a6b9f3609
MAPREDUCE-4809. Change visibility of classes for pluggable sort changes. (masokan via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438794 13f79535-47bb-0310-9956-ffa450edef68
2013-01-26 00:39:27 +00:00
Alejandro Abdelnur
c4c039bb29
MAPREDUCE-4049. Experimental api to allow for alternate shuffle plugins. Contributed by Anver BenHanoch.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1438793 13f79535-47bb-0310-9956-ffa450edef68
2013-01-26 00:38:38 +00:00
Siddharth Seth
b981b59c06
merge MAPREDUCE-4946 from trunk. Fix a performance problem for large jobs by reducing the number of map completion event type conversions. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1437104 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 19:08:06 +00:00
Jonathan Turner Eagles
361e05864f
svn merge -c 1435386 FIXES: MAPREDUCE-4458. Warn if java.library.path is used for AM or Task (Robert Parker via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1435394 13f79535-47bb-0310-9956-ffa450edef68
2013-01-18 22:47:14 +00:00
Siddharth Seth
f18bb1a150
merge MAPREDUCE-4948 from trunk. Fix a failing unit test - TestYARNRunner.testHistoryServerToken. Contributed by Junping Du
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1435313 13f79535-47bb-0310-9956-ffa450edef68
2013-01-18 19:31:10 +00:00
Alejandro Abdelnur
1d6bd54e29
MAPREDUCE-4923. Add toString method to TaggedInputSplit. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1434994 13f79535-47bb-0310-9956-ffa450edef68
2013-01-18 00:41:26 +00:00
Alejandro Abdelnur
2e2afd22f9
MAPREDUCE-4924. flakey test: org.apache.hadoop.mapred.TestClusterMRNotification.testMR. (rkanter via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433759 13f79535-47bb-0310-9956-ffa450edef68
2013-01-16 00:15:59 +00:00
Siddharth Seth
44b3be14bc
merge YARN-135 from trunk. Client tokens should be per app-attempt, and should be unregistered on App-finish. Contributed by Vinod Kumar Vavilapalli
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433571 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 18:35:10 +00:00
Jason Darrell Lowe
3943008b07
svn merge -c 1433445 FIXES: MAPREDUCE-4936. JobImpl uber checks for cpu are wrong. Contributed by Arun C Murthy
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433446 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 14:49:14 +00:00
Suresh Srinivas
1b410df23f
MAPREDUCE-4938. Merging change 1433227 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433230 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 00:13:43 +00:00
Thomas Graves
fdc4c61101
MAPREDUCE-4934. Maven RAT plugin is not checking all source files (tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432940 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 15:01:35 +00:00
Robert Joseph Evans
63106e20e0
svn merge -c 1432230 FIXES: MAPREDUCE-4921. JobClient should acquire HS token with RM principal (daryn via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432232 13f79535-47bb-0310-9956-ffa450edef68
2013-01-11 19:05:02 +00:00
Alejandro Abdelnur
4774c6a5b8
MAPREDUCE-4907. Ammendment, forgot to svn add testcase in original commit
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431511 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 17:28:27 +00:00
Alejandro Abdelnur
572f7f45d6
MAPREDUCE-4907. TrackerDistributedCacheManager issues too many getFileStatus calls. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431167 13f79535-47bb-0310-9956-ffa450edef68
2013-01-10 00:52:15 +00:00
Jason Darrell Lowe
fb0a8ff926
svn merge -c 1431131 FIXES: MAPREDUCE-4848. TaskAttemptContext cast error during AM recovery. Contributed by Jerry Chen
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431134 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 23:01:11 +00:00
Thomas White
98cb5344eb
Merge -r 1430928:1430929 from trunk to branch-2. Fixes: MAPREDUCE-1700. User supplied dependencies may conflict with MapReduce system JARs.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430936 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 16:22:55 +00:00
Vinod Kumar Vavilapalli
76939f2877
MAPREDUCE-4810. Added new admin command options for MR AM. Contributed by Jerry Chen.
...
svn merge --ignore-ancestry -c 1430707 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430708 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 06:33:01 +00:00
Arun Murthy
122cd0fb5b
Merge -c 1430688 from trunk to branch-2 to fix MAPREDUCE-4520. Added support for MapReduce applications to request for CPU cores along-with memory post YARN-2. Contributed by Arun C. Murthy.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430690 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 05:31:53 +00:00
Arun Murthy
b412841745
Merge -c 1430682 from trunk to branch-2 to fix YARN-2. Enhanced CapacityScheduler to account for CPU alongwith memory for multi-dimensional resource scheduling. Contributed by Arun C. Murthy.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430683 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 05:17:31 +00:00
Thomas Graves
8c9b47c29e
MAPREDUCE-4899 fix branch-2 merge issue in pom
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430470 13f79535-47bb-0310-9956-ffa450edef68
2013-01-08 19:53:32 +00:00
Thomas White
75878f6c7b
Merge -r 1430362:1430363 from trunk to branch-2. Fixes: MAPREDUCE-4278. Cannot run two local jobs in parallel from the same gateway. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430369 13f79535-47bb-0310-9956-ffa450edef68
2013-01-08 16:31:58 +00:00
Vinod Kumar Vavilapalli
9a87b2f7fe
MAPREDUCE-4920. Use security token protobuf definition from hadoop common. Contributed by Suresh Srinivas.
...
svn merge --ignore-ancestry -c 1429751 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429752 13f79535-47bb-0310-9956-ffa450edef68
2013-01-07 11:15:10 +00:00
Thomas Graves
b035a444e1
MAPREDUCE-4913. TestMRAppMaster#testMRAppMasterMissingStaging occasionally exits (Jason Lowe via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429376 13f79535-47bb-0310-9956-ffa450edef68
2013-01-05 20:19:18 +00:00
Robert Joseph Evans
199df2b770
svn merge -c 1429114 FIXES: MAPREDUCE-4819. AM can rerun job after reporting final job status to the client (bobby and Bikas Saha via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429115 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 20:38:36 +00:00
Thomas Graves
2cb090a075
MAPREDUCE-4894. Renewal / cancellation of JobHistory tokens (Siddharth Seth via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429105 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 20:31:22 +00:00
Jason Darrell Lowe
ec4fc07c52
svn merge -c 1429040 FIXES: MAPREDUCE-4832. MR AM can get in a split brain situation. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429046 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 19:27:56 +00:00
Robert Joseph Evans
6862511182
svn merge -c 1428482
FIXES: MAPREDUCE-4279. getClusterStatus() fails with null pointer exception when running jobs in local mode (Devaraj K via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428489 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 17:21:27 +00:00
Robert Joseph Evans
52742c9a65
svn merge -c 1426536 FIXES: MAPREDUCE-4813. AM timing out during job commit (jlowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426539 13f79535-47bb-0310-9956-ffa450edef68
2012-12-28 15:06:15 +00:00
Jason Darrell Lowe
7bec80179b
svn merge -c 1426018 FIXES: MAPREDUCE-4902. Fix typo "receievd" should be "received" in log output. Contributed by Albert Chu
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426020 13f79535-47bb-0310-9956-ffa450edef68
2012-12-26 20:49:39 +00:00
Vinod Kumar Vavilapalli
121a79c7a1
MAPREDUCE-4899. Implemented a MR specific plugin for tracking finished applications that YARN's ResourceManager doesn't keep track off anymore. Contributed by Derek Dagit.
...
svn merge --ignore-ancestry -c 1425225 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425226 13f79535-47bb-0310-9956-ffa450edef68
2012-12-22 01:49:02 +00:00
Jason Darrell Lowe
5b6115e3bb
svn merge -c 1425223 FIXES: MAPREDUCE-4890. Invalid TaskImpl state transitions when task fails while speculating. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425224 13f79535-47bb-0310-9956-ffa450edef68
2012-12-22 01:46:05 +00:00
Luke Lu
307a46f6be
MAPREDUCE-4272. SortedRanges.Range#compareTo is not spec compliant. (Yu Gao via llu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425179 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 23:08:54 +00:00
Jason Darrell Lowe
043fd00a30
svn merge -c 1425167 FIXES: MAPREDUCE-4833. Task can get stuck in FAIL_CONTAINER_CLEANUP. Contributed by Robert Parker
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425168 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 22:34:41 +00:00
Jason Darrell Lowe
891e616d51
svn merge -c 1425071 FIXES: MAPREDUCE-4842. Shuffle race can hang reducer. Contributed by Mariappan Asokan
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425074 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 18:32:57 +00:00
Luke Lu
8636b12e35
YARN-223. Update process tree instead of getting new process trees. (Radim Kolar via llu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424242 13f79535-47bb-0310-9956-ffa450edef68
2012-12-20 00:19:40 +00:00
Thomas White
01c5d0eb77
Merge -r 1423469:1423470 from trunk to branch-2. Fixes: MAPREDUCE-4845. ClusterStatus.getMaxMemory() and getUsedMemory() exist in MR1 but not MR2. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1423471 13f79535-47bb-0310-9956-ffa450edef68
2012-12-18 15:25:09 +00:00
Thomas White
fc70cd9538
Merge -r 1420633:1420634 from trunk to branch-2. Fixes: MAPREDUCE-4856. TestJobOutputCommitter uses same directory as TestJobCleanup. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420635 13f79535-47bb-0310-9956-ffa450edef68
2012-12-12 12:14:08 +00:00
Alejandro Abdelnur
1fce56fd24
MAPREDUCE-4549. Distributed cache conflicts breaks backwards compatability. (Robert Evans via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420363 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 19:50:32 +00:00
Alejandro Abdelnur
680b437f2f
MAPREDUCE-4861. Cleanup: Remove unused mapreduce.security.token.DelegationTokenRenewal. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420350 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 19:29:18 +00:00
Jason Darrell Lowe
e2c0cf69ca
svn merge -c 1420232 FIXES: YARN-266. RM and JHS Web UIs are blank because AppsBlock is not escaping string properly. Contributed by Ravi Prakash
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420233 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 15:51:12 +00:00
Alejandro Abdelnur
89b9fc3034
MAPREDUCE-4703. Add the ability to start the MiniMRClientCluster using the configurations used before it is being stopped. (ahmed.radwan via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1419619 13f79535-47bb-0310-9956-ffa450edef68
2012-12-10 18:10:22 +00:00
Jonathan Turner Eagles
77933c6327
MAPREDUCE-4836. Elapsed time for running tasks on AM web UI tasks page is 0. (Ravi Prakash via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1415863 13f79535-47bb-0310-9956-ffa450edef68
2012-11-30 21:51:38 +00:00
Thomas Graves
b432cf076e
merge -r 1414872:1414873 from trunk. FIXES: MAPREDUCE-4817
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414876 13f79535-47bb-0310-9956-ffa450edef68
2012-11-28 19:24:27 +00:00
Robert Joseph Evans
3e0d0cf08f
svn merge -c 1414840 FIXES: MAPREDUCE-4825. JobImpl.finished doesn't expect ERROR as a final job state (jlowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414842 13f79535-47bb-0310-9956-ffa450edef68
2012-11-28 17:54:10 +00:00
Robert Joseph Evans
ff97561e05
svn merge -c 1413739 FIXES: MAPREDUCE-4764. repair TestBinaryTokenFile (Ivan A. Veselovsky via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1413741 13f79535-47bb-0310-9956-ffa450edef68
2012-11-26 17:38:53 +00:00
Jason Darrell Lowe
6e6b09dfba
svn merge -c 1412377 FIXES: MAPREDUCE-4811. JobHistoryServer should show when it was started in WebUI About page. Contributed by Ravi Prakash
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1412378 13f79535-47bb-0310-9956-ffa450edef68
2012-11-22 00:11:02 +00:00
Siddharth Seth
fa6b7fca7a
merge MAPREDUCE-4723 amendment from trunk. Fix JobHistory Event handling. (Contributed by Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411293 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 16:44:28 +00:00
Thomas White
db8545d924
Merge -r 1411234:1411235 from trunk to branch-2. Fixes: YARN-129. Simplify classpath construction for mini YARN tests.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411239 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 15:16:57 +00:00
Alejandro Abdelnur
63d27f591c
MAPREDUCE-4800. Cleanup o.a.h.mapred.MapTaskStatus - remove unused code. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410701 13f79535-47bb-0310-9956-ffa450edef68
2012-11-17 06:16:58 +00:00
Robert Joseph Evans
19748556f8
svn merge -c 1410498 FIXES: MAPREDUCE-4802. Takes a long time to load the task list on the AM for large jobs (Ravi Prakash via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410502 13f79535-47bb-0310-9956-ffa450edef68
2012-11-16 17:32:31 +00:00
Robert Joseph Evans
34abf278dd
svn merge -c 1410131 FIXES: MAPREDUCE-4801. ShuffleHandler can generate large logs due to prematurely closed channels (jlowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410132 13f79535-47bb-0310-9956-ffa450edef68
2012-11-16 00:55:56 +00:00
Eli Collins
3bc91c97cb
MAPREDUCE-4723. Fix warnings found by findbugs 2. Contributed by Sandy Ryza
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409603 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 00:17:17 +00:00
Robert Joseph Evans
c26bf3b838
svn merge -c 1409580
FIXES: MAPREDUCE-4720. Browser thinks History Server main page JS is taking too long (Ravi Prakash via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409583 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 00:02:52 +00:00
Robert Joseph Evans
3b9bb65473
svn merge -c 1409525 FIXES: MAPREDUCE-4797. LocalContainerAllocator can loop forever trying to contact the RM (jlowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409528 13f79535-47bb-0310-9956-ffa450edef68
2012-11-14 23:06:48 +00:00
Jason Darrell Lowe
8ca6059743
svn merge -c 1409313 FIXES: YARN-216. Remove jquery theming support. Contributed by Robert Joseph Evans.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409314 13f79535-47bb-0310-9956-ffa450edef68
2012-11-14 19:26:54 +00:00
Thomas Graves
6a743f3f5b
merge -r 1409031:1409032 from trunk. FIXES: MAPREDUCE-4517
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409034 13f79535-47bb-0310-9956-ffa450edef68
2012-11-13 23:49:04 +00:00
Robert Joseph Evans
32850b486b
svn merge -c 1408444 FIXES: MAPREDUCE-4786. Job End Notification retry interval is 5 milliseconds by default (Ravi Prakash via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408447 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 20:38:55 +00:00
Robert Joseph Evans
ec861244a2
svn merge -c 1408360 FIXES: MAPREDUCE-4425. Speculation + Fetch failures can lead to a hung job (jlowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408361 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 17:19:58 +00:00
Robert Joseph Evans
b3c28a5753
svn merge -c 1408355 FIXES: MAPREDUCE-4787. TestJobMonitorAndPrint is broken (Rob Parker via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408357 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 17:07:22 +00:00
Robert Joseph Evans
74656788e5
svn merge -c 1408314 FIXES: MAPREDUCE-4751. AM stuck in KILL_WAIT for days (vinodkv via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408316 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 15:19:41 +00:00
Thomas White
d488a59497
Merge -r 1407657:1407658 from trunk to branch-2. Fixes: HADOOP-8860. Split MapReduce and YARN sections in documentation navigation.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408290 13f79535-47bb-0310-9956-ffa450edef68
2012-11-12 13:57:19 +00:00
Robert Joseph Evans
b8f37b3b36
svn merge -c 1407679
FIXES: MAPREDUCE-4774. JobImpl does not handle asynchronous task events in FAILED state (jlowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407682 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 23:00:57 +00:00
Jonathan Turner Eagles
1d58a7b5b3
MAPREDUCE-4666. JVM metrics for history server. (jlowe via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407670 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 22:22:16 +00:00
Robert Joseph Evans
82ccfb726a
svn merge -c 1407505 FIXES: MAPREDUCE-4782. NLineInputFormat skips first line of last InputSplit (Mark Fuhs via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407506 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 15:53:52 +00:00
Robert Joseph Evans
6b3db6eabd
svn merge -c 1407118 FIXES: MAPREDUCE-4772. Fetch failures can take way too long for a map to be restarted (bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407126 13f79535-47bb-0310-9956-ffa450edef68
2012-11-08 15:21:36 +00:00
Thomas White
501b2758ce
Merge -r 1406644:1406645 from trunk to branch-2. Fixes: MAPREDUCE-4777. In TestIFile, testIFileReaderWithCodec relies on testIFileWriterWithCodec. Contributed by Sandy Ryza
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1406647 13f79535-47bb-0310-9956-ffa450edef68
2012-11-07 14:12:55 +00:00
Robert Joseph Evans
cb0f68cc3f
svn merge -c 1405975. FIXES: MAPREDUCE-4771. KeyFieldBasedPartitioner not partitioning properly when configured (jlowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1405988 13f79535-47bb-0310-9956-ffa450edef68
2012-11-05 22:16:51 +00:00
Robert Joseph Evans
11822fb8ab
svn merge -c 1404988 FIXES: MAPREDUCE-4763 repair test TestUmbilicalProtocolWithJobToken (Ivan A. Veselovsky via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404991 13f79535-47bb-0310-9956-ffa450edef68
2012-11-02 15:05:06 +00:00
Jason Darrell Lowe
a280cd5567
svn merge -c 1404817 FIXES: MAPREDUCE-4729. job history UI not showing all job attempts. Contributed by Vinod Kumar Vavilapalli
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404824 13f79535-47bb-0310-9956-ffa450edef68
2012-11-01 23:05:53 +00:00
Robert Joseph Evans
d9e5740ce7
svn merge -c 1404674 FIXES: MAPREDUCE-4746. The MR Application Master does not have a config to set environment variables (Rob Parker via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404676 13f79535-47bb-0310-9956-ffa450edef68
2012-11-01 17:07:24 +00:00
Robert Joseph Evans
9d689a9db9
svn merge -c 1404305 FIXES: MAPREDUCE-4724. job history web ui applications page should be sorted to display last app first (tgraves via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404306 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 19:13:59 +00:00
Thomas Graves
b958fa85a5
merge -r 1404176:1404177 from trunk. FIXES: MAPREDUCE-4752
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404182 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 15:02:59 +00:00
Alejandro Abdelnur
d3e2e2cb68
MAPREDUCE-1806. CombineFileInputFormat does not work with paths not on default FS. (Gera Shegalov via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1403618 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 05:52:17 +00:00
Jason Darrell Lowe
58c43cc8cb
svn merge -c 1402658 FIXES: MAPREDUCE-4748. Invalid event: T_ATTEMPT_SUCCEEDED at SUCCEEDED. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402664 13f79535-47bb-0310-9956-ffa450edef68
2012-10-26 21:05:33 +00:00
Vinod Kumar Vavilapalli
79a14bb25f
MAPREDUCE-4730. Fix Reducer's EventFetcher to scale the map-completion requests slowly to avoid HADOOP-8942. Contributed by Jason Lowe.
...
svn merge --ignore-ancestry -c 1401941 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401942 13f79535-47bb-0310-9956-ffa450edef68
2012-10-25 01:27:17 +00:00
Jason Darrell Lowe
33cb0be07c
svn merge -c 1401738 FIXES: MAPREDUCE-4741. WARN and ERROR messages logged during normal AM shutdown. Contributed by Vinod Kumar Vavilapalli
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401741 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 15:47:01 +00:00
Jason Darrell Lowe
b702473f5c
svn merge -c 1401726 FIXES: YARN-139. Interrupted Exception within AsyncDispatcher leads to user confusion. Contributed by Vinod Kumar Vavilapalli
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401729 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 15:25:22 +00:00
Daryn Sharp
7b36e659c1
svn merge -c 1401467/1401473 FIXES: MAPREDUCE-4229. Intern counter names in the JT (bobby via daryn)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401483 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 21:10:17 +00:00
Siddharth Seth
5d200b2ab3
merge MAPREDUCE-4637 from trunk. Handle TaskAttempt diagnostic updates while in the NEW and UNASSIGNED states. (Contributed by Mayank Bansal)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401475 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 21:03:17 +00:00
Jason Darrell Lowe
43159cc20d
svn merge -c 1401054
FIXES: MAPREDUCE-4740. only .jars can be added to the Distributed Cache classpath. Contributed by Robert Joseph Evans
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401058 13f79535-47bb-0310-9956-ffa450edef68
2012-10-22 19:58:01 +00:00
Vinod Kumar Vavilapalli
3d8fa1d6c4
MAPREDUCE-4733. Reducer can fail to make progress during shuffle if too many reducers complete consecutively. Contributed by Jason Lowe.
...
svn merge --ignore-ancestry -c 1400264 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400266 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 20:20:03 +00:00
Robert Joseph Evans
edd3bc5cc2
svn merge -c 1400192 FIXES: MAPREDUCE-4479. Fix parameter order in assertEquals() in TestCombineInputFileFormat.java (Mariappan Asokan via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400194 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 17:53:18 +00:00
Vinod Kumar Vavilapalli
5944b1c703
MAPREDUCE-4596. Split StateMachine state from states seen by MRClientProtocol for Job, Task and TaskAttempt. Contributed by Siddarth Seth.
...
svn merge --ignore-ancestry -c 1399976 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399977 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 05:59:25 +00:00
Robert Joseph Evans
070ae0d73e
svn merge -c 1399289 FIXES: MAPREDUCE-4721. Task startup time in JHS is same as job startup time. (Ravi Prakash via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399291 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 15:01:10 +00:00
Robert Joseph Evans
0f4838ab6b
svn merge -c 1399011. FIXES: MAPREDUCE-4521. mapreduce.user.classpath.first incompatibility with 0.20/1.x (Ravi Prakash via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399012 13f79535-47bb-0310-9956-ffa450edef68
2012-10-16 22:00:51 +00:00
Suresh Srinivas
3a9aadc3c7
HADOOP-8911. CRLF characters in source and text files (trunk equivalent patch). Contributed Raja Aluri.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397435 13f79535-47bb-0310-9956-ffa450edef68
2012-10-12 04:48:40 +00:00
Arun Murthy
267bfc5ff2
Merge -c 1397182 from trunk to branch-2 to fix MAPREDUCE-4616. Improve javadoc for MultipleOutputs. Contributed by Tony Burton.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1397183 13f79535-47bb-0310-9956-ffa450edef68
2012-10-11 17:22:27 +00:00
Harsh J
9a0f100130
MAPREDUCE-3678. The Map tasks logs should have the value of input split it processed. Contributed by Harsh J. (harsh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396034 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 13:41:45 +00:00
Siddharth Seth
7e55280b5b
merge MAPREDUCE-4705 from trunk. Fix a bug in job history lookup, which makes older jobs inaccessible despite the presence of a valid history file. (Contributed by Jason Lowe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395851 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 03:24:43 +00:00
Siddharth Seth
b98a3a3787
merge YARN-134 from trunk. Fixes ClientToAMSecretManager creates keys without checking for validity of the appID. (Contributed by Vinod Kumar Vavilapalli)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395843 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 01:58:07 +00:00
Robert Joseph Evans
09f0aee7f8
svn merge -c 1395769 FIXES: MAPREDUCE-4554. Job Credentials are not transmitted if security is turned off (Benoy Antony via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395772 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 20:55:21 +00:00
Robert Joseph Evans
81b14fae80
svn merge -c 1391679 FIXES: MAPREDUCE-4689. JobClient.getMapTaskReports on failed job results in NPE (jlowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391680 13f79535-47bb-0310-9956-ffa450edef68
2012-09-28 22:18:32 +00:00
Jason Darrell Lowe
f40997309e
svn merge -c 1391671 FIXES: MAPREDUCE-4691. Historyserver can report "Unknown job" after RM says job has completed. Contributed by Robert Joseph Evans.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391675 13f79535-47bb-0310-9956-ffa450edef68
2012-09-28 22:00:42 +00:00
Arun Murthy
e619da2136
Reverted MAPREDUCE-4253 from branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390655 13f79535-47bb-0310-9956-ffa450edef68
2012-09-26 18:43:17 +00:00
Thomas Graves
e5e1887092
merge -r 1390556:1390557 from trunk. FIXES: MAPREDUCE-4647
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390563 13f79535-47bb-0310-9956-ffa450edef68
2012-09-26 15:25:05 +00:00
Arun Murthy
6667d885bb
Merge -c 1390218 from trunk to branch-2 to fix MAPREDUCE-4649. Ensure MapReduce JobHistory Daemon doens't assume HADOOP_YARN_HOME and HADOOP_MAPRED_HOME are the same. Contributed by Vinod K V.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390226 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 23:50:03 +00:00
Konstantin Shvachko
1aba4503cf
MAPREDUCE-4651. Benchmarking random reads with DFSIO. Contributed by Konstantin Shvachko.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390161 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 21:36:30 +00:00
Konstantin Shvachko
7cf9362055
MAPREDUCE-4645. Provide a random seed to Slive to make the sequence of file names deterministic. Contributed by Ravi Prakash.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1389595 13f79535-47bb-0310-9956-ffa450edef68
2012-09-24 21:17:29 +00:00
Thomas White
9e1860bfbf
Merge -r 1384832:1384833 from trunk to branch-2. Fixes: HADOOP-8780. Update DeprecatedProperties apt file.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1384835 13f79535-47bb-0310-9956-ffa450edef68
2012-09-14 16:15:20 +00:00
Aaron Myers
ac103a4314
HADOOP-8755. Print thread dump when tests fail due to timeout. Contributed by Andrey Klochkov.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1384628 13f79535-47bb-0310-9956-ffa450edef68
2012-09-14 01:50:35 +00:00
Vinod Kumar Vavilapalli
a5e50dfae9
MAPREDUCE-4646. Fixed MR framework to send diagnostic information correctly to clients in case of failed jobs also. Contributed by Jason Lowe.
...
svn merge --ignore-ancestry -c 1383709 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383710 13f79535-47bb-0310-9956-ffa450edef68
2012-09-12 00:59:59 +00:00
Eli Collins
8644881db7
HDFS-3910. DFSTestUtil#waitReplication should timeout. Contributed by Eli Collins
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383619 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 21:28:53 +00:00
Thomas White
803905eb5a
Merge -r 1383421:1383422 from trunk to branch-2. Fixes: MAPREDUCE-4607. Race condition in ReduceTask completion can result in Task being incorrectly failed. Contributed by Bikas Saha.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383425 13f79535-47bb-0310-9956-ffa450edef68
2012-09-11 14:13:58 +00:00
Arun Murthy
f403be7569
Set version in branch-2 to 2.0.3-SNAPSHOT
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382809 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 12:57:48 +00:00
Alejandro Abdelnur
2cdffe63d5
MAPREDUCE-4642. MiniMRClientClusterFactory should not use job.setJar() (rkanter via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382094 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 17:06:55 +00:00
Robert Joseph Evans
ebb1a16f62
svn merge -c 1382088 FIXES: MAPREDUCE-4629. Remove JobHistory.DEBUG_MODE (Karthik Kambatla via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382089 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 16:47:04 +00:00
Arun Murthy
b9a3f51dcd
Merge -c r1381868 from trunk to branch-2 to fix MR AM supplies MapReduce jars in classpath rather than rely on YARN. Contributed by Arun C Murthy.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381869 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 04:59:20 +00:00
Robert Joseph Evans
928e6864d3
svn merge -c 1381784 FIXES: MAPREDUCE-4641. Exception in commitJob marks job as successful in job history (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381786 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 22:22:01 +00:00
Robert Joseph Evans
2616974383
svn merge -c 1381614 FIXES: MAPREDUCE-4633. history server doesn't set permissions on all subdirs (tgraves via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381618 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 14:22:04 +00:00
Eli Collins
515dfba075
Fix MAPREDUCE-4580 build breakage.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381316 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 19:36:28 +00:00
Konstantin Shvachko
54ca8b837c
MAPREDUCE-2786. Add compression option for TestDFSIO. Contributed by Plamen Jeliazkov.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1380308 13f79535-47bb-0310-9956-ffa450edef68
2012-09-03 18:50:28 +00:00
Jonathan Turner Eagles
a64a30ce6c
svn merge -c 1379617 from trunk FIXES: MAPREDUCE-4604. In mapred-default, mapreduce.map.maxattempts & mapreduce.reduce.maxattempts defaults are set to 4 as well as mapreduce.job.maxtaskfailures.per.tracker. (Ravi Prakash via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379622 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 21:31:23 +00:00
Thomas Graves
c54a74a2cc
merge -r 1379598:1379599 from trunk. FIXES: MAPREDUCE-4611
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379602 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 20:45:34 +00:00
Robert Joseph Evans
8ef7e47241
svn merge -c 1379595 FIXES: MAPREDUCE-4614. Simplify debugging a job's tokens (daryn via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379596 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 20:39:03 +00:00
Robert Joseph Evans
b2382b0cd4
svn merge -c 1379584 FIXES: MAPREDUCE-4612. job summary file permissions not set when its created (tgraves via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379585 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 20:26:26 +00:00
Vinod Kumar Vavilapalli
e591c4f4dc
MAPREDUCE-4569. Fixed TestHsWebServicesJobsQuery to pass on JDK7 by not depending on test order. Contributed by Thomas Graves.
...
svn merge --ignore-ancestry -c 1379146 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379148 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 21:04:05 +00:00
Robert Joseph Evans
0fb6e7626f
HADOOP-8726. The Secrets in Credentials are not available to MR tasks (daryn and Benoy Antony via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379105 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 19:59:53 +00:00
Thomas White
9f94b89742
Merge -r 1379021:1379022 from trunk to branch-2. Fixes: MAPREDUCE-4610. Support deprecated mapreduce.job.counters.limit property in MR2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379023 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 17:14:07 +00:00
Thomas White
ebbb304022
Merge -r 1378872:1378873 from trunk to branch-2. Fixes: MAPREDUCE-4608. hadoop-mapreduce-client is missing some dependencies.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1378874 13f79535-47bb-0310-9956-ffa450edef68
2012-08-30 10:02:31 +00:00
Vinod Kumar Vavilapalli
14b1cf459b
MAPREDUCE-4579. Split TestTaskAttempt into two so as to pass tests on jdk7. Contributed by Thomas Graves.
...
svn merge --ignore-ancestry -c 1377943 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377944 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 02:05:25 +00:00
Siddharth Seth
a1c556ca19
merge MAPREDUCE-4580 from trunk. Change MapReduce to use the yarn-client module. (Contributed by Vinod Kumar Vavilapalli)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377924 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 00:41:03 +00:00
Siddharth Seth
bf08346d3c
merge YARN-39 from trunk. RM-NM secret-keys should be randomly generated and rolled every so often. (Contributed by Vinod Kumar Vavilapalli and Siddharth Seth)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377181 13f79535-47bb-0310-9956-ffa450edef68
2012-08-25 02:25:12 +00:00
Alejandro Abdelnur
2ff2b79e33
MAPREDUCE-4408. allow jobs to set a JAR that is in the distributed cached (rkanter via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377150 13f79535-47bb-0310-9956-ffa450edef68
2012-08-24 23:38:21 +00:00
Robert Joseph Evans
bc5f02bac0
svn merge -c 1376618 FIXES: HADOOP-8225. DistCp fails when invoked by Oozie (daryn via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376621 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 18:07:59 +00:00
Alejandro Abdelnur
6e831b0f5e
MAPREDUCE-4470. Fix TestCombineFileInputFormat.testForEmptyFile (ikatsov via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376326 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 00:24:36 +00:00
Aaron Myers
0490537635
MAPREDUCE-4577. HDFS-3672 broke TestCombineFileInputFormat.testMissingBlocks() test. Contributed by Aaron T. Myers.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376298 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 22:45:30 +00:00
Alejandro Abdelnur
d7a90bc552
MAPREDUCE-4068. Jars in lib subdirectory of the submittable JAR are not added to the classpath (rkanter via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376255 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 21:23:09 +00:00
Robert Joseph Evans
1ee0c23b39
svn merge -c 1375687 FIXES: MAPREDUCE-4570. ProcfsBasedProcessTree#constructProcessInfo() prints a warning if procfsDir/<pid>/stat is not found. (Ahmed Radwan via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375691 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 17:47:08 +00:00
Robert Joseph Evans
f3f8edbd10
svn merge -c 1375602 FIXES: MAPREDUCE-3506. Calling getPriority on JobInfo after parsing a history log with JobHistoryParser throws a NullPointerException (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375604 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 15:21:30 +00:00
Thomas Graves
e94632c765
merge -r 1374423:1374424 from trunk. FIXES: YARN-25
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374425 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 20:31:09 +00:00
Daryn Sharp
a8f10869a8
svn merge -c 1374271 FIXES: HADOOP-7967. Need generalized multi-token filesystem support (daryn)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374346 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 16:26:01 +00:00
Thomas White
832e7c6dc3
Merge -r 1373822:1373823 from trunk to branch-2. Fixes: MAPREDUCE-4562. Support for "FileSystemCounter" legacy counter group name for compatibility reasons is creating incorrect counter name.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373824 13f79535-47bb-0310-9956-ffa450edef68
2012-08-16 13:27:24 +00:00
Tsz-wo Sze
1294ad1df7
svn merge -c 1373683 from trunk for HADOOP-8700. Use enum to define the checksum constants in DataChecksum.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373686 13f79535-47bb-0310-9956-ffa450edef68
2012-08-16 01:42:16 +00:00
Alejandro Abdelnur
fc783dcc1e
MAPREDUCE-4511. Add IFile readahead (ahmed via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1373671 13f79535-47bb-0310-9956-ffa450edef68
2012-08-15 23:11:00 +00:00
Alejandro Abdelnur
b344870bdd
HADOOP-8681. add support for HTTPS to the web UIs. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372642 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 21:56:31 +00:00
Thomas Graves
6f516ea1bf
merge -r 1372635:1372636 from trunk. FIXES: MAPREDUCE-4053
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372638 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 21:50:21 +00:00
Arun Murthy
92a99de731
Merge -c 1370666 from trunk to branch-2 to fix YARN-1. Promote YARN to be a sub-project of Apache Hadoop.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370667 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 05:33:56 +00:00
Alejandro Abdelnur
2a178a8d0b
Merge -r 1369905:1369906 from trunk to branch. FIXES: MAPREDUCE-4498
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1369908 13f79535-47bb-0310-9956-ffa450edef68
2012-08-06 18:15:35 +00:00
Jonathan Turner Eagles
054dd2d39c
svn merge -c 1369197 FIXES: MAPREDUCE-4503. Should throw InvalidJobConfException if duplicates found in cacheArchives or cacheFiles (Robert Evans via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1369201 13f79535-47bb-0310-9956-ffa450edef68
2012-08-03 20:42:18 +00:00
Siddharth Seth
f7545f076e
Merge MAPREDUCE-3289 from trunk. Make use of fadvise in the NM's shuffle handler. (Contributed by Todd Lipcon and Siddharth Seth)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368722 13f79535-47bb-0310-9956-ffa450edef68
2012-08-02 21:57:42 +00:00
Thomas Graves
6b3c8934f3
merge -r 1368293:1368294 from trunk. FIXES: MAPREDUCE-4504
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1368296 13f79535-47bb-0310-9956-ffa450edef68
2012-08-01 22:20:59 +00:00
Jonathan Turner Eagles
d40b6be2f5
svn merge -c 1367789 FIXES: MAPREDUCE-4234. SortValidator.java is incompatible with multi-user or parallel use (due to a /tmp file with static name) (Robert Evans via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367793 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 21:45:45 +00:00
Thomas Graves
66d468eece
merge -r 1367770:1367771 from trunk. FIXES: MAPREDUCE-4457
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367772 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 20:53:45 +00:00
Thomas Graves
5a17a40ee6
merge -r 1367712:1367713 from trunk. FIXES: MAPREDUCE-4493
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367715 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 19:21:27 +00:00
Robert Joseph Evans
6fe821a14a
svn merge -c 1367601 FIXES: MAPREDUCE-4496. AM logs link is missing user name (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367602 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 15:09:49 +00:00
Thomas Graves
a1a7ee23f7
merge -r 1367580:1367581 from trunk. FIXES: MAPREDUCE-4456
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367585 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 14:49:07 +00:00
Thomas Graves
ca7732aae9
merge -r 1367538:1367539 from trunk. FIXES: MAPREDUCE-4375
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1367540 13f79535-47bb-0310-9956-ffa450edef68
2012-07-31 13:40:39 +00:00
Thomas Graves
4850bf623c
merge -r 1366257:1366258 from trunk. FIXES: MAPREDUCE-4423
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1366260 13f79535-47bb-0310-9956-ffa450edef68
2012-07-27 01:48:54 +00:00
Alejandro Abdelnur
f00a592fe9
Merge -r 1365978:1365979 from trunk to branch. FIXES: MAPREDUCE-4417
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365982 13f79535-47bb-0310-9956-ffa450edef68
2012-07-26 13:25:41 +00:00
Thomas Graves
dce4a7c765
merge -r 1365239:1365240 from trunk. FIXES: MAPREDUCE-4467
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1365241 13f79535-47bb-0310-9956-ffa450edef68
2012-07-24 19:28:43 +00:00
Alejandro Abdelnur
3298bb541c
Merge -r 1364019:1364020 from trunk to branch. FIXES: MAPREDUCE-987
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1364117 13f79535-47bb-0310-9956-ffa450edef68
2012-07-21 16:26:00 +00:00
Thomas Graves
45c42817ca
svn merge --change -1363455 for reverting MAPREDUCE-4423
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363936 13f79535-47bb-0310-9956-ffa450edef68
2012-07-20 20:21:09 +00:00
Thomas Graves
5568bf8260
merge -r 1363453:1363454 from trunk. FIXES: MAPREDUCE-4423
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1363455 13f79535-47bb-0310-9956-ffa450edef68
2012-07-19 18:22:03 +00:00
Alejandro Abdelnur
bd359a1a8e
Merge -r 1362750:1362751 from trunk to branch. FIXES: MAPREDUCE-4406
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362752 13f79535-47bb-0310-9956-ffa450edef68
2012-07-18 03:37:38 +00:00
Alejandro Abdelnur
c22cddbad1
Merge -r 1362721:1362722 from trunk to branch. FIXES: MAPREDUCE-4422
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362723 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 23:34:38 +00:00
Robert Joseph Evans
f8bd54b16a
svn merge -c 1362612 FIXES: MAPREDUCE-4380. Empty Userlogs directory is getting created under logs directory (Devaraj K via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362613 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 19:15:30 +00:00
Robert Joseph Evans
71b35e827c
svn merge -c 1362608 FIXES: MAPREDUCE-4283. Display tail of aggregated logs by default (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362609 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 19:08:26 +00:00
Robert Joseph Evans
796272a502
svn merge -c 1362495 FIXES: MAPREDUCE-4449. Incorrect MR_HISTORY_STORAGE property name in JHAdminConfig (Ahmed Radwan via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362496 13f79535-47bb-0310-9956-ffa450edef68
2012-07-17 13:51:52 +00:00
Robert Joseph Evans
0d1867fa9d
svn merge -c 1362209 FIXES: MAPREDUCE-4437. Race in MR ApplicationMaster can cause reducers to never be scheduled (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1362213 13f79535-47bb-0310-9956-ffa450edef68
2012-07-16 19:13:10 +00:00
Arun Murthy
4902c6bdc9
Merge -c 1361813 from trunk to branch-2 to fix MAPREDUCE-4427. Added an 'unmanaged' mode for AMs so as to ease development of new applications. Contributed by Bikas Saha.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361815 13f79535-47bb-0310-9956-ffa450edef68
2012-07-15 21:47:53 +00:00
Robert Joseph Evans
3260960be3
svn merge -c 1361389 FIXES: MAPREDUCE-4419. ./mapred queue -info <queuename> -showJobs displays all the jobs irrespective of <queuename> (Devaraj K via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361391 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 20:45:05 +00:00
Harsh J
f457ffb05b
Backport of MAPREDUCE-4432 from trunk. Confusing warning message when GenericOptionsParser is not used. Contributed by Gabriel Reid. (harsh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1361275 13f79535-47bb-0310-9956-ffa450edef68
2012-07-13 15:23:09 +00:00
Robert Joseph Evans
75af3cba6b
svn merge -c 1360735 FIXES: MAPREDUCE-4416. Some tests fail if Clover is enabled (Kihwal Lee via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360737 13f79535-47bb-0310-9956-ffa450edef68
2012-07-12 15:53:38 +00:00
Harsh J
91472c5539
Backport of HADOOP-3886 from trunk. svn merge -c 1360222 ../../trunk (harsh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1360224 13f79535-47bb-0310-9956-ffa450edef68
2012-07-11 15:07:34 +00:00
Vinod Kumar Vavilapalli
60ad1056af
MAPREDUCE-3940. ContainerTokens should have an expiry interval. Contributed by Siddharth Seth and Vinod Kumar Vavilapalli.
...
svn merge -c 1359910 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359912 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 21:33:04 +00:00
Robert Joseph Evans
aaea868826
svn merge -c 1359747. FIXES: MAPREDUCE-4252. MR2 job never completes with 1 pending task (Tom White via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359749 13f79535-47bb-0310-9956-ffa450edef68
2012-07-10 16:11:23 +00:00
Thomas Graves
5ecf46efb6
merge -r 1359398:1359399 from trunk. FIXES: MAPREDUCE-4300
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359400 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 21:10:09 +00:00
Alejandro Abdelnur
3097c15d9d
Merge -r 1359344:1359345 from trunk to branch. FIXES: MAPREDUCE-3993
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359347 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 19:19:42 +00:00
Robert Joseph Evans
2353571c64
svn merge -c 1359252 FIXES: MAPREDUCE-4402. TestFileInputFormat fails intermittently (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1359253 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 16:15:12 +00:00
Harsh J
41553468b1
Backport HADOOP-3907 from trunk (svn merge -c 1358892). (harsh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358894 13f79535-47bb-0310-9956-ffa450edef68
2012-07-09 02:02:53 +00:00
Harsh J
b035a14d58
Backport of MAPREDUCE-2220. svn merge -c 1358788 from trunk. (harsh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1358789 13f79535-47bb-0310-9956-ffa450edef68
2012-07-08 17:24:38 +00:00
Thomas Graves
ca78b62579
merge -r 1357936:1357937 from trunk. FIXES: MAPREDUCE-4384
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357940 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 21:37:53 +00:00
Robert Joseph Evans
93f425a659
svn merge -c 1357776 FIXES: MAPREDUCE-4392. Counters.makeCompactString() changed behavior from 0.20 (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357777 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 18:10:51 +00:00
Alejandro Abdelnur
c25a45dc52
Merge -r 1357722:1357723 from trunk to branch. FIXES: MAPREDUCE-4355
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1357728 13f79535-47bb-0310-9956-ffa450edef68
2012-07-05 16:33:34 +00:00
Harsh J
f62de1d81e
svn merge -c 1355766 from trunk. Backport of MAPREDUCE-4253. Tests for mapreduce-client-core are lying under mapreduce-client-jobclient. Contributed by Tsuyoshi Ozawa. (harsh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355772 13f79535-47bb-0310-9956-ffa450edef68
2012-06-30 17:11:46 +00:00
Robert Joseph Evans
b38f46e73c
svn merge -c 1355124 FIXES: MAPREDUCE-4376. TestClusterMRNotification times out (Kihwal Lee via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1355125 13f79535-47bb-0310-9956-ffa450edef68
2012-06-28 19:30:22 +00:00
Alejandro Abdelnur
0b4c8a5875
Reverting MAPREDUCE-4346
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354658 13f79535-47bb-0310-9956-ffa450edef68
2012-06-27 18:33:38 +00:00
Robert Joseph Evans
4bb61ecbd7
svn merge -c 1354181 FIXES: MAPREDUCE-4228. mapreduce.job.reduce.slowstart.completedmaps is not working properly (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1354182 13f79535-47bb-0310-9956-ffa450edef68
2012-06-26 19:18:49 +00:00
Alejandro Abdelnur
df2f723a75
Merge -r 1353756:1353757 from trunk to branch. FIXES: MAPREDUCE-4355
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353760 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 22:01:01 +00:00
Alejandro Abdelnur
d21c6aa52f
Merge -r 1353749:1353750 from trunk to branch. FIXES: MAPREDUCE-2289
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353751 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 21:37:14 +00:00
Siddharth Seth
09ac40f800
Merge MAPREDUCE-4290 from trunk. Fix Yarn Applicaiton Status to MR JobState conversion. (Contributed by Devaraj K)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1353685 13f79535-47bb-0310-9956-ffa450edef68
2012-06-25 17:56:11 +00:00
Robert Joseph Evans
f63255faec
svn merge -c 1352330. FIXES: MAPREDUCE-3889. job client tries to use /tasklog interface, but that doesn't exist anymore (Devaraj K via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1352335 13f79535-47bb-0310-9956-ffa450edef68
2012-06-20 21:32:21 +00:00
Siddharth Seth
2846979f16
Merged MAPREDUCE-3921 from trunk. MR AM should act on node health status changes. Contributed by Bikas Saha
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1349066 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 23:16:08 +00:00
Thomas White
f323ea705d
Merge -r 1348996:1348997 from trunk to branch-2. Fixes: MAPREDUCE-3871.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348999 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 20:39:13 +00:00
Thomas Graves
4159a21d28
merge -r 1348845:1348846 from trunk. FIXES: MAPREDUCE-3927
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348848 13f79535-47bb-0310-9956-ffa450edef68
2012-06-11 13:57:15 +00:00
Thomas Graves
d1607ba557
merge -r 1348122:1348123 from trunk. FIXES: MAPREDUCE-3842
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1348126 13f79535-47bb-0310-9956-ffa450edef68
2012-06-08 15:51:21 +00:00
Thomas Graves
3dc10a25d9
merge -r 1346046:1346047 from trunk. FIXES: MAPREDUCE-3350
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346048 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 17:42:45 +00:00
Thomas Graves
c59349ede3
merge -r 1346001:1346002 from trunk. FIXES: MAPREDUCE-4301
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1346003 13f79535-47bb-0310-9956-ffa450edef68
2012-06-04 15:15:13 +00:00
Robert Joseph Evans
ed20ba2e49
svn merge -c 1344283. FIXES: MAPREDUCE-4152. map task left hanging after AM dies trying to connect to RM (Tom Graves via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1344288 13f79535-47bb-0310-9956-ffa450edef68
2012-05-30 14:52:39 +00:00
Harsh J
4200fa906e
svn merge -c 1343804 from trunk. Backport of MAPREDUCE-3493. (harsh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343809 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 16:15:25 +00:00
Thomas White
5e473c9c6e
Merge -r 1343754:1343755 from trunk to branch-2. Fixes: MAPREDUCE-4146
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343756 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 14:45:25 +00:00
Harsh J
1f804b5d20
svn merge -c 1343272 from trunk. Backport HADOOP-8268 to branch-2. Contributed by Radim Kolar (harsh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1343275 13f79535-47bb-0310-9956-ffa450edef68
2012-05-28 14:58:13 +00:00
Robert Joseph Evans
1586e827ed
i?\127svn merge -c 1341151. FIXES: MAPREDUCE-4274 MapOutputBuffer should use native byte order for kvmeta. (todd via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1341153 13f79535-47bb-0310-9956-ffa450edef68
2012-05-21 19:07:13 +00:00
Alejandro Abdelnur
00875b37f6
HADOOP-8403. bump up POMs version to 2.0.1-SNAPSHOT. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339326 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 19:46:30 +00:00
Thomas Graves
a1ce7813e9
merge -r 1339173:1339174 from trunk. FIXES: MAPREDUCE-4102
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1339177 13f79535-47bb-0310-9956-ffa450edef68
2012-05-16 14:10:35 +00:00
Robert Joseph Evans
5922f4f064
svn merge -c 1337363 FIXES: MAPREDUCE-4233. NPE can happen in RMNMNodeInfo. (bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337364 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 20:27:58 +00:00
Thomas White
dc576b9fa1
Merge -r 1337198:1337199 from trunk to branch-2. Fixes: MAPREDUCE-4148.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1337200 13f79535-47bb-0310-9956-ffa450edef68
2012-05-11 15:04:24 +00:00
Robert Joseph Evans
c35e442b1b
svn merge -c 1335585 FIXES: MAPREDUCE-3850. Avoid redundant calls for tokens in TokenCache (Daryn Sharp via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335587 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 15:26:11 +00:00
Robert Joseph Evans
4bc2774d79
svn merge -c 1335567 FIXES: MAPREDUCE-4162. Correctly set token service (Daryn Sharp via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335569 13f79535-47bb-0310-9956-ffa450edef68
2012-05-08 15:10:03 +00:00
Thomas White
f1e31ebaf2
Merge -r 1335196:1335197 from trunk to branch-2. Fixes: MAPREDUCE-4226
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1335198 13f79535-47bb-0310-9956-ffa450edef68
2012-05-07 19:07:29 +00:00
Robert Joseph Evans
13acee63d3
svn merge -c 1334013 FIXES: MAPREDUCE-4048. NullPointerException exception while accessing the Application Master UI (Devaraj K via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1334014 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 15:04:08 +00:00
Alejandro Abdelnur
9a04fc6caf
Merge -r 1333747:1333748 from trunk to branch. FIXES: MAPREDUCE-4205
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333749 13f79535-47bb-0310-9956-ffa450edef68
2012-05-04 03:21:15 +00:00
Robert Joseph Evans
c9aac0a1d1
svn merge -c 1333579 FIXES: MAPREDUCE-4163. consistently set the bind address (Daryn Sharp via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1333580 13f79535-47bb-0310-9956-ffa450edef68
2012-05-03 18:37:01 +00:00
Robert Joseph Evans
5765eb1868
svn merge -c 1332716. FIXES: MAPREDUCE-4202. TestYarnClientProtocolProvider is broken (Daryn Sharp via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332719 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 16:02:31 +00:00
Thomas Graves
1a17df6b21
merge -r 1332664:1332665 from trunk. FIXES: MAPREDUCE-4212
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332667 13f79535-47bb-0310-9956-ffa450edef68
2012-05-01 14:11:31 +00:00
Robert Joseph Evans
f17cf45efe
svn merge -c 1332226. FIXES: MAPREDUCE-4209. junit dependency in hadoop-mapreduce-client is missing scope test (Radim Kolar via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1332227 13f79535-47bb-0310-9956-ffa450edef68
2012-04-30 14:49:43 +00:00
Thomas White
e5e15fab74
Merge -r 1331022:1331023 from trunk to branch-2. Fixes: MAPREDUCE-4138
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1331029 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 18:48:13 +00:00
Thomas Graves
bb9cfbb052
merge -r 1330559:1330560 from trunk. FIXES: MAPREDUCE-3613
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1330561 13f79535-47bb-0310-9956-ffa450edef68
2012-04-25 21:14:13 +00:00
Thomas Graves
f8f390b83d
merge -r 1329693:1329694 from trunk. FIXES: MAPREDUCE-4079
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329697 13f79535-47bb-0310-9956-ffa450edef68
2012-04-24 13:07:22 +00:00
Alejandro Abdelnur
37026cea83
Merge -r 1329492:1329493 from trunk to branch. FIXES: MAPREDUCE-4141
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329496 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 22:33:51 +00:00
Robert Joseph Evans
88d736ce2b
svn merge -c 1329403. FIXES: MAPREDUCE-4133. MR over viewfs is broken (John George via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329405 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 19:46:16 +00:00
Robert Joseph Evans
1fca6cfe03
svn merge -c 1329398 FIXES: MAPREDUCE-4190. Improve web UI for task attempts userlog link (Tom Graves via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329399 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 19:39:43 +00:00
Robert Joseph Evans
1ea39ddc3c
svn merge -c 1329282 FIXES: MAPREDUCE-3812. Lower default allocation sizes, fix allocation configurations and document them (Harsh J via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1329283 13f79535-47bb-0310-9956-ffa450edef68
2012-04-23 15:28:19 +00:00
Robert Joseph Evans
0c244e8703
svn merge -c 1328111, FIXES: MAPREDUCE-3947. yarn.app.mapreduce.am.resource.mb not documented (Devaraj K via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328112 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:36:47 +00:00
Alejandro Abdelnur
479e5b0102
Merge -r 1328108:1328109 from trunk to branch. FIXES: MAPREDUCE-3867
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328110 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:34:49 +00:00
Robert Joseph Evans
8f4c3499f5
svn merge -c 1328106, FIXES: MAPREDUCE-4129. Lots of unneeded counters log messages (Ahmed Radwan via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328107 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 20:24:45 +00:00
Robert Joseph Evans
eec2fd9f74
MAPREDUCE-4165. Committing is misspelled as commiting in task logs (John Eagles via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328087 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 19:33:04 +00:00
Robert Joseph Evans
a18ad09c94
svn merge -c 1328031 from trunk. FIXES: MAPREDUCE-4159. Job is running in Uber mode after setting "mapreduce.job.ubertask.maxreduces" to zero (Devaraj K via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1328033 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 16:23:35 +00:00
Thomas Graves
7221ae82e5
merge -r 1327971:1327972 from trunk. FIXES: MAPREDUCE-4074
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327977 13f79535-47bb-0310-9956-ffa450edef68
2012-04-19 14:54:03 +00:00
Robert Joseph Evans
461b330ebf
svn merge -c 1327621 from trunk. FIXES: MAPREDUCE-4161. create sockets consistently (Daryn Sharp via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327624 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 18:48:20 +00:00
Siddharth Seth
be7e487ef3
Merge MAPREDUCE-3972 from trunk. Fix locking and exception issues in JobHistory server. (Contributed by Robert Joseph Evans)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327355 13f79535-47bb-0310-9956-ffa450edef68
2012-04-18 02:01:02 +00:00
Robert Joseph Evans
45b2835e9f
svn merge -c 1327304 from trunk. FIXES: MAPREDUCE-4134. Remove references of mapred.child.ulimit etc. since they are not being used any more (Ravi Prakash via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1327306 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 22:13:52 +00:00
Robert Joseph Evans
8ca897dea2
svn merge -c 1325765 from trunk. FIXES: MAPREDUCE-4128. AM Recovery expects all attempts of a completed task to also be completed. (Bikas Saha via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325767 13f79535-47bb-0310-9956-ffa450edef68
2012-04-13 13:46:45 +00:00
Siddharth Seth
d550503dbb
Merge MAPREDUCE-4050 from trunk. For tasks without assigned containers, changes the node text on the UI to N/A instead of a link to null. (Contributed by Bhallamudi Venkata Siva Kamesh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325436 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 18:41:09 +00:00
Thomas White
cb3d6c3d98
Merge -r 1325351:1325352 from trunk to branch-2. Fixes: MAPREDUCE-4140
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325359 13f79535-47bb-0310-9956-ffa450edef68
2012-04-12 16:31:15 +00:00
Thomas Graves
d31abfe3f8
merge -r 1325009:1325010 from trunk. FIXES: MAPREDUCE-4107
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1325011 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 21:14:55 +00:00
Siddharth Seth
462f9a5249
MAPREDUCE-3932. Fix the TaskAttempt state machine to handle CONTIANER_LAUNCHED and CONTIANER_LAUNCH_FAILED events in additional states. (Contributed by Robert Joseph Evans)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324903 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 18:20:08 +00:00
Siddharth Seth
50c13a44af
merge MAPREDUCE-4099 amendment from trunk. ApplicationMaster will remove staging directory after the history service is stopped. (Contributed by Jason Lowe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1324868 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 17:11:34 +00:00
Siddharth Seth
40497a9d04
merge MAPREDUCE-4040 from trunk. History links should use hostname rather than IP address. (Contributed by Bhallamudi Venkata Siva Kamesh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312077 13f79535-47bb-0310-9956-ffa450edef68
2012-04-11 02:52:13 +00:00
Thomas Graves
15d3d52f1b
merge -r 1312017:1312018 from trunk. FIXES: MAPREDUCE-4108
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1312020 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 22:10:34 +00:00
Robert Joseph Evans
b04f23fc96
svn merge -c 1311972 from trunk. FIXES: MAPREDUCE-4017. Add jobname to jobsummary log (tgraves and Koji Noguchi via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311973 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 20:37:13 +00:00
Robert Joseph Evans
07321a677c
svn merge -c 1311926 from trunk. FIXES: MAPREDUCE-4099. ApplicationMaster may fail to remove staging directory (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311927 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 18:59:03 +00:00
Thomas Graves
ce9bdceac7
merge -r 1311895:1311896 from trunk. FIXES: MAPREDUCE-4059
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311897 13f79535-47bb-0310-9956-ffa450edef68
2012-04-10 18:13:09 +00:00
Robert Joseph Evans
f9e39d057e
svn merge -c 1311479 from trunk. FIXES: MAPREDUCE-4117. mapred job -status throws NullPointerException (Devaraj K via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1311480 13f79535-47bb-0310-9956-ffa450edef68
2012-04-09 21:54:22 +00:00
Robert Joseph Evans
ea165d6e91
svn merge -c 1310546 FIXES: MAPREDUCE-4110. Fix tests in TestMiniMRClasspath & TestMiniMRWithDFSWithDistinctUsers (Devaraj K via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310547 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 18:57:44 +00:00
Robert Joseph Evans
6514ecce13
svn merge -c 1310431 from trunk. FIXES: MAPREDUCE-4111. Fix tests in org.apache.hadoop.mapred.TestJobName (Devaraj K via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310432 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 16:05:36 +00:00
Robert Joseph Evans
cbbddcb3ca
svn merge -c 1310418 from trunk. FIXES: MAPREDUCE-4112. Fix tests org.apache.hadoop.mapred.TestClusterMapReduceTestCase (Devaraj K via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310421 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 15:58:36 +00:00
Robert Joseph Evans
7c087c4a9b
svn merge -c 1310409 from trunk. FIXES: MAPREDUCE-4113. Fix tests org.apache.hadoop.mapred.TestClusterMRNotification (Devaraj K via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310412 13f79535-47bb-0310-9956-ffa450edef68
2012-04-06 15:51:07 +00:00
Thomas Graves
0d388cd1f4
merge -r 1310042:1310043 from trunk. FIXES: MAPREDUCE-3621
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1310045 13f79535-47bb-0310-9956-ffa450edef68
2012-04-05 20:13:11 +00:00
Alejandro Abdelnur
98f0abb721
Merge -r 1309582:1309583 from trunk to branch. FIXES: MAPREDUCE-4097
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309584 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 20:25:18 +00:00
Thomas Graves
378ed9b673
merge -r 1309439:1309440 from trunk. FIXES: MAPREDUCE-3682
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309446 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 15:12:24 +00:00
Alejandro Abdelnur
4bdf14f6c9
Merge -r 1309431:1309432 from trunk to branch. FIXES: MAPREDUCE-4098
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309434 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 14:57:41 +00:00
Thomas Graves
93af1a43be
merge -r 1309400:1309401 from trunk. FIXES: MAPREDUCE-3672
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309403 13f79535-47bb-0310-9956-ffa450edef68
2012-04-04 14:18:55 +00:00
Robert Joseph Evans
8b39213000
svn merge -c 1309086 from trunk. FIXES MAPREDUCE-3988. mapreduce.job.local.dir doesn't point to a single directory on a node. (Eric Payne via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309087 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 18:30:38 +00:00
Robert Joseph Evans
e76f7b7330
svn merge -c 1309077 from trunk. FIXES MAPREDUCE-4072. User set java.library.path seems to overwrite default creating problems native lib loading (Anupam Seth via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309079 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 18:03:18 +00:00
Robert Joseph Evans
c6c7055c83
MAPREDUCE-4062. AM Launcher thread can hang forever (tgraves via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1309044 13f79535-47bb-0310-9956-ffa450edef68
2012-04-03 17:03:53 +00:00
Robert Joseph Evans
97f328dc40
svn merge -c 1308566 from trunk. FIXES MAPREDUCE-4024. RM webservices can't query on finalStatus (Tom Graves via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308568 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 21:07:47 +00:00
Thomas Graves
ad9f93f7b5
merge -r 1308530:1308531 from trunk. FIXES: MAPREDUCE-4089
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308533 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 20:24:46 +00:00
Robert Joseph Evans
54a0b26231
svn merge -c 1308507 from trunk FIXES: MAPREDUCE-4092. commitJob Exception does not fail job (Jon Eagles via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1308509 13f79535-47bb-0310-9956-ffa450edef68
2012-04-02 19:54:46 +00:00
Alejandro Abdelnur
c1ccd60f74
Merge -r 1307622:1307623 from trunk to branch. FIXES: MAPREDUCE-4091
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307624 13f79535-47bb-0310-9956-ffa450edef68
2012-03-30 21:31:34 +00:00
Alejandro Abdelnur
4805df8366
Merge -r 1307123:1307124 from trunk to branch. FIXES: MAPREDUCE-4082
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1307129 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 21:50:30 +00:00
Robert Joseph Evans
581f9b4ca2
svn merge -c 1306901 from trunk to branch-2 FIXES: MAPREDUCE-4081. TestMROutputFormat.java does not compile (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306905 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 15:20:06 +00:00
Arun Murthy
96d4812433
Merge -c 1306736 from trunk to branch-2 to fix MAPREDUCE-3377. Added a unit test to ensure OutputCommitter.checkOutputSpecs is called prior to copying job.xml.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306737 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 07:47:55 +00:00
Siddharth Seth
55639bea52
Merge MAPREDUCE-3955 from trunk. Change MR to use ProtobufRpcEngine from hadoop-common instead of ProtoOverHadoopRpcEngine. (Contributed by Jitendra Nath Pandey)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306690 13f79535-47bb-0310-9956-ffa450edef68
2012-03-29 02:04:21 +00:00
Arun Murthy
3e8925aa92
Changed version in branch-2 to 2.0.0-SNAPSHOT.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1306193 13f79535-47bb-0310-9956-ffa450edef68
2012-03-28 07:25:51 +00:00
Robert Joseph Evans
e7ec8a44b6
svn merge -c 1305607 trunk to branch-0.23 FIXES: MAPREDUCE-4061. RM only has 1 AM launcher thread (tgraves via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305608 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 21:25:16 +00:00
Harsh J
92f06cb446
svn merge -c 1305343. Merge MAPREDUCE-4066 into branch-0.23 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1305348 13f79535-47bb-0310-9956-ffa450edef68
2012-03-26 13:31:08 +00:00
Robert Joseph Evans
1f3e5ebc0b
svn merge -c 1304587 from trunk to branch-0.23 FIXES: MAPREDUCE-4043. Secret keys set in Credentials are not seen by tasks (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1304593 13f79535-47bb-0310-9956-ffa450edef68
2012-03-23 20:52:42 +00:00
Todd Lipcon
4ab173a9d4
MAPREDUCE-3992. Reduce fetcher doesn't verify HTTP status code of response. Contributed by Todd Lipcon.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1302755 13f79535-47bb-0310-9956-ffa450edef68
2012-03-20 02:29:01 +00:00
Robert Joseph Evans
c02c9218d9
svn merge -c 1302645 from trunk to branch-0.23 FIXES MAPREDUCE-4025. AM can crash if task attempt reports bogus progress value (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1302646 13f79535-47bb-0310-9956-ffa450edef68
2012-03-19 20:32:54 +00:00
Robert Joseph Evans
4c0306714b
svn merge -c 1301551 from trunk to branch-0.23 FIXES MAPREDUCE-4010. TestWritableJobConf fails on trunk (tucu via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1301553 13f79535-47bb-0310-9956-ffa450edef68
2012-03-16 14:40:32 +00:00
Alejandro Abdelnur
fbae7714cf
Merge -r 1300749:1300750 from trunk to branch. FIXES: MAPREDUCE-4007
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1300751 13f79535-47bb-0310-9956-ffa450edef68
2012-03-14 22:03:32 +00:00
Vinod Kumar Vavilapalli
07e7ad5e86
MAPREDUCE-3982. Fixed FileOutputCommitter to not err out for an 'empty-job' whose tasks don't write any outputs. Contributed by Robert Joseph Evans.
...
svn merge --ignore-ancestry -c 1299047 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1299048 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 21:14:28 +00:00
Vinod Kumar Vavilapalli
c383843732
MAPREDUCE-3348. Fixed a bug in MR client to redirect to JobHistoryServer correctly when RM forgets the app. Contributed by Devaraj K.
...
svn merge --ignore-ancestry -c 1298978 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1298979 13f79535-47bb-0310-9956-ffa450edef68
2012-03-09 18:55:02 +00:00
Robert Joseph Evans
b6d9e6b5f7
svn merge -c 1297825 from trunk to branch-0.23 FIXES: MAPREDUCE-3975. Default value not set for Configuration parameter mapreduce.job.local.dir (Eric Payne via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297826 13f79535-47bb-0310-9956-ffa450edef68
2012-03-07 01:28:34 +00:00
Robert Joseph Evans
de89bbcb88
svn merge -c 1297788 from trunk to branch-0.23 FIXES: MAPREDUCE-3961. Map/ReduceSlotMillis computation incorrect (Siddharth Seth via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297789 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 23:23:25 +00:00
Siddharth Seth
084f085b5f
merge MAPREDUCE-3944 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297673 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 19:53:09 +00:00
Tsz-wo Sze
74360b15d3
HADOOP-8142. Update versions from 0.23.2 to 0.23.3 in the build files.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297650 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 18:53:46 +00:00
Robert Joseph Evans
a7a9d16d63
svn merge -c 1297557 from trunk to branch-0.23 FIXES: MAPREDUCE-3976. TestRMContainerAllocator failing (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297558 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 16:19:10 +00:00
Alejandro Abdelnur
a7899dae53
Merge -r 1297292:1297293 from trunk to branch. FIXES: MAPREDUCE-3952
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297299 13f79535-47bb-0310-9956-ffa450edef68
2012-03-06 00:00:36 +00:00
Vinod Kumar Vavilapalli
1719df92ab
MAPREDUCE-3009. Fixed node link on JobHistory webapp. Contributed by Chackaravarthy.
...
svn merge --ignore-ancestry -c 1297149 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1297150 13f79535-47bb-0310-9956-ffa450edef68
2012-03-05 18:31:23 +00:00
Vinod Kumar Vavilapalli
526f466d0c
MAPREDUCE-3614. Fixed MR AM to close history file quickly and send a correct final state to the RM when it is killed. Contributed by Ravi Prakash.
...
svn merge --ignore-ancestry -c 1296747 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296748 13f79535-47bb-0310-9956-ffa450edef68
2012-03-04 05:25:07 +00:00
Vinod Kumar Vavilapalli
f942f395c1
MAPREDUCE-3792. Fix "bin/mapred job -list" to display all jobs instead of only the jobs owned by the user. Contributed by Jason Lowe.
...
svn merge --ignore-ancestry -c 1296721 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296724 13f79535-47bb-0310-9956-ffa450edef68
2012-03-03 23:42:39 +00:00
Thomas White
100d542625
Merge -r 1296522:1296523 from trunk to branch-23. Fixes: MAPREDUCE-3935.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296524 13f79535-47bb-0310-9956-ffa450edef68
2012-03-03 00:12:55 +00:00
Siddharth Seth
3e3e6770ca
merge MAPREDUCE-3896 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1296402 13f79535-47bb-0310-9956-ffa450edef68
2012-03-02 19:29:14 +00:00
Siddharth Seth
c471c3d15f
merge MAPREDUCE-3903 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295263 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 20:50:02 +00:00
Thomas Graves
90c6dd8468
merge -r 1295161:1295162 from trunk. FIXES: MAPREDUCE-3920
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1295163 13f79535-47bb-0310-9956-ffa450edef68
2012-02-29 15:51:55 +00:00
Vinod Kumar Vavilapalli
7808418f74
MAPREDUCE-2855. Passing a cached class-loader to ResourceBundle creator to minimize counter names lookup time. Contributed by Siddarth Seth.
...
svn merge --ignore-ancestry -c 1294436 ../../trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294437 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 01:25:46 +00:00
Vinod Kumar Vavilapalli
5240af9d20
MAPREDUCE-3901. Modified JobHistory records in YARN to lazily load job and task reports so as to improve UI response times. Contributed by Siddarth Seth.
...
svn merge --ignore-ancestry -c 1294417 ../../trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1294421 13f79535-47bb-0310-9956-ffa450edef68
2012-02-28 00:35:12 +00:00
Tsz-wo Sze
def75f7560
Merge r1293501 through r1293896 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293899 13f79535-47bb-0310-9956-ffa450edef68
2012-02-26 17:58:14 +00:00
Vinod Kumar Vavilapalli
3904d62d18
MAPREDUCE-3686. Fixed two bugs in Counters because of which web app displays zero counter values for framework counters. Contributed by Bhallamudi Venkata Siva Kamesh.
...
svn merge --ignore-ancestry -c 1293775 ../../trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293776 13f79535-47bb-0310-9956-ffa450edef68
2012-02-26 08:33:34 +00:00
Vinod Kumar Vavilapalli
1c7fb4f019
MAPREDUCE-2793. Reneabling commented out test from previous commit.
...
svn merge --ignore-ancestry -c 1293521 ../../trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293522 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 02:31:59 +00:00
Vinod Kumar Vavilapalli
2b28bb962a
MAPREDUCE-2793. Corrected AppIDs, JobIDs, TaskAttemptIDs to be of correct format on the web pages. Contributed by Bikas Saha.
...
svn merge --ignore-ancestry -c 1293517 ../../trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293519 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 02:07:19 +00:00
Arun Murthy
c79ae7a8db
Moving branch-0.23 to version 0.23.3-SNAPSHOT
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293515 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 01:58:06 +00:00
Tsz-wo Sze
0654e46791
Merge r1293034 through r1293500 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293501 13f79535-47bb-0310-9956-ffa450edef68
2012-02-25 01:09:01 +00:00
Thomas Graves
785573713c
merege -r 1293455:1293456 from trunk. FIXES: MAPREDUCE-3904
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1293459 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 22:33:31 +00:00
Tsz-wo Sze
9cb779d735
Revert TestAuditLogger changes from MAPREDUCE-3368.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293058 13f79535-47bb-0310-9956-ffa450edef68
2012-02-24 02:09:09 +00:00
Tsz-wo Sze
024c23c95f
Merge r1291972 through r1293033 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1293035 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 23:52:26 +00:00
Thomas Graves
1714f8b6c7
merge -r 1292830:1292831 from trunk to branch-0.23. FIXES: MAPREDUCE-3878
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1292834 13f79535-47bb-0310-9956-ffa450edef68
2012-02-23 15:57:47 +00:00
Alejandro Abdelnur
b512e9f282
Merge -r 1292423:1292424 from trunk to branch. FIXES: MAPREDUCE-3884
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1292427 13f79535-47bb-0310-9956-ffa450edef68
2012-02-22 18:03:27 +00:00
Tsz-wo Sze
0e57409872
Merge r1245750 through r1291971 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1291974 13f79535-47bb-0310-9956-ffa450edef68
2012-02-21 19:56:04 +00:00
Vinod Kumar Vavilapalli
55a3a13afa
MAPREDUCE-3798. Fixed failing TestJobCleanup.testCusomCleanup() and moved it to the maven build. Contributed by Ravi Prakash.
...
svn merge --ignore-ancestry -c 1291606 ../../trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1291607 13f79535-47bb-0310-9956-ffa450edef68
2012-02-21 05:31:33 +00:00
Vinod Kumar Vavilapalli
518fed3ac0
MAPREDUCE-3634. Fixed all daemons to crash instead of hanging around when their EventHandlers get exceptions. (vinodkv)
...
svn merge --ignore-ancestry -c 1291598 ../../trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1291600 13f79535-47bb-0310-9956-ffa450edef68
2012-02-21 05:11:29 +00:00
Tsz-wo Sze
1d00ed1ffc
svn merge -c 1245828 from trunk for MAPREDUCE-3583.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245831 13f79535-47bb-0310-9956-ffa450edef68
2012-02-18 01:15:48 +00:00
Tsz-wo Sze
bd3c2b26ec
Merge r1244222 through r1245749 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1245750 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 20:43:55 +00:00
Siddharth Seth
e2beaf7976
merge MAPREDUCE-3856 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245277 13f79535-47bb-0310-9956-ffa450edef68
2012-02-17 01:03:00 +00:00
Robert Joseph Evans
84595f7640
svn merge -c 1245099 from trunk to 0.23 FIXES MAPREDUCE-3849 Change TokenCache's reading of the binary token file (Daryn Sharp via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1245102 13f79535-47bb-0310-9956-ffa450edef68
2012-02-16 17:57:08 +00:00
Alejandro Abdelnur
9ea26a7b08
Merge -r 1244263:1244264 from trunk to branch. FIXES: MAPREDUCE-3736
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1244265 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 23:10:40 +00:00
Mahadev Konar
c8debd083b
MAPREDUCE-3858. Task attempt failure during commit results in task never completing. (Tom White via mahadev) - Merging r1244254 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1244255 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 22:53:29 +00:00
Tsz-wo Sze
fd0b6a9596
Merge r1242606 through r1244221 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1244226 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 21:49:02 +00:00
Vinod Kumar Vavilapalli
d606016217
MAPREDUCE-3854. Fixed and reenabled tests related to MR child JVM's environmental variables in TestMiniMRChildTask. (Tom White via vinodkv)
...
svn merge --ignore-ancestry -c 1244223 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1244224 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 21:45:09 +00:00
Vinod Kumar Vavilapalli
26d098b855
MAPREDUCE-3802. Added test to validate that AM can crash multiple times and still can recover successfully after MAPREDUCE-3846. (vinodkv)
...
svn merge --ignore-ancestry -c 1244178 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1244180 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 19:25:30 +00:00
Vinod Kumar Vavilapalli
6eadd0201d
MAPREDUCE-3846. Addressed MR AM hanging issues during AM restart and then the recovery. (vinodkv)
...
svn merge --ignore-ancestry -c 1243752 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1243755 13f79535-47bb-0310-9956-ffa450edef68
2012-02-14 00:11:54 +00:00
Tsz-wo Sze
6c0178e7e5
Merge r1241554 through r1242605 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1242642 13f79535-47bb-0310-9956-ffa450edef68
2012-02-10 03:04:05 +00:00
Robert Joseph Evans
e9c32d2ad1
svn merge -c 1241999 fixes MAPREDUCE-3840 JobEndNotifier doesn't use the proxyToUse during connecting
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1242002 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 17:36:57 +00:00
Arun Murthy
78971a4267
Set version to 0.23.2-SNAPSHOT.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241808 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 08:12:18 +00:00
Vinod Kumar Vavilapalli
595ea04385
MAPREDUCE-3834. Changed MR AM to not add the same rack entry multiple times into the container request table when multiple hosts for a split happen to be on the same rack. Contributed by Siddarth Seth.
...
svn merge --ignore-ancestry -c 1241734 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241735 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 01:57:02 +00:00
Siddharth Seth
5b31bee4d8
merge MAPREDUCE-3822 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241723 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 00:57:36 +00:00
Arun Murthy
1e20db389c
Merge -c 1241711 from trunk to branch-0.23 to fix MAPREDUCE-3827. Changed Counters to use ConcurrentSkipListMap for performance. Contributed by Vinod K V.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241712 13f79535-47bb-0310-9956-ffa450edef68
2012-02-08 00:17:33 +00:00
Siddharth Seth
5443f258fb
merge <JIRA> from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241693 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 23:07:56 +00:00
Vinod Kumar Vavilapalli
9567b8db20
MAPREDUCE-3815. Fixed MR AM to always use hostnames and never IPs when requesting containers so that scheduler can give off data local containers correctly. Contributed by Siddarth Seth.
...
svn merge --ignore-ancestry -c 1241654 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241655 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 21:59:39 +00:00
Siddharth Seth
d60facd919
merge MAPREDUCE-3436 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241621 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 20:56:15 +00:00
Tsz-wo Sze
88bf529cfd
Merge r1240450 through r1241553 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1241555 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 19:12:19 +00:00
Arun Murthy
cea037f414
Merge -c 1241319 from trunk to branch-0.23 to fix MAPREDUCE-3697. Support binary compatibility for Counters after MAPREDUCE-901.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241321 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 01:42:29 +00:00
Mahadev Konar
8aa0153373
MAPREDUCE-3794. Support mapred.Task.Counter and mapred.JobInProgress.Counter enums for compatibility (Tom White via mahadev) - Merging r1241299 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241300 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 00:55:46 +00:00
Arun Murthy
c1596a6c3b
Merge -c 1241285 from trunk to branch-0.23 to fix PREDUCE-3811. Made jobclient-to-AM retries configurable. Contributed by Siddharth Seth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241286 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 00:21:19 +00:00
Arun Murthy
c6356556be
Merge -c 1241282 from trunk to branch-0.23 to fix MAPREDUCE-3809. Ensure that there is no needless sleep in Task at the end of the task. Contributed by Siddharth Seth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241283 13f79535-47bb-0310-9956-ffa450edef68
2012-02-07 00:14:44 +00:00
Vinod Kumar Vavilapalli
15c308d948
MAPREDUCE-3808. Fixed an NPE in FileOutputCommitter for jobs with maps but no reduces. Contributed by Robert Joseph Evans.
...
svn merge --ignore-ancestry -c 1241217 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241218 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 22:17:18 +00:00
Arun Murthy
caea6d2e85
Merge -c 1241205 from trunk to branch-0.23 to fix MAPREDUCE-3810. Performance tweaks - reduced logging in AM and defined hascode/equals for ResourceRequest & Priority.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1241208 13f79535-47bb-0310-9956-ffa450edef68
2012-02-06 22:03:30 +00:00
Mahadev Konar
aaa17aa6ab
MAPREDUCE-3775. Change MiniYarnCluster to escape special chars in testname. (Hitesh Shah via mahadev) - Merging r1240603 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240604 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 20:21:42 +00:00
Mahadev Konar
7fcab49694
MAPREDUCE-3795. "job -status" command line output is malformed. (vinodkv via mahadev) - Merging r1240593 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240594 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 19:35:35 +00:00
Mahadev Konar
845fb480c6
MAPREDUCE-3723. TestAMWebServicesJobs & TestHSWebServicesJobs incorrectly asserting tests (Bhallamudi Venkata Siva Kamesh via mahadev) - Merging r1240590 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240591 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 18:57:20 +00:00
Tsz-wo Sze
2f0489edab
Merge r1239398 through r1240449 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1240450 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 03:40:45 +00:00
Vinod Kumar Vavilapalli
709bf8f903
MAPREDUCE-3417. Fixed job-access-controls to work with MR AM and JobHistoryServer web-apps. Contributed by Jonathan Eagles.
...
svn merge --ignore-ancestry -c 1240428 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240429 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 01:22:23 +00:00
Vinod Kumar Vavilapalli
4affe6d979
MAPREDUCE-3711. Fixed MR AM recovery so that only single selected task output is recovered and thus reduce the unnecessarily bloated recovery time. Contributed by Robert Joseph Evans.
...
svn merge --ignore-ancestry -c 1240413 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240414 13f79535-47bb-0310-9956-ffa450edef68
2012-02-04 00:06:24 +00:00
Alejandro Abdelnur
2c20d0a547
Merge -r 1240409:1240410 from trunk to branch. FIXES: MAPREDUCE-3727
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1240411 13f79535-47bb-0310-9956-ffa450edef68
2012-02-03 23:53:09 +00:00
Arun Murthy
818dfb0c5b
Merge -c 1239482 from trunk to branch-0.23 to fix MAPREDUCE-3771. Un-deprecated the old mapred apis, port of MAPREDUCE-1735.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239484 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 08:39:43 +00:00
Siddharth Seth
feacd4ee5d
merge MAPREDUCE-3744 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239434 13f79535-47bb-0310-9956-ffa450edef68
2012-02-02 01:45:00 +00:00
Siddharth Seth
5254328035
merge MAPREDUCE-3640 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239403 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 23:34:52 +00:00
Tsz-wo Sze
fe9369fb3c
Merge r1237584 through r1239397 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1239398 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 23:24:15 +00:00
Mahadev Konar
4c38e6aa9b
MAPREDUCE-3696. MR job via oozie does not work on hadoop 23. (John George via mahadev) - Merging r1239310 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239312 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 20:45:33 +00:00
Alejandro Abdelnur
239604718b
Merge -r 1239206:1239207 from trunk to branch. FIXES: MAPREDUCE-3499
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1239210 13f79535-47bb-0310-9956-ffa450edef68
2012-02-01 17:09:54 +00:00
Thomas White
000141d77c
Merge -r 1238733:1238734 from trunk to branch-0.23. Fixes: MAPREDUCE-3749
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1238735 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 18:32:29 +00:00
Arun Murthy
85520b1bc4
Merge -c 1238721 from trunk to branch-0.23 to fix MAPREDUCE-3756. Made single shuffle limit configurable.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1238723 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 18:09:39 +00:00
Mahadev Konar
2c3a00c3eb
MAPREDUCE-3679. AM logs and others should not automatically refresh after every 1 second. (Vinod KV via mahadev) - Merging r1238146 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1238148 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 04:58:16 +00:00
Vinod Kumar Vavilapalli
3861f9f50d
MAPREDUCE-3716. Fixing YARN+MR to allow MR jobs to be able to use java.io.File.createTempFile to create temporary files as part of their tasks. Contributed by Jonathan Eagles.
...
svn merge --ignore-ancestry -c 1238136 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1238138 13f79535-47bb-0310-9956-ffa450edef68
2012-01-31 02:24:54 +00:00
Mahadev Konar
fc432d7f33
MAPREDUCE-3703. ResourceManager should provide node lists in JMX output. (Eric Payne via mahadev) - Merge r1237920 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1237921 13f79535-47bb-0310-9956-ffa450edef68
2012-01-30 18:51:03 +00:00
Tsz-wo Sze
ab824d9e9b
Merge r1236386 through r1237583 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1237590 13f79535-47bb-0310-9956-ffa450edef68
2012-01-30 10:17:28 +00:00
Arun Murthy
599264116d
Merge -c 1236594 from trunk to branch-0.23 to fix MAPREDUCE-3693. Added mapreduce.admin.user.env to mapred-default.xml.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236596 13f79535-47bb-0310-9956-ffa450edef68
2012-01-27 08:50:24 +00:00
Arun Murthy
f1b833c8a3
Merge -c 1236588 from trunk to branch-0.23 to fix MAPREDUCE-3720. Changed bin/mapred job -list to not print job-specific information not available at RM.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236589 13f79535-47bb-0310-9956-ffa450edef68
2012-01-27 08:45:24 +00:00
Vinod Kumar Vavilapalli
981ba68664
MAPREDUCE-3699. Increased RPC handlers for all YARN servers to reasonable values for working at scale. Contributed by Hitesh Shah.
...
svn merge --ignore-ancestry -c 1236396 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236398 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 21:38:31 +00:00
Tsz-wo Sze
359c746ca7
Merge r1234388 through r1236385 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1236395 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 21:37:26 +00:00
Siddharth Seth
82c1a407d5
merge MAPREDUCE-3718 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236360 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 19:31:49 +00:00
Arun Murthy
10a3c56fcf
Merge -c 1236041 from trunk to branch-0.23 to fix MAPREDUCE-3721. Fixed a race in shuffle which caused reduces to hang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1236042 13f79535-47bb-0310-9956-ffa450edef68
2012-01-26 05:41:17 +00:00
Mahadev Konar
c929ba95a9
MAPREDUCE-3717. JobClient test jar has missing files to run all the test programs. (mahadev) - Merging r1235639 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235640 13f79535-47bb-0310-9956-ffa450edef68
2012-01-25 06:26:22 +00:00
Vinod Kumar Vavilapalli
c516cc863a
MAPREDUCE-3714. Fixed EventFetcher and Fetcher threads to shut-down properly so that reducers don't hang in corner cases. (vinodkv)
...
svn merge --ignore-ancestry -c 1235545 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235546 13f79535-47bb-0310-9956-ffa450edef68
2012-01-24 23:18:46 +00:00
Vinod Kumar Vavilapalli
0bf9779489
MAPREDUCE-3710. Improved FileInputFormat to return better locality for the last split. Contributed by Siddarth Seth.
...
svn merge --ignore-ancestry -c 1235510 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235511 13f79535-47bb-0310-9956-ffa450edef68
2012-01-24 21:30:48 +00:00
Alejandro Abdelnur
1a1474885b
Merge -r 1235390:1235391 from trunk to branch. FIXES: MAPREDUCE-3505
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235397 13f79535-47bb-0310-9956-ffa450edef68
2012-01-24 18:26:17 +00:00
Mahadev Konar
cfff5ff7f4
MAPREDUCE-3646. Remove redundant URL info from "mapred job" output. (Jonathan Eagles via mahadev) - Merging r1235034 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1235042 13f79535-47bb-0310-9956-ffa450edef68
2012-01-23 22:34:44 +00:00
Tsz-wo Sze
6e8fe7af37
Merge r1233741 through r1234387 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1234406 13f79535-47bb-0310-9956-ffa450edef68
2012-01-21 19:50:30 +00:00
Mahadev Konar
6b3f5b7bd2
MAPREDUCE-3549. write api documentation for web service apis for RM, NM, mapreduce app master, and job history server (Thomas Graves via mahadev) - Merging r1234222 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234224 13f79535-47bb-0310-9956-ffa450edef68
2012-01-21 00:55:16 +00:00
Mahadev Konar
6f27abfe72
MAPREDUCE-3698. Client cannot talk to the history server in secure mode. (mahadev) - Merging r1234120 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234125 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 20:47:02 +00:00
Alejandro Abdelnur
25e8aad054
Merge -r 1233089:1233090 from trunk to branch. FIXES: MAPREDUCE-3582
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1234100 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 19:54:20 +00:00
Tsz-wo Sze
f2a3dccbd8
Merge r1232271 through r1233740 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1233742 13f79535-47bb-0310-9956-ffa450edef68
2012-01-20 03:14:44 +00:00
Eli Collins
a1e2e74dcb
MAPREDUCE-3692. svn merge -c 1233605 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1233622 13f79535-47bb-0310-9956-ffa450edef68
2012-01-19 22:49:40 +00:00
Thomas White
76ef392a2e
Merge -r 1232980:1232981 from trunk to branch-0.23. Fixes: MAPREDUCE-3684
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1232982 13f79535-47bb-0310-9956-ffa450edef68
2012-01-18 18:21:45 +00:00
Arun Murthy
5f2f884a34
Merge -c 1232580 from trunk to branch-0.23 to fix MAPREDUCE-3669. Allow clients to talk to MR HistoryServer using both delegation tokens and kerberos.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1232581 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 21:27:42 +00:00
Arun Murthy
d36e002fea
Merge -c 1232314 from trunk to branch-0.23 to fix MAPREDUCE-2450. MAPREDUCE-2450. Fixed a corner case with interrupted communication threads leading to a long timeout in Task.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1232315 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 06:12:14 +00:00
Tsz-wo Sze
03d05902e4
Merge r1231828 through r1232270 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1232275 13f79535-47bb-0310-9956-ffa450edef68
2012-01-17 02:28:49 +00:00
Mahadev Konar
21fa0778c5
MAPREDUCE-3649. Job End notification gives an error on calling back. (Ravi Prakash via mahadev) - Merging r1232126 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1232128 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 19:40:00 +00:00
Tsz-wo Sze
e4e47a7519
Merge r1227776 through r1231827 from 0.23.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1231834 13f79535-47bb-0310-9956-ffa450edef68
2012-01-16 04:24:24 +00:00
Vinod Kumar Vavilapalli
9febd5869c
MAPREDUCE-3404. Corrected MR AM to honor speculative configuration and enable speculating either maps or reduces. Contributed by Eric Payne.
...
svn merge --ignore-ancestry -c 1231395 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1231397 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 23:42:09 +00:00
Vinod Kumar Vavilapalli
77c29ccb53
MAPREDUCE-3656. Fixed a race condition in MR AM which is failing the sort benchmark consistently. Contributed by Siddarth Seth.
...
svn merge --ignore-ancestry -c 1231314 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1231316 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 21:32:58 +00:00
Tsz-wo Sze
228ee31512
svn merge -c 1214106 from trunk for MAPREDUCE-3545 to delete the empty files.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230884 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 03:38:30 +00:00
Tsz-wo Sze
66f4e8b694
svn merge -c 1214066 from trunk for MAPREDUCE-3545.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230880 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 03:26:08 +00:00
Vinod Kumar Vavilapalli
28c7235172
MAPREDUCE-3512. Batching JobHistory flushing to DFS so that we don't flush for every event slowing down AM. Contributed by Siddarth Seth.
...
svn merge --ignore-ancestry -c 1230353 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230354 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 01:43:33 +00:00
Mahadev Konar
350ed9a0e1
MAPREDUCE-3553. Add support for data returned when exceptions thrown from web service apis to be in either xml or in JSON. (Thomas Graves via mahadev) - Merging r1230330 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230333 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 00:02:02 +00:00
Mahadev Konar
4c4a0f4f6c
MAPREDUCE-3651. TestQueueManagerRefresh fails. (Thomas Graves via mahadev) - Merging r1230292 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230295 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 22:35:17 +00:00
Vinod Kumar Vavilapalli
8327271efc
MAPREDUCE-3618. Fixed TaskHeartbeatHandler to not hold a global lock for all task-updates. Contributed by Siddarth Seth.
...
svn merge --ignore-ancestry -c 1229906 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229908 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 06:55:18 +00:00
Mahadev Konar
5b330e9119
MAPREDUCE-3380. Token infrastructure for running clients which are not kerberos authenticated. (mahadev) - Merging r1229855 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229856 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 01:56:34 +00:00
Vinod Kumar Vavilapalli
92975b63e5
MAPREDUCE-3251. Network ACLs can prevent some clients to talk to MR AM. Improved the earlier patch to not to JobHistoryServer repeatedly. Contributed by Anupam Seth.
...
svn merge --ignore-ancestry -c 1229787 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229789 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 23:09:30 +00:00
Vinod Kumar Vavilapalli
dd807a1e8a
MAPREDUCE-3299. Added AMInfo table to the MR AM job pages to list all the job-attempts when AM restarts and recovers. (Jonathan Eagles via vinodkv)
...
svn merge --ignore-ancestry -c 1229766 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229768 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 22:28:22 +00:00
Vinod Kumar Vavilapalli
6821efa3ae
MAPREDUCE-3382. Enhanced MR AM to use a proxy to ping the job-end notification URL. Contributed by Ravi Prakash.
...
svn merge --ignore-ancestry -c 1229736 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229737 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 21:09:41 +00:00
Vinod Kumar Vavilapalli
4175e70020
MAPREDUCE-3312. Modified MR AM to not send a stop-container request for a container that isn't launched at all. Contributed by Robert Joseph Evans.
...
svn merge --ignore-ancestry -c 1229451 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229452 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 02:16:53 +00:00
Vinod Kumar Vavilapalli
048ac6a4a3
MAPREDUCE-3639. Fixed TokenCache to work with absent FileSystem canonical service-names. (Siddharth Seth via vinodkv)
...
svn merge --ignore-ancestry -c 1229444 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229446 13f79535-47bb-0310-9956-ffa450edef68
2012-01-10 01:39:47 +00:00
Vinod Kumar Vavilapalli
70fb248629
MAPREDUCE-3528. Fixed TaskHeartBeatHandler to use a new configuration for the thread loop interval separate from task-timeout configuration property. Contributed by Siddharth Seth.
...
svn merge --ignore-ancestry -c 1229403 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229405 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 22:38:10 +00:00
Siddharth Seth
16288c5a7c
merge MAPREDUCE-3616 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229395 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 22:21:42 +00:00
Vinod Kumar Vavilapalli
65e6abb477
MAPREDUCE-3511. Removed a multitude of cloned/duplicate counters in the AM thereby reducing the AM heap size and preventing full GCs. (vinodkv)
...
svn merge -c 1229347 trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229350 13f79535-47bb-0310-9956-ffa450edef68
2012-01-09 21:07:25 +00:00
Alejandro Abdelnur
e3e457398e
Merge -r 1227786:1227787 from trunk to branch. FIXES: HADOOP-7934
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227805 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 20:06:52 +00:00
Arun Murthy
2281b945d8
Merge -c 1227801 from trunk to branch-0.23 to fix MAPREDUCE-3548. MAPREDUCE-3548. Added more unit tests for MR AM & JHS web-services.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227802 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 20:02:15 +00:00
Alejandro Abdelnur
a7f8694d59
Merge -r 1227237:1227238 from trunk to branch. FIXES: MAPREDUCE-1744
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227789 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 19:50:43 +00:00
Siddharth Seth
b988ba01cd
merge MAPREDUCE-3615 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227742 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 18:48:46 +00:00
Siddharth Seth
2d360c5514
merge MAPREDUCE-3569 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227486 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 05:20:40 +00:00
Arun Murthy
fa86b57c30
Merge -c 1227426 from trunk to branch-0.23 to fix MAPREDUCE-3572. Moved AM event dispatcher to a separate thread for performance reasons.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227428 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 01:38:49 +00:00
Arun Murthy
2122954a0d
Merge -c 1227422 from trunk to branch-0.23 to fix MAPREDUCE-3566. Fixed MR AM to construct CLC only once across all tasks.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227424 13f79535-47bb-0310-9956-ffa450edef68
2012-01-05 01:34:48 +00:00
Siddharth Seth
d296bc2a88
merge MAPREDUCE-3595 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227381 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 23:16:34 +00:00
Siddharth Seth
eb82638bd7
merge MAPREDUCE-3529 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227375 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 23:08:38 +00:00
Vinod Kumar Vavilapalli
16b1c5c24d
MAPREDUCE-3490. Fixed MapReduce AM to count failed maps also towards Reduce ramp up. Contributed by Sharad Agarwal and Arun C Murthy.
...
svn merge -c 1227226 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227227 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 17:12:06 +00:00
Harsh J
aa4147c428
merge MAPREDUCE-3610 (Sho Shimauchi via harsh)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1227098 13f79535-47bb-0310-9956-ffa450edef68
2012-01-04 10:18:24 +00:00
Vinod Kumar Vavilapalli
a1b5b3541e
MAPREDUCE-3568. Optimized Job's progress calculations in MR AM. (vinodkv)
...
svn merge -c 1224995 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1224996 13f79535-47bb-0310-9956-ffa450edef68
2011-12-27 19:55:56 +00:00
Siddharth Seth
67e975d653
Merge MAPREDUCE-3567 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1222499 13f79535-47bb-0310-9956-ffa450edef68
2011-12-22 22:36:08 +00:00
Siddharth Seth
769178f3c0
MAPREDUCE-3349. Log rack-name in JobHistory for unsuccessful tasks. (Contributed by Amar Kamat and Devaraj K)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221939 13f79535-47bb-0310-9956-ffa450edef68
2011-12-21 23:36:14 +00:00
Vinod Kumar Vavilapalli
cc6328635b
MAPREDUCE-3339. Fixed MR AM to stop considering node blacklisting after the number of nodes blacklisted crosses a threshold. Contributed by Siddharth Seth.
...
svn merge -c 1221523 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221524 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 23:27:57 +00:00
Arun Murthy
f57c920202
Merge -c 1221501 from trunk to branch-0.23 to fix MAPREDUCE-3376.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1221502 13f79535-47bb-0310-9956-ffa450edef68
2011-12-20 22:02:04 +00:00
Arun Murthy
907e861241
Merge -c 1220996 from trunk to branch-0.23 to fix MAPREDUCE-3563.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1220997 13f79535-47bb-0310-9956-ffa450edef68
2011-12-19 23:08:19 +00:00
Thomas White
8a58fd5440
Merge -r 1213970:1213971 from trunk to branch-0.23. Fixes: MAPREDUCE-3542.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215360 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:16:04 +00:00
Siddharth Seth
5f43332648
merge MAPREDUCE-3422 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215032 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 03:11:50 +00:00
Vinod Kumar Vavilapalli
edc58b0916
MAPREDUCE-3564. Fixed failures in TestStagingCleanup and TestJobEndNotifier tests. Contributed by Siddharth Seth.
...
svn merge -c 1215022 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215023 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 02:09:54 +00:00
Vinod Kumar Vavilapalli
660fb6cbf8
MAPREDUCE-3487. Fixed JobHistory web-UI to display links to single task's counters' page. Contributed by Jason Lowe.
...
svn merge -c 1215016 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215017 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 01:52:12 +00:00
Mahadev Konar
e2c57d5e77
MAPREDUCE-3251. Network ACLs can prevent some clients to talk to MR ApplicationMaster. (Anupam Seth via mahadev) - Merging r1214662 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214664 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 09:01:25 +00:00
Vinod Kumar Vavilapalli
87b8d8612c
MAPREDUCE-3484. Fixed JobEndNotifier to not get interrupted before completing all its retries. Contributed by Ravi Prakash.
...
svn merge -c 1214563 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214566 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 23:59:54 +00:00
Mahadev Konar
1430c33b6d
MAPREDUCE-3541. Fix broken TestJobQueueClient test. (Ravi Prakash via mahadev) - Merging r1214421 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214434 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 20:00:27 +00:00
Vinod Kumar Vavilapalli
88fe1ae2ed
MAPREDUCE-3426. Fixed MR AM in uber mode to write map intermediate outputs in the correct directory to work properly in secure mode. Contributed by Hitesh Shah.
...
svn merge -c 1213987 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213989 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:42:50 +00:00
Vinod Kumar Vavilapalli
affa6d2ee1
MAPREDUCE-2863. Support web services for YARN and MR components. Contributed by Thomas Graves.
...
svn merge -c 1213975 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213978 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 23:12:33 +00:00
Mahadev Konar
04cb16ced7
MAPREDUCE-3328. mapred queue -list output inconsistent and missing child queues. (Ravi Prakash via mahadev) - Merging r1213504 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213505 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 23:58:22 +00:00
Mahadev Konar
62edad08e8
MAPREDUCE-3518. mapred queue -info <queue> -showJobs throws NPE. (Jonathan Eagles via mahadev) - Merging r1213464 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213493 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 23:11:38 +00:00
Thomas White
81ac5efcaf
Merge -r 1213349:1213350 from trunk to branch-0.23. Fixes: MAPREDUCE-3527
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213355 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 18:36:28 +00:00
Arun Murthy
194f52bbad
Merge -c 1210738 from trunk to branch-0.23 to fix MAPREDUCE-3496.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1210739 13f79535-47bb-0310-9956-ffa450edef68
2011-12-06 01:37:25 +00:00
Alejandro Abdelnur
6a70420d9d
Merge -r 1210547:1210548 from trunk to branch. FIXES: MAPREDUCE-3389
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1210550 13f79535-47bb-0310-9956-ffa450edef68
2011-12-05 18:04:29 +00:00
Alejandro Abdelnur
89d89cb731
Merge -r 1209812:1209813 from trunk to branch. FIXES: HADOOP-3500
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209815 13f79535-47bb-0310-9956-ffa450edef68
2011-12-03 01:09:13 +00:00
Thomas White
c4e06b5aac
Merge -r 1209790:1209791 from trunk to branch-0.23. Fixes: MAPREDUCE-3479.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209792 13f79535-47bb-0310-9956-ffa450edef68
2011-12-03 00:18:17 +00:00
Siddharth Seth
1912f4c7b8
mrege MAPREDUCE-3460 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209740 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 22:22:01 +00:00
Thomas White
df4a1a9aab
Merge -r 1209280:1209281 from trunk to branch-0.23. Fixes: MAPREDUCE-3369
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209283 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 22:34:10 +00:00
Siddharth Seth
8031aef007
merge MAPREDUCE-3169 amendment (Deprecate MiniMRCluster) from trunk. Constributed by Ahmed Radwan
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209239 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 21:09:25 +00:00
Siddharth Seth
463e78db70
merge MAPREDUCE-3443 from trunk. Contributed by Mahadev Konar
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1209232 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 20:43:34 +00:00
Mahadev Konar
2ef6051da9
MAPREDUCE-3463. Second AM fails to recover properly when first AM is killed with java.lang.IllegalArgumentException causing lost job. (Siddharth Seth via mahadev) - Merging r1208994 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208995 13f79535-47bb-0310-9956-ffa450edef68
2011-12-01 08:37:14 +00:00
Mahadev Konar
2ba32989db
MAPREDUCE-3450. NM port info no longer available in JobHistory. (Siddharth Seth via mahadev) - Merging r1208327 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208328 13f79535-47bb-0310-9956-ffa450edef68
2011-11-30 08:44:52 +00:00
Mahadev Konar
de8f0efe60
MAPREDUCE-3121. NodeManager should handle disk-failures (Ravi Gummadi via mahadev) - Merging r1208131 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208135 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 23:28:16 +00:00
Thomas White
c4b13d74e5
Merge -r 1207754:1207755 from trunk to branch-0.23. Fixes: MAPREDUCE-3433
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1207756 13f79535-47bb-0310-9956-ffa450edef68
2011-11-29 05:12:07 +00:00
Mahadev Konar
7f97bed786
MAPREDUCE-3413. RM web ui applications not sorted in any order by default. (Jonathan Eagles via mahadev) - Merging r1206926 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1206928 13f79535-47bb-0310-9956-ffa450edef68
2011-11-27 23:59:31 +00:00
Arun Murthy
7467e23b41
Merge -c 1205628 from trunk to branch-0.23 to fix MAPREDUCE-3265.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205629 13f79535-47bb-0310-9956-ffa450edef68
2011-11-23 22:06:47 +00:00
Arun Murthy
fbfe1b0afa
Changing branch-0.23 to 0.23.1-SNAPSHOT.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1205240 13f79535-47bb-0310-9956-ffa450edef68
2011-11-22 23:47:40 +00:00
Mahadev Konar
df0d4c1d5e
MAPREDUCE-3434. Nightly build broken (Hitesh Shah via mahadev) - merging r1204638 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1204641 13f79535-47bb-0310-9956-ffa450edef68
2011-11-21 18:28:12 +00:00
Alejandro Abdelnur
c36a44d11b
Merge -r 1203940:1203941 from trunk to branch. FIXES: HADOOP-7590
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1203945 13f79535-47bb-0310-9956-ffa450edef68
2011-11-19 01:38:22 +00:00
Alejandro Abdelnur
a24139e043
Merge -r 1203410:1203411 from trunk to branch. FIXES: MAPREDUCE-3415
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1203415 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 23:10:37 +00:00
Alejandro Abdelnur
124d34995a
Merge -r 1203370:1203371 from trunk to branch. FIXES: MAPREDUCE-3169
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1203402 13f79535-47bb-0310-9956-ffa450edef68
2011-11-17 22:48:13 +00:00
Vinod Kumar Vavilapalli
7b8e41d6a1
MAPREDUCE-3407. Fixed pom files to refer to the correct MR app-jar needed by the integration tests. Contributed by Hitesh Shah.
...
svn merge -c r1202766 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1202768 13f79535-47bb-0310-9956-ffa450edef68
2011-11-16 16:31:37 +00:00
Vinod Kumar Vavilapalli
6a1621e32c
MAPREDUCE-3355. Fixed MR AM's ContainerLauncher to handle node-command timeouts correctly. (vinodkv)
...
svn merge -c r1202744 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1202745 13f79535-47bb-0310-9956-ffa450edef68
2011-11-16 15:40:05 +00:00
Mahadev Konar
686975c9fb
MAPREDUCE-3324. Not All HttpServer tools links (stacks,logs,config,metrics) are accessible through all UI servers (Jonathan Eagles via mahadev) - Merging r1201914 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1201916 13f79535-47bb-0310-9956-ffa450edef68
2011-11-14 21:31:38 +00:00
Vinod Kumar Vavilapalli
838bb254fe
MAPREDUCE-3370. Fixed MiniMRYarnCluster and related tests to not use a hard-coded path for the mr-app jar. Contributed by Ahmed Radwan.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200776 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 08:53:47 +00:00
Vinod Kumar Vavilapalli
5ac8276168
MAPREDUCE-3392. Fixed Cluster's getDelegationToken's API to return null when there isn't a supported token. Contributed by John George.
...
svn merge -c r1200484 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200485 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 19:21:29 +00:00
Vinod Kumar Vavilapalli
b7ff3d01b5
MAPREDUCE-3280. Removed the unnecessary job user-name configuration in mapred-site.xml. (vinodkv)
...
svn merge -c r1200441 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1200444 13f79535-47bb-0310-9956-ffa450edef68
2011-11-10 17:31:14 +00:00
Vinod Kumar Vavilapalli
cfbea52bd9
MAPREDUCE-3333. Fixed bugs in ContainerLauncher of MR AppMaster due to which per-container connections to NodeManager were lingering long enough to hit the ulimits on number of processes. (vinodkv)
...
svn merge -c r1199751 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1199757 13f79535-47bb-0310-9956-ffa450edef68
2011-11-09 13:45:02 +00:00
Vinod Kumar Vavilapalli
fe6c20b02a
MAPREDUCE-3342. Fixed JobHistoryServer to also show the job's queue name. Contributed by Jonathan Eagles.
...
svn merge -c r1199133 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1199135 13f79535-47bb-0310-9956-ffa450edef68
2011-11-08 07:30:56 +00:00
Thomas White
4f5fdb21cc
Merge -r 1198909:1198910 from trunk to branch-0.23. Fixes: MAPREDUCE-3344.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1198914 13f79535-47bb-0310-9956-ffa450edef68
2011-11-07 20:16:12 +00:00
Mahadev Konar
4657411161
MAPREDUCE-3291. App fail to launch due to delegation token not found in cache (Robert Evans via mahadev) -Merging r1198583 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1198585 13f79535-47bb-0310-9956-ffa450edef68
2011-11-06 23:04:35 +00:00
Vinod Kumar Vavilapalli
b793e277aa
MAPREDUCE-3297. Moved log related components into yarn-common so that HistoryServer and clients can use them without depending on the yarn-server-nodemanager module. Contributed by Siddharth Seth.
...
svn merge -c r1196986 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1196988 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 08:07:16 +00:00
Arun Murthy
46d9ffc886
Merge -c 1196977 from trunk to branch-0.23 to fix MAPREDUCE-3337.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1196978 13f79535-47bb-0310-9956-ffa450edef68
2011-11-03 07:08:33 +00:00
Thomas White
92fd345d14
Merge -r 1195816:1195817 from trunk to branch-0.23. Fixes: HADOOP-7782.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195821 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 04:53:00 +00:00
Arun Murthy
e6f85573e7
Merge -c 1195792 from trunk to branch-0.23 to fix MAPREDUCE-3237.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195793 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 03:19:48 +00:00
Mahadev Konar
17795f65ea
MAPREDUCE-3103. Implement Job ACLs for MRAppMaster. (mahadev) - Merging r1195761 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195763 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 01:54:20 +00:00
Arun Murthy
85ab392795
Merge -c 1195743 from trunk to branch-0.23 to fix MAPREDUCE-3321.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195744 13f79535-47bb-0310-9956-ffa450edef68
2011-11-01 00:59:13 +00:00
Arun Murthy
07c755a394
Merge -c 1195575 from trunk to branch-0.23 to fix MAPREDUCE-3035.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195576 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 17:29:35 +00:00
Vinod Kumar Vavilapalli
cee984b9b3
MAPREDUCE-2696. Fixed NodeManager to cleanup logs in a thread when logs' aggregation is not enabled. Contributed by Siddharth Seth.
...
svn merge -c r1195383 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195387 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 10:00:55 +00:00
Vinod Kumar Vavilapalli
4b4b1c89cc
MAPREDUCE-3146. Added a MR specific command line to dump logs for a given TaskAttemptID. Contributed by Siddharth Seth.
...
svn merge -c r1195349 --ignore-ancestry ../../trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195353 13f79535-47bb-0310-9956-ffa450edef68
2011-10-31 06:48:08 +00:00
Vinod Kumar Vavilapalli
80ecd29d8a
MAPREDUCE-3274. Fixed a race condition in MRAppMaster that was causing a task-scheduling deadlock. Contributed by Robert Joseph Evans.
...
svn merge -c r1195145 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1195146 13f79535-47bb-0310-9956-ffa450edef68
2011-10-30 11:33:34 +00:00
Arun Murthy
6f2f253446
Merge -c 1194850 from trunk to branch-0.23 to fix MAPREDUCE-3256.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1194851 13f79535-47bb-0310-9956-ffa450edef68
2011-10-29 09:37:02 +00:00
Thomas White
1d54c6e5a7
Merge -r 1190702:1190703 from trunk to branch-0.23. Fixes: HADOOP-7763.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190706 13f79535-47bb-0310-9956-ffa450edef68
2011-10-29 00:17:58 +00:00
Alejandro Abdelnur
7362f67bcb
Merge -r 1190139:1190140 from trunk to branch. FIXES: MAPREDUCE-3209
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190676 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 23:41:29 +00:00
Alejandro Abdelnur
954b0ff8ab
Merge -r 1188475:1188476 from trunk to branch. FIXES: MAPREDUCE-3248
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190671 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 23:30:05 +00:00
Alejandro Abdelnur
073139bb57
Merge -r 1185966:1185967 from trunk to branch. FIXES: MAPREDUCE-3199
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190667 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 23:14:55 +00:00
Alejandro Abdelnur
0eba9bcc06
Merge -r 1180282:1180283 from trunk to branch. FIXES: MAPREDUCE-3003
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190643 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 22:36:55 +00:00
Arun Murthy
f9376e264d
Merge -c 1190495 from trunk to branch-0.23 to fix MAPREDUCE-3304.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190496 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 18:46:27 +00:00
Vinod Kumar Vavilapalli
4fbaa0ff46
MAPREDUCE-3296. Fixed the remaining nine FindBugs warnings. (vinodkv)
...
svn merge -c r1190187 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190188 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 07:46:21 +00:00
Vinod Kumar Vavilapalli
fc8079e054
MAPREDUCE-2989. Modified JobHistory to link to task and AM logs from the JobHistoryServer. Contributed by Siddharth Seth.
...
svn merge -c r1190174 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190175 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 06:52:40 +00:00
Mahadev Konar
06e892c3e1
MAPREDUCE-3292. In secure mode job submission fails with Provider org.apache.hadoop.mapreduce.security.token.JobTokenIndentifier not found. (mahadev) - Merging r1190171 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190172 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 06:15:18 +00:00
Arun Murthy
524b2d514f
Merge -c 1190160 from trunk to branch-0.23 to fix MAPREDUCE-3258.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190161 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 05:08:53 +00:00
Mahadev Konar
e8b692c4f6
MAPREDUCE-3186. User jobs are getting hanged if the Resource manager process goes down and comes up while job is getting executed. (Eric Payne via mahadev) - Merging r1190122 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190123 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 01:42:21 +00:00
Mahadev Konar
0b0404822c
MAPREDUCE-3282. bin/mapred job -list throws exception. (acmurthy via mahadev) - Merging r1190110 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190112 13f79535-47bb-0310-9956-ffa450edef68
2011-10-28 01:19:09 +00:00
Arun Murthy
0991b7560e
Merge -c 1190084 from trunk to branch-0.23 to fix MAPREDUCE-3284.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1190086 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 23:24:15 +00:00
Arun Murthy
4499878392
Merge -c 1189879 from trunk to branch-0.23 to fix MAPREDUCE-3228.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189880 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 17:32:39 +00:00
Vinod Kumar Vavilapalli
28676b5345
MAPREDUCE-2986. Fixed MiniYARNCluster to support multiple NodeManagers. Contributed by Anupam Seth.
...
svn merge -c r1189721 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189723 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 12:44:57 +00:00
Vinod Kumar Vavilapalli
c5028eaa38
MAPREDUCE-3240. Fixed NodeManager to be able to forcefully cleanup its containers (process-trees) irrespective of whether the container succeeded, or killed. Contributed by Hitesh Shah.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189713 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 12:06:08 +00:00
Arun Murthy
d5ae121690
Merge -c 1189670 from trunk to branch-0.23 to fix MAPREDUCE-3279.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189672 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 08:32:18 +00:00
Arun Murthy
23eb484fa1
Merge -c 1189630 from trunk to branch-0.23 to fix MAPREDUCE-3257.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189631 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 06:25:07 +00:00
Mahadev Konar
43ef9dbcb5
MAPREDUCE-3264. mapreduce.job.user.name needs to be set automatically. (acmurthy via mahadev) - Merging r1189616 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189617 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 06:06:30 +00:00
Arun Murthy
b211fc72cc
Merge -c 1189036 from trunk to branch-0.23 to fix for MAPREDUCE-2858.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189037 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 06:32:26 +00:00
Mahadev Konar
383b8ed9d9
MAPREDUCE-3250. When AM restarts, client keeps reconnecting to the new AM and prints a lots of logs. (vinodkv via mahadev) - Merging r1189023 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189024 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 04:35:40 +00:00
Arun Murthy
b0384fc087
Merge -c 1189012 from trunk to branch-0.23 to complete fix for MAPREDUCE-2977.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1189013 13f79535-47bb-0310-9956-ffa450edef68
2011-10-26 02:58:00 +00:00
Arun Murthy
d22a142f94
Merge -c 1188842
from trunk to branch-0.23 to complete fix for MAPREDUCE-3253.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188843 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 18:14:45 +00:00
Arun Murthy
1bef05715d
Merge -c 1188528 from trunk to branch-0.23 to complete fix for MAPREDUCE-2821.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188529 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 06:27:24 +00:00
Mahadev Konar
ddccefbefb
MAPREDUCE-2746. Yarn servers can't communicate with each other with hadoop.security.authorization set to true (acmurthy via mahadev) - Merging r1188522 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188524 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 06:12:14 +00:00
Arun Murthy
1527edc627
Merge -c 1188388 from trunk to branch-0.23 to complete fix for MAPREDUCE-3252.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188467 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 00:41:52 +00:00
Todd Lipcon
21ded50c4d
MAPREDUCE-3252. Fix map tasks to not rewrite data an extra time when map output fits in spill buffer. Contributed by Todd Lipcon.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188423 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 22:32:47 +00:00
Arun Murthy
28d52eabfa
Merge -c 1188377 from trunk to branch-0.23 to complete fix for MAPREDUCE-3028.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188378 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 21:03:22 +00:00
Vinod Kumar Vavilapalli
df7a66844b
MAPREDUCE-2747. Cleaned up LinuxContainerExecutor binary sources and changed the configuration to use yarn names. Contributed by Robert Joseph Evans.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188261 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 17:59:30 +00:00
Vinod Kumar Vavilapalli
6069c2a82d
MAPREDUCE-2708. Designed and implemented MR Application Master recovery to make MR AMs resume their progress after restart. Contributed by Sharad Agarwal.
...
svn merge -c r1188043 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1188044 13f79535-47bb-0310-9956-ffa450edef68
2011-10-24 08:44:54 +00:00
Vinod Kumar Vavilapalli
b9e90a3319
MAPREDUCE-3233. Fixed a bug in MR Job so as to be able to restart the application on AM crash. Contributed by Mahadev Konar.
...
svn merge -c r1187669 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187670 13f79535-47bb-0310-9956-ffa450edef68
2011-10-22 08:13:20 +00:00
Vinod Kumar Vavilapalli
56072a170d
MAPREDUCE-3087. Fixed the mapreduce classpath to correctly include the generated-classpath file needed for tests. Contributed by Ravi Prakash.
...
svn merge -c r1187658 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187659 13f79535-47bb-0310-9956-ffa450edef68
2011-10-22 06:48:42 +00:00
Vinod Kumar Vavilapalli
1605fb7dbc
MAPREDUCE-3058. Fixed MR YarnChild to report failure when task throws an error and thus prevent a hanging task and job. (vinodkv)
...
svn merge -c r1187654 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187655 13f79535-47bb-0310-9956-ffa450edef68
2011-10-22 06:17:25 +00:00
Mahadev Konar
cbd1258918
MAPREDUCE-3239. Use new createSocketAddr API in MRv2 to give better error messages on misconfig (Todd Lipcon via mahadev) - Merging r1187556 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187558 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 21:38:45 +00:00
Mahadev Konar
1edb5c8f9e
MAPREDUCE-3163. JobClient spews errors when killing MR2 job. (mahadev) - Merging r1187491 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187492 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 18:38:26 +00:00
Todd Lipcon
5acc010db8
MAPREDUCE-2629. Workaround a JVM class loading quirk which prevents JIT compilation of inner classes methods in ReduceContextImpl. Contributed by Eric Caspole.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187182 13f79535-47bb-0310-9956-ffa450edef68
2011-10-21 05:20:14 +00:00
Arun Murthy
fe370841e6
Merge -c 1187116 from trunk to branch-0.23 to complete fix for MAPREDUCE-3226.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1187119 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 22:45:08 +00:00
Vinod Kumar Vavilapalli
9a8b923418
MAPREDUCE-3104. Implemented Application-acls. (vinodkv)
...
svn merge -c r1186748 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186754 13f79535-47bb-0310-9956-ffa450edef68
2011-10-20 12:01:54 +00:00
Arun Murthy
c56916f582
Merge -c 1186542 from trunk to branch-0.23 to complete fix for MAPREDUCE-3208.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186544 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 22:38:53 +00:00
Arun Murthy
38a73eebaf
Merge -c 1186529 from trunk to branch-0.23 to complete fix for MAPREDUCE-2693.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186530 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 22:02:57 +00:00
Arun Murthy
cad9bc8843
Merge -c 1186458 from trunk to branch-0.23 to complete fix for MAPREDUCE-3181.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186459 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 20:28:49 +00:00
Vinod Kumar Vavilapalli
3b39b29b9c
MAPREDUCE-3176. Fixed ant mapreduce tests that are timing out because of wrong framework name. Contributed by Hitesh Shah.
...
svn merge -c r1186368 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186369 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 17:58:32 +00:00
Vinod Kumar Vavilapalli
e3b9d11da8
MAPREDUCE-3144. Augmented JobHistory with the information needed for serving aggregated logs. Contributed by Siddharth Seth.
...
svn merge -c r1185976 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185977 13f79535-47bb-0310-9956-ffa450edef68
2011-10-19 05:28:22 +00:00
Mahadev Konar
a9fe990f7b
MAPREDUCE-3203. Fix some javac warnings in MRAppMaster. (mahadev) - Merging r1185909 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185910 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 22:48:09 +00:00
Arun Murthy
dfb1c18558
Merge -c 1185887 from trunk to branch-0.23 to complete fix for MAPREDUCE-3165.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185888 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 21:46:15 +00:00
Arun Murthy
a990576916
Merge -c 1185880 from trunk to branch-0.23 to complete fix for MAPREDUCE-2762.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185881 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 21:38:08 +00:00
Mahadev Konar
c1c9ad377e
MAPREDUCE-3197. TestMRClientService failing on building clean checkout of branch 0.23 (mahadev) - Merging r1185486 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185487 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 05:13:11 +00:00
Arun Murthy
df93e27dd6
Merge -c 1185447 from trunk to branch-0.23 to complete fix for MAPREDUCE-3068.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185448 13f79535-47bb-0310-9956-ffa450edef68
2011-10-18 01:23:14 +00:00
Vinod Kumar Vavilapalli
2ce6540fb0
MAPREDUCE-3032. Fixed TaskAttemptImpl so that JobHistory can have error information about failed tasks. Contributed by Devaraj K.
...
svn merge -c r1185247 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1185250 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 15:21:34 +00:00
Mahadev Konar
e2edc8f20b
MAPREDUCE-2840. mr279 TestUberAM.testSleepJob test fails. (jonathan eagles via mahadev) - Merging r1184971 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184972 13f79535-47bb-0310-9956-ffa450edef68
2011-10-17 01:24:06 +00:00
Mahadev Konar
065ca399c8
MAPREDUCE-3187. Add names for various unnamed threads in MR2. (Todd Lipcon and Siddharth Seth via mahadev) - Merging r1184904 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1184905 13f79535-47bb-0310-9956-ffa450edef68
2011-10-16 19:30:13 +00:00
Jitendra Nath Pandey
e8caaba2f3
Merged r1183513 from trunk for MAPREDUCE-3192.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183579 13f79535-47bb-0310-9956-ffa450edef68
2011-10-15 01:26:33 +00:00
Jitendra Nath Pandey
0672834f2d
Merged r1183187 from trunk for MAPREDUCE-2764.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183576 13f79535-47bb-0310-9956-ffa450edef68
2011-10-15 01:16:34 +00:00
Mahadev Konar
34418d0c91
MAPREDUCE-3057. Job History Server goes of OutOfMemory with 1200 Jobs and Heap Size set to 10 GB. (Eric Payne via mahadev) - Merging r1183545 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183547 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 22:52:05 +00:00
Arun Murthy
8876fb033f
Merge -c 1183188 from trunk to branch-0.23 to fix MAPREDUCE-3124.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183189 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 01:27:56 +00:00
Arun Murthy
ea8f6cf534
Merge -c 1183185 from trunk to branch-0.23 to fix MAPREDUCE-3170.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1183186 13f79535-47bb-0310-9956-ffa450edef68
2011-10-14 01:17:11 +00:00
Arun Murthy
c2ae3d6e36
Merge -c 1182616 from trunk to branch-0.23 to fix MAPREDUCE-2789.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182617 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 23:29:53 +00:00
Arun Murthy
b57ac1cf61
Merge -c 1182613 from trunk to branch-0.23 to fix MAPREDUCE-2666.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182614 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 23:12:37 +00:00
Vinod Kumar Vavilapalli
a6d54ece55
MAPREDUCE-3125. Modified TaskImpl to consider only non-failed, non-killed task-attempts for obtaining task's progress. Contributed by Hitesh Shah.
...
svn merge -c r1182230 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182231 13f79535-47bb-0310-9956-ffa450edef68
2011-10-12 06:53:14 +00:00
Arun Murthy
76fb42f94d
Merge -c 1182008 from trunk to branch-0.23 to fix MAPREDUCE-3126.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1182009 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 18:30:00 +00:00
Vinod Kumar Vavilapalli
73b6474bac
MAPREDUCE-2668. Fixed AuxServices to send a signal on application-finish to all the services. Contributed by Thomas Graves.
...
svn merge -c r1181803 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1181807 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 14:29:50 +00:00
Vinod Kumar Vavilapalli
af72e41ee1
MAPREDUCE-3020. Fixed TaskAttemptImpl to log the correct node-address for a finished Reduce task. (Chackaravarthy via vinodkv)
...
svn merge -c r1181793 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1181794 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 14:12:11 +00:00
Vinod Kumar Vavilapalli
ddaf7c8a7f
MAPREDUCE-3161. svn merge -c r1181622 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1181623 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 04:47:28 +00:00
Arun Murthy
8d0daf8843
Merge -c 1181310 from trunk to branch-0.23 to fix MAPREDUCE-3158.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1181311 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 00:27:39 +00:00
Arun Murthy
590ff92e7a
Merge -c 1180774 from trunk to branch-0.23 to fix MAPREDUCE-3154.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180775 13f79535-47bb-0310-9956-ffa450edef68
2011-10-10 03:30:24 +00:00
Arun Murthy
bc8010bd00
Merge -c 1180220 from trunk to branch-0.23 to fix MAPREDUCE-2802.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180222 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 20:45:18 +00:00
Arun Murthy
fce52877b1
Merge -c 1180214 from trunk to branch-0.23 to fix MAPREDUCE-3033.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180216 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 20:40:40 +00:00
Vinod Kumar Vavilapalli
3c053ee51e
MAPREDUCE-3141. svn merge -c r1180007 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1180008 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 11:36:36 +00:00
Vinod Kumar Vavilapalli
a9f2a60872
MAPREDUCE-2913. svn merge -c r1179319 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179326 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 17:10:38 +00:00
Vinod Kumar Vavilapalli
763327fd51
MAPREDUCE-2702. svn merge -c r1179188 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179191 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 12:17:46 +00:00
Vinod Kumar Vavilapalli
8ccbd7d135
MAPREDUCE-2907. svn merge -c r1179178 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179181 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 11:58:41 +00:00
Vinod Kumar Vavilapalli
c4148c8db1
MAPREDUCE-3013. svn merge -c r1179174 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1179175 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 11:47:00 +00:00
Vinod Kumar Vavilapalli
fd1e8b15d5
MAPREDUCE-3056. svn merge -c r1178740 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1178741 13f79535-47bb-0310-9956-ffa450edef68
2011-10-04 09:39:50 +00:00
Arun Murthy
4f754bfb15
Merge -r 1178649:1178650 from trunk to branch-0.23 to fix MAPREDUCE-3138.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1178651 13f79535-47bb-0310-9956-ffa450edef68
2011-10-04 00:43:20 +00:00
Arun Murthy
9efc5089de
Merge -r 1178630:1178631 from trunk to branch-0.23 to fix MAPREDUCE-2792.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1178633 13f79535-47bb-0310-9956-ffa450edef68
2011-10-03 23:23:04 +00:00
Konstantin Shvachko
1efe4e403d
MAPREDUCE-2779. JobSplitWriter.java can't handle large job.split file. Contributed by Ming Ma.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177783 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 19:16:54 +00:00
Vinod Kumar Vavilapalli
908f1d5d01
MAPREDUCE-3098. svn merge -c r1177633 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177639 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 12:54:53 +00:00
Arun Murthy
be51b71dee
Merge -r 1177530:1177531 from trunk to branch-0.23 to fix MAPREDUCE-2996.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177532 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 06:49:43 +00:00
Arun Murthy
f99d1f7fde
Merge -r 1177486:1177487 from trunk to branch-0.23 to fix MAPREDUCE-2791.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177490 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30 03:10:57 +00:00
Vinod Kumar Vavilapalli
3513e3d673
MAPERDUCE-3001. svn merge -c r1177203 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1177206 13f79535-47bb-0310-9956-ffa450edef68
2011-09-29 08:13:15 +00:00
Arun Murthy
e6f5bf6dd8
Merge -r 1176761:1176762 from trunk to branch-0.23 to fix MAPREDUCE-3078.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176763 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 07:32:22 +00:00
Arun Murthy
f67abbdbf6
Merge -r 1176714:1176715 from trunk to branch-0.23 to fix MAPREDUCE-3041.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176718 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 04:25:19 +00:00
Arun Murthy
eb30a784d1
Merge -r 1176680:1176681 from trunk to branch-0.23 to fix MAPREDUCE-3021.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176683 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28 01:25:32 +00:00
Mahadev Konar
8203f69ebc
MAPREDUCE-3054. Unable to kill submitted jobs. (mahadev) - Merging r1176600 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176604 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 20:36:20 +00:00
Vinod Kumar Vavilapalli
72a72ecdc0
MAPREDUCE-3092. svn merge -c r1176453 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176458 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 16:18:18 +00:00
Mahadev Konar
876bb258d2
MAPREDUCE-3071. app master configuration web UI link under the Job menu opens up application menu. (thomas graves via mahadev) - merging r1176203 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176205 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27 05:33:48 +00:00
Vinod Kumar Vavilapalli
8a01676b92
MAPREDUCE-2646. svn merge -c r1175859 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1175861 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 13:29:26 +00:00
Arun Murthy
b92299d168
Merge -r 1175717:1175718 from trunk to branch-0.23 to fix MAPREDUCE-3090.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1175719 13f79535-47bb-0310-9956-ffa450edef68
2011-09-26 08:45:56 +00:00
Vinod Kumar Vavilapalli
6b6e177b70
MAPREDUCE-2952. svn merge -c r1175403 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1175408 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 14:54:00 +00:00
Arun Murthy
da47ed5089
Merge -r 1175293:1175294 from trunk to branch-0.23 to fix MAPREDUCE-2961.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1175295 13f79535-47bb-0310-9956-ffa450edef68
2011-09-25 04:51:23 +00:00
Vinod Kumar Vavilapalli
2377d1697f
MAPREDUCE-3055. svn merge -c r1174785 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1174792 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 14:12:27 +00:00
Arun Murthy
2be11b42a1
Merge -r 1174293:1174294 from trunk to branch-0.23 to fix MAPREDUCE-3073.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1174295 13f79535-47bb-0310-9956-ffa450edef68
2011-09-22 18:06:20 +00:00
Vinod Kumar Vavilapalli
c679348aa5
MAPREDUCE-2754. svn merge -c r1174194 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1174195 13f79535-47bb-0310-9956-ffa450edef68
2011-09-22 15:18:50 +00:00
Mahadev Konar
9b93426833
MAPREDUCE-3044. Pipes jobs stuck without making progress. (mahadev) - Merging -r1173909 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173910 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 23:54:44 +00:00
Vinod Kumar Vavilapalli
01da4430d2
MAPREDUCE-2880. svn merge -c r1173783 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173792 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 18:52:27 +00:00
Vinod Kumar Vavilapalli
83d9dc9f8c
MAPREDUCE-2970. svn merge -c r1173534 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173536 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 09:15:39 +00:00
Vinod Kumar Vavilapalli
9a8f4b655a
MAPREDUCE-2930. svn merge -c r1173524 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173525 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 08:40:17 +00:00
Arun Murthy
e547ed0d10
Merge -r 1173457:1173458 from trunk to branch-0.23 to fix MAPREDUCE-3023.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173460 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 01:33:14 +00:00
Arun Murthy
be05e01471
Merge -r 1173455:1173456 from trunk to branch-0.23 to fix MAPREDUCE-2998.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1173457 13f79535-47bb-0310-9956-ffa450edef68
2011-09-21 01:27:49 +00:00
Vinod Kumar Vavilapalli
d4c7bb64bf
MAPREDUCE-3040. svn merge -c r1172929 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172984 13f79535-47bb-0310-9956-ffa450edef68
2011-09-20 06:04:28 +00:00
Arun Murthy
6c784e74fd
Merge -r 1172892:1172893 from trunk to branch-0.23 to fix MAPREDUCE-3004.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172895 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 23:18:10 +00:00
Vinod Kumar Vavilapalli
eed08c0356
MAPREDUCE-2726. svn merge -c r1172704 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172708 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 17:05:06 +00:00
Vinod Kumar Vavilapalli
3ee4f465e0
MAPREDUCE-2925. svn merge -c r1172587 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172588 13f79535-47bb-0310-9956-ffa450edef68
2011-09-19 12:28:09 +00:00
Vinod Kumar Vavilapalli
00e80b9dfa
MAPREDUCE-2965. svn merge -c r1172212 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172215 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 08:10:02 +00:00
Vinod Kumar Vavilapalli
dffecdf85a
MAPREDUCE-3006. svn merge -c r1172206 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172207 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 07:18:42 +00:00
Mahadev Konar
8c99dc8435
MAPREDUCE-1788. o.a.h.mapreduce.Job shouldn't make a copy of the JobConf. (Arun Murthy via mahadev) - Merging r1172171 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1172172 13f79535-47bb-0310-9956-ffa450edef68
2011-09-18 02:52:44 +00:00
Arun Murthy
c09246b2e8
Fixed broken merge for MAPREDUCE-2987
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171924 13f79535-47bb-0310-9956-ffa450edef68
2011-09-17 07:16:47 +00:00
Arun Murthy
9146f43c8d
Merge -r 1171900:1171901 from trunk to branch-0.23 to fix MAPREDUCE-2987.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171902 13f79535-47bb-0310-9956-ffa450edef68
2011-09-17 05:53:28 +00:00
Mahadev Konar
66ad5a6154
MAPREDUCE-2672. MR-279: JobHistory Server needs Analysis this job. (Robert Evans via mahadev) - Merging r1171297 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171299 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 22:23:11 +00:00
Vinod Kumar Vavilapalli
38e0f786b2
MAPREDUCE-3007. svn merge -c r1171051 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1171057 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15 11:21:03 +00:00
Vinod Kumar Vavilapalli
3e8f0b3c8e
MAPREDUCE-2966. svn merge -c r1170746 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1170751 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 18:01:53 +00:00
Mahadev Konar
90a5181501
MAPREDUCE-2899. Replace major parts of ApplicationSubmissionContext with a ContainerLaunchContext (Arun Murthy via mahadev) - Merging r1170459 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1170460 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 07:29:45 +00:00
Mahadev Konar
cc9369f691
MAPREDUCE-2676. MR-279: JobHistory Job page needs reformatted. (Robert Evans via mahadev) - Merging r1170379 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1170380 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 22:57:59 +00:00
Arun Murthy
ba9254b44f
fMerge -r 1170280:1170281 from trunk to branch-0.23 to fix MAPREDUCE-2997.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1170283 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 18:15:54 +00:00
Arun Murthy
cd7c0749ca
fMerge -r 1170278:1170279 from trunk to branch-0.23 to fix MAPREDUCE-2995.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1170280 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 18:13:05 +00:00
Arun Murthy
677c212467
Merge -r 1169979:1169980 from trunk to branch-0.23 to fix MAPREDUCE-2896.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1169981 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 00:07:09 +00:00
Arun Murthy
6ad35c6378
Merge -r 1169972:1169973 from trunk to branch-0.23 to fix MAPREDUCE-2874.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1169974 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 23:18:30 +00:00
Vinod Kumar Vavilapalli
cc9f49a7cb
MAPREDUCE-2979. svn merge -c r1169808 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1169810 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 16:03:01 +00:00
Vinod Kumar Vavilapalli
a7b3a14363
MAPREDUCE-2675. svn merge -c r1169763 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1169767 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12 14:28:02 +00:00
Arun Murthy
cbd0ddfebe
Merge -r 1169483:1169484 from trunk to branch-0.23 to fix MAPREDUCE-2933.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1169485 13f79535-47bb-0310-9956-ffa450edef68
2011-09-11 17:28:08 +00:00
Vinod Kumar Vavilapalli
6814d04c3e
MAPREDUCE-2691. svn merge -c r1167676 --ignore-ancestry ../../trunk/
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1167677 13f79535-47bb-0310-9956-ffa450edef68
2011-09-11 06:29:05 +00:00
Mahadev Konar
5bb361cee4
MAPREDUCE-2971. ant build mapreduce fails protected access jc.displayJobList (jobs) (Thomas Graves via mahadev) - merging 1167383 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1167384 13f79535-47bb-0310-9956-ffa450edef68
2011-09-09 22:45:41 +00:00