1629 Commits

Author SHA1 Message Date
Thomas White
5fe01ec75a Merge -r 1215353:1215354 from trunk to branch-0.23. Fixes: HDFS-2640.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215355 13f79535-47bb-0310-9956-ffa450edef68
2011-12-17 00:12:05 +00:00
Vinod Kumar Vavilapalli
84138f3864 MAPREDUCE-3387. Fixed AM's tracking URL to always go through the proxy, even before the job started, so that it works properly with oozie throughout the job execution. Contributed by Robert Joseph Evans.
svn merge -c 1215345 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215347 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 23:42:56 +00:00
Mahadev Konar
e0657fb161 MAPREDUCE-3366. Mapreduce component should use consistent directory structure layout as HDFS/common (Eric Yang via mahadev) - Merging r1215065 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1215066 13f79535-47bb-0310-9956-ffa450edef68
2011-12-16 09:17:00 +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
Alejandro Abdelnur
1a231a0b22 Merge -r 1214789:1214790 from trunk to branch. FIXES: HADOOP-7917
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214792 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 14:47:22 +00:00
Mahadev Konar
89d38008a0 MAPREDUCE-3560. TestRMNodeTransitions is failing on trunk. (Siddharth Seth via mahadev) - Merging r1214668 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214669 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 09:13: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
Siddharth Seth
e4f63a94b0 merge MAPREDUCE-3531 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214595 13f79535-47bb-0310-9956-ffa450edef68
2011-12-15 02:11:19 +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
Vinod Kumar Vavilapalli
5aa03f2ef5 MAPREDUCE-3530. Fixed an NPE occuring during scheduling in the ResourceManager. Contributed by Arun C Murthy.
svn merge -c 1214476 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214478 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 21:23:41 +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
4ba1442b67 MAPREDUCE-3398. Fixed log aggregation to work correctly in secure mode. Contributed by Siddharth Seth.
svn merge -c 1214429 --ignore-ancestry ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214432 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 19:58:00 +00:00
Alejandro Abdelnur
3ae9ee1005 Merge -r 1214353:1214354 from trunk to branch. FIXES: MAPREDUCE-3557
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214358 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 17:24:18 +00:00
Todd Lipcon
377c62a873 HDFS-2675. Reduce warning verbosity when double-closing edit logs. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214096 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 08:13:01 +00:00
Amar Kamat
b3dc6a9b92 MAPREDUCE-2950. [Rumen] Fixed TestUserResolve. (Ravi Gummadi via amarrk)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214084 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 07:57:34 +00:00
Eli Collins
71ce4a9c6a HDFS-2649. svn merge -c 1214046 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214049 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 03:57:21 +00:00
Tsz-wo Sze
eb0ecec0c5 svn merge -c 1214027 from trunk for HDFS-2545.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214028 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 01:53:03 +00:00
Alejandro Abdelnur
9a6d5e328e Merge -r 1214016:1214017 from trunk to branch. FIXES: MAPREDUCE-3544
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1214019 13f79535-47bb-0310-9956-ffa450edef68
2011-12-14 01:21:15 +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
Alejandro Abdelnur
771a5e7dce Merge -r 1213907:1213908 and 1213910:1213911 from trunk to branch. FIXES: HADOOP-7810
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213915 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 20:29:06 +00:00
Tsz-wo Sze
abd9145994 svn merge -c 1213630 from trunk for adding .classpath, .externalToolBuilders, .launches, .project and .settings to svn:ignore of hadoop-mapreduce-project/hadoop-mapreduce-examples.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213632 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 09:46:15 +00:00
Tsz-wo Sze
c8171493aa svn merge -c 1213598 from trunk for HADOOP-7914.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213607 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 08:51:31 +00:00
Eli Collins
5c779078dd HDFS-2654. svn merge -c 1213592/1213593 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213594 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 08:16:40 +00:00
Eli Collins
a3af423143 HDFS-2653. svn merge -c 1213586 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213589 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 07:59:07 +00:00
Arun Murthy
88f815fc54 Merge -c 1213575 from trunk to branch-0.23 to fix MAPREDUCE-3537.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213576 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 06:35:10 +00:00
Mahadev Konar
f340be0927 MAPREDUCE-3510. Capacity Scheduler inherited ACLs not displayed by mapred queue -showacls (Jonathan Eagles via mahadev) - Merging r1213511 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213516 13f79535-47bb-0310-9956-ffa450edef68
2011-12-13 00:24:48 +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
c24b4809de Merge -r 1213431:1213432 from trunk to branch-0.23. Fixes: HADOOP-7912
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213434 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 20:48:06 +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
Steve Loughran
2c579d5570 HADOOP-7878 Regression: HADOOP-7777 switch changes break HDFS tests when the isSingleSwitch() predicate is used
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213264 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 15:05:32 +00:00
Konstantin Shvachko
c0aeff42ac JDiff output for release 0.22.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213147 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 05:47:46 +00:00
Konstantin Shvachko
e69a43dc24 Preparing for release 0.22.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1213119 13f79535-47bb-0310-9956-ffa450edef68
2011-12-12 00:25:17 +00:00
Eli Collins
8a38dfba87 HADOOP-7898. svn merge -c 1212021 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212837 13f79535-47bb-0310-9956-ffa450edef68
2011-12-10 18:25:57 +00:00
Vinod Kumar Vavilapalli
f005c3223c MAPREDUCE-3519. Fixed a deadlock in NodeManager LocalDirectories's handling service. Contributed by Ravi Gummadi.
svn merge -c 1212680 --ignore-ancestry ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212681 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 23:19:59 +00:00
Alejandro Abdelnur
0f3833fafe Merge -r 1212608:1212609 from trunk to branch. FIXES: HDFS-2511
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212630 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 21:02:38 +00:00
Alejandro Abdelnur
92a02d1530 Merge -r 1212590:1212591 from trunk to branch. FIXES: HADOOP-7902
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212592 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 19:31:15 +00:00
Tsz-wo Sze
518998937b svn merge -c 1212299 from trunk for HDFS-2594.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212301 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 09:34:32 +00:00
Mahadev Konar
24dcbbc524 MAPREDUCE-3513. Capacity Scheduler web UI has a spelling mistake for Memory. (chackaravarthy via mahadev) - Merging r1212215 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212216 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 02:01:22 +00:00
Mahadev Konar
a1938ca733 MAPREDUCE-3327. RM web ui scheduler link doesn't show correct max value for queues (Anupam Seth via mahadev) - Merging r1212212 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212213 13f79535-47bb-0310-9956-ffa450edef68
2011-12-09 01:44:04 +00:00
Eli Collins
916018a699 HADOOP-7870. svn merge -c 1212084 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212086 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 20:23:05 +00:00
Alejandro Abdelnur
d25003ee40 Merge -r 1186959:1186960 from trunk to branch. FIXES: HADOOP-7758
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212080 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 20:10:41 +00:00
Eli Collins
dd4707ba71 HADOOP-6886. svn merge -c 1212073 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212078 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 20:06:25 +00:00
Eli Collins
8ebf00f90f HADOOP-6840. svn merge -c 1212062 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212072 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 19:45:09 +00:00
Alejandro Abdelnur
24e3d83445 Merge -r 1212059:1212060 from trunk to branch. FIXES: HDFS-2178
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1212064 13f79535-47bb-0310-9956-ffa450edef68
2011-12-08 19:30:53 +00:00
Alejandro Abdelnur
b4bd2b1d42 Merge -r 1211672:1211673 from trunk to branch. FIXES: HADOOP-7887
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1211675 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 22:20:30 +00:00
Mahadev Konar
740e269b8f MAPREDUCE-3147. Handle leaf queues with the same name properly. (Ravi Prakash via mahadev) - Merging r1211243 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1211247 13f79535-47bb-0310-9956-ffa450edef68
2011-12-07 00:39:22 +00:00