Sanford Ryza
0d54ef3b62
MAPREDUCE-5454. TestDFSIO fails intermittently on JDK7 (Karthik Kambatla via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1513376 13f79535-47bb-0310-9956-ffa450edef68
2013-08-13 07:12:49 +00:00
Jason Darrell Lowe
432eef4ede
svn merge -c 1511464 FIXES: MAPREDUCE-5425. Junit in TestJobHistoryServer failing in jdk 7. Contributed by Robert Parker
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511467 13f79535-47bb-0310-9956-ffa450edef68
2013-08-07 20:07:15 +00:00
Sanford Ryza
2a7293a254
MAPREDUCE-434. LocalJobRunner limited to single reducer (Sandy Ryza and Aaron Kimball via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510867 13f79535-47bb-0310-9956-ffa450edef68
2013-08-06 06:40:42 +00:00
Sanford Ryza
75c40235aa
MAPREDUCE-5399. Unnecessary Configuration instantiation in IFileInputStream slows down merge. (Stanislav Barton via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510813 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 23:35:03 +00:00
Sanford Ryza
3490c9aab7
MAPREDUCE-5367. Local jobs all use same local working directory (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510612 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 17:12:58 +00:00
Kihwal Lee
7d36680e73
svn merge -c 1510581 Merging from trunk to branch-2 to fix MAPREDUCE-5446. TestJobHistoryEvents and TestJobHistoryParsing have race conditions.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510583 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 16:05:04 +00:00
Jason Darrell Lowe
4cd5cb862c
svn merge -c 1509900 FIXES: MAPREDUCE-5440. TestCopyCommitter Fails on JDK7. Contributed by Robert Parker
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509901 13f79535-47bb-0310-9956-ffa450edef68
2013-08-02 22:53:52 +00:00
Jason Darrell Lowe
3251cfca85
svn merge -c 1509499 FIXES: Update fix versions for JIRAs pulled from branch-2 into branch-2.1-beta.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509501 13f79535-47bb-0310-9956-ffa450edef68
2013-08-02 00:43:07 +00:00
Jason Darrell Lowe
d10bda6ad9
svn merge -c 1509475 FIXES: Correct fix versions for MAPREDUCE-5428 and YARN-573.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509476 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 23:55:30 +00:00
Jason Darrell Lowe
b4c28a1aa9
svn merge -c 1509401 FIXES: MAPREDUCE-5428. HistoryFileManager doesn't stop threads when service is stopped. Contributed by Karthik Kambatla
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509404 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 20:03:08 +00:00
Siddharth Seth
d7f082ad5f
merge MAPREDUCE-5352 from trunk. Optimize node local splits generated by CombineFileInputFormat. (sseth)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509346 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 17:43:40 +00:00
Vinod Kumar Vavilapalli
d00dcbd2f5
MAPREDUCE-5385. Fixed a bug with JobContext getCacheFiles API. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1508595 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508596 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 20:05:19 +00:00
Arun Murthy
e65416a459
Updating release date for hadoop-2.1.0-beta.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508408 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 12:25:13 +00:00
Jason Darrell Lowe
3bd5174a8e
svn merge -c 1508220 FIXES: MAPREDUCE-5411. Refresh size of loaded job cache on history server. Contributed by Ashwin Shankar
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508224 13f79535-47bb-0310-9956-ffa450edef68
2013-07-29 22:48:00 +00:00
Jason Darrell Lowe
5df508c539
svn merge -c 1507486 FIXES: MAPREDUCE-5419. TestSlive is getting FileNotFound Exception. Contributed by Robert Parker
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507487 13f79535-47bb-0310-9956-ffa450edef68
2013-07-26 22:03:15 +00:00
Vinod Kumar Vavilapalli
6bc4693384
MAPREDUCE-5421. Fixed TestNonExistentJob failure after YARN-873. Contributed by Junping Du.
...
svn merge --ignore-ancestry -c 1507401 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507402 13f79535-47bb-0310-9956-ffa450edef68
2013-07-26 19:16:08 +00:00
Jason Darrell Lowe
f6611d89c8
svn merge -c 1507385 FIXES: MAPREDUCE-1981. Improve getSplits performance by using listLocatedStatus. Contributed by Hairong Kuang and Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507387 13f79535-47bb-0310-9956-ffa450edef68
2013-07-26 18:22:00 +00:00
Jason Darrell Lowe
fca19f6a8a
svn merge -c 1507135 FIXES: MAPREDUCE-5386. Ability to refresh history server job retention and job cleaner settings. Contributed by Ashwin Shankar
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507378 13f79535-47bb-0310-9956-ffa450edef68
2013-07-26 17:32:00 +00:00
Jason Darrell Lowe
b11cceb25c
svn merge -c 1507104 FIXES: MAPREDUCE-5251. Reducer should not implicate map attempt if it has insufficient space to fetch map output. Contributed by Ashwin Shankar
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507105 13f79535-47bb-0310-9956-ffa450edef68
2013-07-25 19:45:20 +00:00
Alejandro Abdelnur
98eb429771
MAPREDUCE-5213. Re-assess TokenCache methods marked @Private. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506759 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 22:33:59 +00:00
Vinod Kumar Vavilapalli
f487f4eb19
YARN-926. Modified ContainerManagerProtcol APIs to take in requests for multiple containers. Contributed by Jian He.
...
MAPREDUCE-5412. Update MR app to use multiple containers API of ContainerManager after YARN-926. Contributed by Jian He.
svn merge --ignore-ancestry -c 1506391 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506392 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 03:42:52 +00:00
Jason Darrell Lowe
d6be90bccf
svn merge -c 1506226 FIXES: MAPREDUCE-5356. Ability to refresh aggregated log retention period and check interval. Contributed by Ashwin Shankar
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506230 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 19:25:19 +00:00
Jason Darrell Lowe
673b762364
svn merge -c 1506154 FIXES: MAPREDUCE-5317. Stale files left behind for failed jobs. Contributed by Ravi Prakash
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506157 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 16:58:41 +00:00
Jason Darrell Lowe
726533a741
svn merge -c 1505771 FIXES: MAPREDUCE-5404. HSAdminServer does not use ephemeral ports in minicluster mode. Contributed by Ted Yu
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505772 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 19:06:07 +00:00
Arun Murthy
1f65519b8a
Fixed CHANGES.txt to reflect that new content in branch-2 goes to hadoop-2.3.0.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504743 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 01:30:18 +00:00
Jason Darrell Lowe
9b1bc20045
svn merge -c 1504645 FIXES: MAPREDUCE-5265. History server admin service to refresh user and superuser group mappings. Contributed by Ashwin Shankar
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504653 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 20:47:58 +00:00
Jason Darrell Lowe
a55ae9e988
svn merge -c 1503957 FIXES: MAPREDUCE-5380. Invalid mapred command should return non-zero exit code. Contributed by Stephen Chu
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503958 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 00:31:52 +00:00
Bikas Saha
41c05101e7
Merge r1503934 from trunk to branch-2 for MAPREDUCE-5398. MR changes for YARN-513 (Jian He via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503936 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 22:56:54 +00:00
Jason Darrell Lowe
2386e127b8
svn merge -c 1503744 to revert MAPREDUCE-5317. Stale files left behind for failed jobs
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503747 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 15:06:42 +00:00
Jason Darrell Lowe
293d42edf0
svn merge -c 1503499 FIXES: MAPREDUCE-5317. Stale files left behind for failed jobs. Contributed by Ravi Prakash
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503505 13f79535-47bb-0310-9956-ffa450edef68
2013-07-15 22:30:39 +00:00
Alejandro Abdelnur
f0983d958d
updating CHANGES.txt after committing MAPREDUCE-5333,HADOOP-9661,HADOOP-9355,HADOOP-9673,HADOOP-9414,HADOOP-9416,HDFS-4797,YARN-866,YARN-736,YARN-883 to 2.1-beta branch
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502074 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 00:21:49 +00:00
Chris Nauroth
9bd8745846
MAPREDUCE-4374. Merging change r1502046 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502048 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 23:08:34 +00:00
Hitesh Shah
1157061429
merge -c 1501599 from trunk to branch-2 to fix YARN-727, MAPREDUCE-5325. ClientRMProtocol.getAllApplications should accept ApplicationType as a parameter. Contributed by Xuan Gong.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501600 13f79535-47bb-0310-9956-ffa450edef68
2013-07-09 23:07:15 +00:00
Chris Nauroth
fd159ded9b
MAPREDUCE-5187. Merging change r1500929 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500930 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 20:28:55 +00:00
Chris Nauroth
2a448cc5e7
MAPREDUCE-5366. Merging change r1500842 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500848 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 17:17:07 +00:00
Chris Nauroth
81bfd0316e
MAPREDUCE-5360. Merging change r1500194 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500195 13f79535-47bb-0310-9956-ffa450edef68
2013-07-06 03:42:43 +00:00
Jason Darrell Lowe
afeff43d7a
svn merge -c 1499425 FIXES: MAPREDUCE-5358. MRAppMaster throws invalid transitions for JobImpl. Contributed by Devaraj K
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499426 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 14:46:54 +00:00
Chris Nauroth
8c10908e1e
MAPREDUCE-5357. Merging change r1499210 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499217 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 05:37:34 +00:00
Chris Nauroth
0f3bb0567d
MAPREDUCE-5359. Merging change r1499153 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499154 13f79535-47bb-0310-9956-ffa450edef68
2013-07-03 00:01:28 +00:00
Chris Nauroth
6c703d6ef0
MAPREDUCE-5355. Merging change r1499148 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499149 13f79535-47bb-0310-9956-ffa450edef68
2013-07-02 23:32:41 +00:00
Jason Darrell Lowe
199485bcdf
svn merge -c 1499125 FIXES: MAPREDUCE-3193. FileInputFormat doesn't read files recursively in the input path dir. Contributed by Devaraj K
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499127 13f79535-47bb-0310-9956-ffa450edef68
2013-07-02 22:00:43 +00:00
Thomas Graves
9520013838
Preparing for 0.23.9 release
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498478 13f79535-47bb-0310-9956-ffa450edef68
2013-07-01 14:27:48 +00:00
Chris Nauroth
5808ba30dd
MAPREDUCE-5349. TestClusterMapReduceTestCase and TestJobName fail on Windows in branch-2. Contributed by Chuan Liu.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498144 13f79535-47bb-0310-9956-ffa450edef68
2013-06-30 15:53:29 +00:00
Alejandro Abdelnur
5d45387c00
MAPREDUCE-5333. Add test that verifies MRAM works correctly when sending requests with non-normalized capabilities. (ywskycn via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1497881 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 18:55:31 +00:00
Arun Murthy
de82f25604
Preparing for hadoop-2.1.0-beta release.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496790 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 06:51:07 +00:00
Arun Murthy
2977cbfc83
Merge -c 1496741 from trunk to branch-2 to fix MAPREDUCE-5326. Added version to shuffle header. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496742 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 05:50:23 +00:00
Siddharth Seth
aa1eba9930
merge MAPREDUCE-5334 from trunk. Fix failing unit tests - TestContainerLauncher, TestContainerLauncherImpl. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494821 13f79535-47bb-0310-9956-ffa450edef68
2013-06-20 00:36:28 +00:00
Jonathan Turner Eagles
d8203c0ae9
MAPREDUCE-5084. fix coverage org.apache.hadoop.mapreduce.v2.app.webapp and org.apache.hadoop.mapreduce.v2.hs.webapp (Aleksey Gorshkov via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494687 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 16:40:20 +00:00
Christopher Douglas
6267cddbd6
MAPREDUCE-5194. Heed interrupts during Fetcher shutdown.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494417 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 02:12:20 +00:00
Jason Darrell Lowe
20a950a374
MAPREDUCE-5316. job -list-attempt-ids command does not handle illegal task-state. Contributed by Ashwin Shankar
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494292 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 20:39:56 +00:00
Arun Murthy
51bb83eabf
Merge -c 1493570 from trunk to branch-2 to fix MAPREDUCE-5184. Document compatibility for MapReduce applications in hadoop-2 vis-a-vis hadoop-1. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493571 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 19:10:32 +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
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
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
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
Daryn Sharp
45ca24c1d8
svn merge -c 1491914 FIXES: MAPREDUCE-5315. DistCp reports success even on failure. (mithun and jlowe via daryn)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491918 13f79535-47bb-0310-9956-ffa450edef68
2013-06-11 19:30:44 +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
Konstantin Boudnik
6e9ad986eb
Setting 2.0.5-alpha release date
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491137 13f79535-47bb-0310-9956-ffa450edef68
2013-06-09 04:51:28 +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
Thomas Graves
ee792cf084
Updating release date for 0.23.8
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489902 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 15:01:24 +00:00
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
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
f67731cc03
MAPREDUCE-5300. Moved to INCOMPATIBLE CHANGES section in CHANGES.txt.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489233 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 23:47:19 +00:00
Arun Murthy
5e0f224234
MAPREDUCE-5299. Changed jira number for the commit in CHANGES.txt.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489230 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 23:45:37 +00:00
Arun Murthy
6edd290758
Merge -c 1489227 from trunk to branch-2 to fix MAPREDUCE-5300. Fix backward incompatibility for o.a.h.mapreduce.filecache.DistributedCache. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489228 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 23:43:14 +00:00
Arun Murthy
1d77b6c417
Merge -c 1489219 from trunk to branch-2 to fix MAPREDUCE-5296. Fix backward incompatibility for JobControl by adding the omitted addJob. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489220 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 22:55:22 +00:00
Arun Murthy
89a1e48cd7
Merge -c 1489187 from trunk to branch-2 to fix MAPREDUCE-5220. Fix backward incompatibility for TaskCompletionEvent by adding back setTaskID. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489188 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 21:35:33 +00:00
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
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
44a72a119a
Adding 2.0.5-alpha release to CHANGES.txt files of branch-2
...
Also updating current version to 2.1.0-beta in the CHANGES.txt files
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488585 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 20:06:32 +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
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
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
Suresh Srinivas
fa88e4ea6e
HADOOP-8562. CHANGES.txt cleanup related to merging the related jiras to branch-2
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486384 13f79535-47bb-0310-9956-ffa450edef68
2013-05-26 00:09:12 +00:00
Konstantin Boudnik
b8535c0ec1
Updating common and mapreduce CHANGES.txt with 2.0.4.1-alpha release
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486270 13f79535-47bb-0310-9956-ffa450edef68
2013-05-25 01:43:46 +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
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
91084635f3
MAPREDUCE-4885. Merge r1467158 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485951 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 07:12:07 +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