23cbe7af90
MAPREDUCE-5483. revert MAPREDUCE-5357. (rkanter via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518773 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 19:26:31 +00:00
35f60e71de
svn merge -c 1517097 to revert MAPREDUCE-5475 and YARN-707
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517098 13f79535-47bb-0310-9956-ffa450edef68
2013-08-24 01:23:39 +00:00
25595863d3
svn merge -c 1517085 FIXES: MAPREDUCE-5475. MRClientService does not verify ACLs properly. Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517086 13f79535-47bb-0310-9956-ffa450edef68
2013-08-23 22:55:45 +00:00
5b8b923cd1
MAPREDUCE-5478. TeraInputFormat unnecessarily defines its own FileSplit subclass (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517055 13f79535-47bb-0310-9956-ffa450edef68
2013-08-23 21:28:16 +00:00
91d8768381
MAPREDUCE-5476. Changed MR AM recovery code to cleanup staging-directory only after unregistering from the RM. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1516660 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516662 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 23:17:57 +00:00
3ad42fba26
MAPREDUCE-5470. Merging change r1516623 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516625 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 21:43:57 +00:00
8d1cd8ddb7
svn merge -c 1516594 FIXES: Revert MAPREDUCE-5475
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516596 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 20:38:06 +00:00
b9cee48717
Merge -c 1516361 from trunk to branch-2 to fix MAPREDUCE-5475. Ensure MRClientService verifies ACLs for users. Contributed by Jason Lowe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516362 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 02:00:29 +00:00
e8268b8a5d
Merge -c 1516358 from trunk to branch-2 to fix MAPREDUCE-5468. Fix MR AM recovery for map-only jobs. Contributed by Vinod K. V.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516359 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 01:53:18 +00:00
83c4906a2e
MAPREDUCE-5466. Changed MR AM to not promote history files of intermediate AMs in case they are exiting because of errors and thus help history-server pick up the right history file for the last successful AM. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1516238 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516240 13f79535-47bb-0310-9956-ffa450edef68
2013-08-21 18:18:13 +00:00
6f27db80ac
svn merge -c 1515863 FIXES: MAPREDUCE-5001. LocalJobRunner has race condition resulting in job failures. Contributed by Sandy Ryza
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515877 13f79535-47bb-0310-9956-ffa450edef68
2013-08-20 17:00:06 +00:00
0bf25e9d4c
svn merge -c 1514768 FIXES: Update CHANGES.txt to reflect merge of MR-1981 to branch-2.1-beta
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514769 13f79535-47bb-0310-9956-ffa450edef68
2013-08-16 16:14:51 +00:00
0c32694b27
MAPREDUCE-5462. In map-side sort, swap entire meta entries instead of indexes for better cache performance. (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514610 13f79535-47bb-0310-9956-ffa450edef68
2013-08-16 08:14:58 +00:00
aa3f77675b
Preparing for hadoop-2.1.0-beta rc2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514471 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 20:34:25 +00:00
56cfd507f1
Update CHANGES.txt to move YARN-1045 and MAPREDUCE-5352 to the correct version.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514433 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 18:46:03 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Alejandro Abdelnur
Jason Darrell Lowe
Sanford Ryza
Vinod Kumar Vavilapalli
Chris Nauroth
Arun Murthy
Siddharth Seth
Kihwal Lee
Bikas Saha
Hitesh Shah