Commit Graph

2176 Commits

Author SHA1 Message Date
Vinod Kumar Vavilapalli 25f7d5999a MAPREDUCE-3532. Modified NM to report correct http address when an ephemeral web port is configured. Contributed by Bhallamudi Venkata Siva Kamesh.
svn merge --ignore-ancestry -c 1231342 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1231344 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 22:22:33 +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
Siddharth Seth a8ba510900 merge MAPREDUCE-3596 from trunk. Fix scheduler to handle cleaned up containers, which NMs may subsequently report as running. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1231303 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 21:17:59 +00:00
Tsz-wo Sze cdfbc36c5c svn merge -c 1220315 from trunk for HDFS-2700.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230901 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 04:57:58 +00:00
Tsz-wo Sze 161b986528 svn merge -c 1215366 from trunk for HDFS-2687.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230900 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 04:46:47 +00:00
Tsz-wo Sze 047daa7fd4 svn merge -c 1215364 from trunk for HDFS-2694.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230899 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 04:43:32 +00:00
Tsz-wo Sze 34d92b4f2d svn merge -c 1215358 from trunk for HADOOP-7931.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230898 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 04:36:54 +00:00
Tsz-wo Sze 5fd8fb6a7d svn merge -c 1214128 from trunk for HDFS-2669.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230897 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 04:28:39 +00:00
Tsz-wo Sze 239789c65c Merge r1214114 and r1214499 from trunk for HADOOP-7920.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230896 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 04:12:49 +00:00
Tsz-wo Sze c312a25e8a svn merge -c 1230886 from trunk for MAPREDUCE-3545 to remove the empty avro directories.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230891 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 03:53:28 +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 b99376e59a Merge r1214102 and r1214103 from trunk for HDFS-2676.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230881 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 03:32:29 +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
Tsz-wo Sze 4b5d4bb1fc svn merge -c 1210208 from trunk for the mapreduce part of HADOOP-7862.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230878 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 03:20:46 +00:00
Tsz-wo Sze 0ec97841cc svn merge -c 1214033 from trunk for HDFS-2661.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230875 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 03:07:27 +00:00
Tsz-wo Sze 38fe4f7215 svn merge -c 1213985 from trunk for HDFS-2663.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230872 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 03:00:14 +00:00
Tsz-wo Sze 6652675caa svn merge -c 1213813 from trunk for HDFS-2650.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230871 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 02:57:44 +00:00
Tsz-wo Sze 51e1cdd07d svn merge -c 1213808 from trunk for HDFS-2666.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230869 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 02:47:53 +00:00
Tsz-wo Sze 2a868f161e svn merge -c 1213954 from trunk for HADOOP-7892.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230860 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 02:23:24 +00:00
Tsz-wo Sze 3a87e333fe svn merge -c 1213619 from trunk for HADOOP-7913.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230859 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 02:18:38 +00:00
Tsz-wo Sze 852b59f777 svn merge -c 1213143 from trunk for HDFS-2651.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230858 13f79535-47bb-0310-9956-ffa450edef68
2012-01-13 01:56:10 +00:00
Tsz-wo Sze 91c5dcdf36 svn merge -c 1213040 from trunk for HDFS-2647.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230428 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 07:39:39 +00:00
Tsz-wo Sze dd42848d75 svn merge -c 1179512 from trunk for HADOOP-7695.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230422 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 07:23:53 +00:00
Tsz-wo Sze feef36a5e7 svn merge -c 1212615 from trunk for HADOOP-7899.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230420 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 07:06:13 +00:00
Tsz-wo Sze 0dac3d8f09 svn merge -c 1212606 from trunk for HDFS-2642.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230417 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 06:56:57 +00:00
Tsz-wo Sze d16e2fdd71 svn merge -c 1212004 from trunk for HADOOP-7897.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230416 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 06:47:29 +00:00
Tsz-wo Sze 1c078f46c1 svn merge -c 1211769 from trunk for HDFS-2597.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230415 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 06:43:42 +00:00
Harsh J 3935e3b5a9 merge HDFS-69 (harsh)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230414 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 06:42:49 +00:00
Tsz-wo Sze 3e7b0cc144 svn merge -c 1211249 from trunk for HDFS-2636.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230413 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 06:36:43 +00:00
Tsz-wo Sze 364ca1681a svn merge -c 1211206 from trunk for HDFS-2629.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230394 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 04:24:08 +00:00
Tsz-wo Sze 6e419fc15b svn merge -c 1210208 from trunk for the HDFS part of HADOOP-7862.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230392 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 04:22:22 +00:00
Tsz-wo Sze 00620ee2bd Merge r1210719 and r1210746 from trunk for HDFS-2618.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230388 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 03:42:12 +00:00
Tsz-wo Sze 378be13d66 svn merge -c 1210657 from trunk for HDFS-2581.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230386 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 03:19:35 +00:00
Tsz-wo Sze 1b98413d81 svn merge -c 1210320 from trunk for HADOOP-7876.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230385 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 03:15:30 +00:00
Tsz-wo Sze cf3948994b svn merge -c 1210319 from trunk for HADOOP-7875.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230381 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 03:10:30 +00:00
Tsz-wo Sze b3b4bf5eaf svn merge -c 1210208 from trunk for HADOOP-7862.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1230378 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 02:54:01 +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 eab72ff455 MAPREDUCE-3625. CapacityScheduler web-ui display of queue's used capacity is broken. (Jason Lowe via mahadev) - Merging r1230336 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230338 13f79535-47bb-0310-9956-ffa450edef68
2012-01-12 00:17:06 +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 01fe04be36 MAPREDUCE-3652. org.apache.hadoop.mapred.TestWebUIAuthorization.testWebUIAuthorization fails. (Thomas Graves via mahadev) - Merging r1230328 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230329 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 23:53:15 +00:00
Mahadev Konar 15c7957088 MAPREDUCE-3645. TestJobHistory fails. (Thomas Graves via mahadev) - Merging r1230307 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230308 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 22:54:44 +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
Suresh Srinivas 3ce3c818eb HADOOP-7964. Merging change r1230249 from trunk to 0.23
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230253 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 21:12:06 +00:00
Mahadev Konar 3c25797b34 MAPREDUCE-3648. TestJobConf failing. (Thomas Graves via mahadev) - Merging r1230202 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1230203 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 19:39:18 +00:00
Tsz-wo Sze fbf348cc59 svn merge -c 1204825 from trunk for HDFS-2519.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229916 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 07:42:55 +00:00
Tsz-wo Sze 084c2848fa svn merge -c 1204709 from trunk for HDFS-2520.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229914 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 07:38:40 +00:00
Tsz-wo Sze 86b6f3bf76 svn merge -c 1204707 from trunk for HDFS-2518.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229913 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 07:34:22 +00:00
Tsz-wo Sze ba14d77774 svn merge -c 1204544 from trunk for HDFS-2517.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229912 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 07:28:23 +00:00
Tsz-wo Sze 924c715397 svn merge -c 1204366 from trunk for HDFS-2532.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229911 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 07:20:03 +00:00
Tsz-wo Sze 7da3ba86bd svn merge -c 1204363 from trunk for HADOOP-7833.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23-PB@1229910 13f79535-47bb-0310-9956-ffa450edef68
2012-01-11 07:16:30 +00:00