Commit Graph

5195 Commits

Author SHA1 Message Date
Arun Murthy ee5313214c Merge -c 1529015 from trunk to branch-2 to fix YARN-890. Ensure CapacityScheduler doesn't round-up metric for available resources. Contributed by Xuan Gong & Hitesh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529018 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 21:55:17 +00:00
Jonathan Turner Eagles 8a93fa55b6 YARN-1199. Make NM/RM Versions Available (Mit Desai via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529008 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 21:18:18 +00:00
Bikas Saha 53df9bdb14 Merge r1529005 from trunk to branch-2 for MAPREDUCE-5489. MR jobs hangs as it does not use the node-blacklisting feature in RM requests (Zhijie Shen via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529007 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 21:18:06 +00:00
Jonathan Turner Eagles 562af72497 Revert YARN-677. Increase coverage to FairScheduler (Vadim Bondarev and Dennis Y via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528915 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 15:54:09 +00:00
Sanford Ryza 25d3c021d2 YARN-1213. Restore config to ban submitting to undeclared pools in the Fair Scheduler. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528697 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 01:21:47 +00:00
Aaron Myers 032fbb549e HDFS-5289. Race condition in TestRetryCacheWithHA#testCreateSymlink causes spurious test failure. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528694 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 00:42:20 +00:00
Sanford Ryza 9ba48807df YARN-876. Node resource is added twice when node comes back from unhealthy. (Peng Zhang via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528661 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 22:35:37 +00:00
Sanford Ryza c738c106e9 MAPREDUCE-5554. hdfs-site.xml included in hadoop-mapreduce-client-jobclient tests jar is breaking tests for downstream components (Robert Kanter via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528647 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 22:00:56 +00:00
Jonathan Turner Eagles ffe45a5129 YARN-425. coverage fix for yarn api (Aleksey Gorshkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528644 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 21:57:00 +00:00
Bikas Saha 7b09794cd7 Merge r1528632 from trunk to branch-2 for YARN-1141. Updating resource requests should be decoupled with updating blacklist (Zhijie Shen via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528640 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 21:50:20 +00:00
Arun Murthy ce990cd911 Merge -c 1528626 from trunk to branch-2 to fix MAPREDUCE-5459. Update documentation on how to run MRv1 examples on YARN. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528627 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 21:09:59 +00:00
Jason Darrell Lowe f2e97aad31 svn merge -c 1528620 FIXES: HADOOP-9254. Cover packages org.apache.hadoop.util.bloom, org.apache.hadoop.util.hash. Contributed by Vadim Bondarev
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528621 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 20:55:26 +00:00
Arun Murthy f49d9cf7a4 Merge -c 1528533 from trunk to branch-2 to fix MAPREDUCE-5530. Fix compat with hadoop-1 in mapred.lib.CombinFileInputFormat by re-introducing isSplittable(FileSystem, Path) api and ensuring semantic compatibility. Contributed by Robert Kanter.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528535 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 16:09:53 +00:00
Jonathan Turner Eagles f0979ca9fa YARN-677. Increase coverage to FairScheduler (Vadim Bondarev and Dennis Y via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528528 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 15:52:22 +00:00
Jason Darrell Lowe 0cf79e3e66 svn merge -c 1528502 FIXES: HADOOP-9063. enhance unit-test coverage of class org.apache.hadoop.fs.FileUtil. Contributed by Ivan A. Veselovsky
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528506 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 14:53:28 +00:00
Vinod Kumar Vavilapalli 69b6d8458e YARN-1260. Added webapp.http.address to yarn-default.xml so that default install with https enabled doesn't have broken link on NM UI. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1528312 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528313 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 06:31:53 +00:00
Chris Nauroth a5d9aaad12 HDFS-5279. Merging change r1528308 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528310 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 05:37:21 +00:00
Suresh Srinivas 09d2301b63 HADOOP-10012. Merge 1528301 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528302 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 04:11:26 +00:00
Todd Lipcon 1c48b4d04c HADOOP-8315. Support SASL-authenticated ZooKeeper in ActiveStandbyElector. Contributed by Todd Lipcon
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528292 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 00:44:43 +00:00
Colin McCabe 3631361653 move HADOOP-9758 to the branch-2.1.2 section
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528286 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 00:36:08 +00:00
Arpit Agarwal 13bfd0971e HDFS-5255. Merging r1528279 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528282 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 00:09:08 +00:00
Suresh Srinivas 67ad6d4a92 HADOOP-10003. Merging 1528256 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528263 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 23:06:28 +00:00
Vinod Kumar Vavilapalli 6daca6a93d MAPREDUCE-5536. Fixed MR AM and JHS to respect mapreduce.jobhistory.webapp.https.address. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1528251 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528253 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 22:54:35 +00:00
Sanford Ryza 2c329793c6 YARN-1262. TestApplicationCleanup relies on all containers assigned in a single heartbeat (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528249 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 22:46:41 +00:00
Jason Darrell Lowe 7e812e7126 svn merge -c 1528237 FIXES: MAPREDUCE-4421. Run MapReduce framework via the distributed cache. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528242 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 22:40:01 +00:00
Chris Nauroth 90abcc481a YARN-1215. Merging change r1528239 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528240 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 22:38:49 +00:00
Chris Nauroth f5951d2695 YARN-1215. Merging change r1528233 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528234 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 22:33:23 +00:00
Sanford Ryza d8ade0804d YARN-1228. Clean up Fair Scheduler configuration loading. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528203 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 20:16:30 +00:00
Sanford Ryza 06e8660f2b MAPREDUCE-5544. JobClient#getJob loads job conf twice. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528197 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 20:05:09 +00:00
Sanford Ryza 01ecec1cd2 YARN-1010. FairScheduler: decouple container scheduling from nodemanager heartbeats. (Wei Yan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528195 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 19:57:40 +00:00
Kihwal Lee dc2d77bde2 HDFS-4512. Cover package org.apache.hadoop.hdfs.server.common with tests. Contributed by Vadim Bondarev.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528098 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 14:05:16 +00:00
Arun Murthy 85f5626076 Merge -c 1527848 from trunk to branch-2 to fix MAPREDUCE-5551. Fix compat with hadoop-1 in SequenceFileAsBinaryOutputFormat.WritableValueBytes by re-introducing missing constructors. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527850 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 01:25:31 +00:00
Vinod Kumar Vavilapalli 80dd306450 YARN-1070. Fixed race conditions in NodeManager during container-kill. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1527827 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527828 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 00:18:42 +00:00
Alejandro Abdelnur 15ee08ef6c YARN-1247. test-container-executor has gotten out of sync with the changes to container-executor. (rvs via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527814 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 22:55:51 +00:00
Kihwal Lee 4e4dd0f15c svn merge -c 1527807. merging from trunk to branch-2 to fix HDFS-4517.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527808 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 22:33:01 +00:00
Sanford Ryza 099c4eef3f YARN-1221. With Fair Scheduler, reserved MB reported in RM web UI increases indefinitely (Siqi Li via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527795 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 22:03:06 +00:00
Brandon Li 320c7519ed HDFS-5230. Merging change r1527726 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527741 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 19:37:33 +00:00
Luke Lu 4ff49a7516 HADOOP-9964. Fix deadlocks in TestHttpServer by synchronize ReflectionUtils.printThreadInfo. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527651 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 17:01:51 +00:00
Brandon Li e26ac59ca0 HDFS-5256. Merging change r1527452 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527453 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 06:13:27 +00:00
Vinod Kumar Vavilapalli 579cf8f612 YARN-899. Added back queue level administrator-acls so that there is no regression w.r.t 1.x. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1527282 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527283 13f79535-47bb-0310-9956-ffa450edef68
2013-09-29 08:22:14 +00:00
Vinod Kumar Vavilapalli 3c3b52b80b MAPREDUCE-5538. Fixed MR AppMaster to send job-notification URL only after the job is really done - a bug caused by MAPREDUCE-5505. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1527219 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527221 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 19:14:46 +00:00
Vinod Kumar Vavilapalli 83ef3a1ab5 YARN-1246. Added application finish-status to ApplicationSummary for the sake of testing given ApplicationHistoryServer is not yet ready. Contributed by Arpit Gupta.
svn merge --ignore-ancestry -c 1527205 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527206 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 16:30:28 +00:00
Steve Loughran f5ecb84344 HADOOP-8545 findbugs patches from the final -037 patch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527188 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 13:57:27 +00:00
Steve Loughran 905be853a1 HADOOP-10006. Compilation failure in trunk for o.a.h.fs.swift.util.JSONUtil
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527186 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 13:30:09 +00:00
Chris Nauroth f040bd0739 HDFS-5260. Merging change r1527113 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527115 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 22:56:54 +00:00
Jing Zhao 030c3c99e8 HDFS-5265. Merge change r1527093 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527096 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 21:53:33 +00:00
Brandon Li c4df7fb70e HDFS-5268. Merging change r1527087 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527092 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 21:37:47 +00:00
Kihwal Lee d680392e39 Fixing up CHANGES.txt for HDFS-5031.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527086 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 21:20:46 +00:00
Alejandro Abdelnur 75f9db1c4d YARN-1021. Yarn Scheduler Load Simulator. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527065 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 20:32:06 +00:00
Arun Murthy c03040a498 Merge -c 1527048 from trunk to branch-2 to fix MAPREDUCE-5529. Fix compat with hadoop-1 in mapred.TotalOrderPartitioner by re-introducing (get,set)PartitionFile which takes in JobConf. Contributed by Robert Kanter.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527054 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 20:04:31 +00:00