Commit Graph

5167 Commits

Author SHA1 Message Date
Brandon Li d890e365c8 HDFS-5329. Merging change 1531617 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531618 13f79535-47bb-0310-9956-ffa450edef68
2013-10-13 05:33:12 +00:00
Luke Lu b96dfe531c Fix typo (HDFS-5276 -> HDFS-5267) in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531503 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 04:58:32 +00:00
Luke Lu 1b86bbcf4a Workaround git eol hell
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531502 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 04:58:24 +00:00
Chris Nauroth 4f3386420c HADOOP-10040. Merging change r1531491 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531492 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 03:16:45 +00:00
Sanford Ryza ae42ecbc01 YARN-1044. used/min/max resources do not display info in the scheduler page (Sangjin Lee via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531449 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 22:17:24 +00:00
Jing Zhao c89a36106e HDFS-5322. Merge change r1531436 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531440 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 21:53:29 +00:00
Sanford Ryza f3e4452e31 YARN-1300. SLS tests fail because conf puts YARN properties in fair-scheduler.xml (Ted Yu via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531427 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 21:28:41 +00:00
Sanford Ryza c6ea1d9cc9 Move YARN-1284 from 2.3 to 2.2.1 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531424 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 21:24:00 +00:00
Luke Lu 7d83886767 HDFS-5276. Remove volatile from LightWeightHashSet. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531224 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 08:27:32 +00:00
Luke Lu 6071dcb575 YARN-7. Support CPU resource for DistributedShell. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531221 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 08:17:08 +00:00
Jing Zhao 1e24c3cdad HADOOP-10039. Merge change r1531158 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531159 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 01:25:58 +00:00
Suresh Srinivas 2a60a8c3c4 HDFS-5335. Merge 1531152 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531153 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 00:03:28 +00:00
Sanford Ryza 5c0382166f YARN-1265. Fair Scheduler chokes on unhealthy node reconnect (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531147 13f79535-47bb-0310-9956-ffa450edef68
2013-10-10 22:54:01 +00:00
Suresh Srinivas 1db83edea2 HADOOP-10029. Merging change 1531125 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531126 13f79535-47bb-0310-9956-ffa450edef68
2013-10-10 21:58:41 +00:00
Devarajulu K 989d6fffcd YARN-879. Fixed tests w.r.t o.a.h.y.server.resourcemanager.Application. Contributed by Junping Du.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530904 13f79535-47bb-0310-9956-ffa450edef68
2013-10-10 09:50:32 +00:00
Brandon Li 1c128966f3 HDFS-5337. Merging change r1530835 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530836 13f79535-47bb-0310-9956-ffa450edef68
2013-10-10 01:04:38 +00:00
Colin McCabe 3bc8333232 HDFS-5323. Remove some deadcode in BlockManager (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530831 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 23:17:02 +00:00
Chris Nauroth e9ae7ba096 HADOOP-10031. Merging change r1530823 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530827 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 23:05:05 +00:00
Vinod Kumar Vavilapalli 82c4a9438d YARN-1283. Fixed RM to give a fully-qualified proxy URL for an application so that clients don't need to do scheme-mangling. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1530819 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530820 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 22:49:50 +00:00
Jason Darrell Lowe 9b5a023fc2 svn merge -c 1530816 FIXES: MAPREDUCE-5102. fix coverage org.apache.hadoop.mapreduce.lib.db and org.apache.hadoop.mapred.lib.db. Contributed by Aleksey Gorshkov, Andrey Klochkov, and Nathan Roberts
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530818 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 22:45:34 +00:00
Alejandro Abdelnur 5f2d5faa7f Amending yarn CHANGES.txt moving YARN-1284 to 2.2.1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530715 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 17:10:29 +00:00
Jason Darrell Lowe d5f32b0fab svn merge -c 1530683 FIXES: MAPREDUCE-5569. FloatSplitter is not generating correct splits. Contributed by Nathan Roberts
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530684 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 15:44:47 +00:00
Kihwal Lee 39d1443e3f svn merge -c 1530669 merging from trunk to branch-2 to fix HDFS-4510.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530672 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 15:12:29 +00:00
Daryn Sharp 2031005eeb HADOOP-9470. eliminate duplicate FQN tests in different Hadoop modules (Ivan A. Veselovsky via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530671 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 15:10:43 +00:00
Sanford Ryza a909a261e6 YARN-1258. Allow configuring the Fair Scheduler root queue (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530543 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 09:21:23 +00:00
Sanford Ryza dc0ccacb53 Fix position of YARN-461 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530506 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 06:49:48 +00:00
Sanford Ryza 5e602d10d9 YARN-976. Document the meaning of a virtual core. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530501 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 05:57:08 +00:00
Sanford Ryza 86bacb6b43 Add missing file TestCgroupsLCEResourcesHandler for YARN-1284.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530495 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 05:12:26 +00:00
Sanford Ryza b57b4252bf YARN-1284. LCE: Race condition leaves dangling cgroups entries for killed containers. (Alejandro Abdelnur via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530494 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 05:08:17 +00:00
Brandon Li e79cdd2d9c HDFS-5281. Merging change r1530461 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530468 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 00:10:48 +00:00
Chris Nauroth 292259b0b8 HADOOP-10030. Merging change r1530462 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530465 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 23:44:32 +00:00
Jonathan Turner Eagles ea724f0651 HADOOP-9199. Cover package org.apache.hadoop.io with unit tests (Andrey Klochkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530406 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 19:48:07 +00:00
Brandon Li 991faf598f HDFS-5316. Merging change 1530150 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530153 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 04:42:06 +00:00
Arun Murthy c3dff760d9 Moving recent bug-fixes to hadoop-2.2.1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530129 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 02:05:03 +00:00
Brandon Li ad8948e8e0 HDFS-5317. Merging change r1530114 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530117 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 00:27:39 +00:00
Jing Zhao cd4411ce1c HDFS-5291. Merge change r1530112 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530113 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 00:03:26 +00:00
Jing Zhao 2aee8b321b HADOOP-10028. Merge change r1530100 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530101 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 22:42:01 +00:00
Jason Darrell Lowe 6c2d04b409 svn merge -c 1530095 FIXES: YARN-465. fix coverage org.apache.hadoop.yarn.server.webproxy. Contributed by Aleksey Gorshkov and Andrey Klochkov
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530097 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 22:26:48 +00:00
Brandon Li 2451b38e8e HDFS-5307. Merging change r1530027 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530033 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 19:15:29 +00:00
Arun Murthy a4ea3cb43d Release notes for hadoop-2.2.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529757 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 05:40:48 +00:00
Arun Murthy c0da67e579 HDFS-4817. Moving changelog to Release 2.2.0 section to reflect the backport.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529753 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 05:32:41 +00:00
Arun Murthy 3b514585f1 Preparing for hadoop-2.2.0 release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529752 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 05:32:18 +00:00
Brandon Li 254e87700f HDFS-5259. Merging change r1529730 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529735 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 03:39:43 +00:00
Vinod Kumar Vavilapalli ad9515fa9b MAPREDUCE-5562. Fixed MR App Master to perform pending tasks like staging-dir cleanup, sending job-end notification correctly when unregister with RM fails. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1529682 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529683 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 20:54:10 +00:00
Vinod Kumar Vavilapalli 4b32d6ad9a YARN-1277. Added a policy based configuration for http/https in common HttpServer and using the same in YARN - related
to per project https config support via HADOOP-10022. Contributed by Suresh Srinivas and Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1529662 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529663 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 18:44:27 +00:00
Jing Zhao a59090bbdc HDFS-5299. Merge change r1529660 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529661 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 18:42:08 +00:00
Vinod Kumar Vavilapalli 763521305d YARN-1278. Fixed NodeManager to not delete local resources for apps on resync command from RM - a bug caused by YARN-1149. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1529657 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529658 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 18:33:37 +00:00
Jing Zhao 3f0c90f6b5 HADOOP-10017. Merge change r1529571 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529572 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 06:24:32 +00:00
Brandon Li 3bb402c70f HDFS-5306. Merging change r1529562 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529563 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 04:21:59 +00:00
Vinod Kumar Vavilapalli 85bed752d5 YARN-1274. Fixed NodeManager's LinuxContainerExecutor to create user, app-dir and log-dirs correctly even when there are no resources to localize for the container. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1529555 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529556 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 00:15:51 +00:00