Commit Graph

598 Commits

Author SHA1 Message Date
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
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
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
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
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
Arun Murthy f16e39ecb1 Merge -c 1529538 from trunk to branch-2 to fix YARN-1090. Fixed CS UI to better reflect applications as non-schedulable and not as pending. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529539 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 22:27:35 +00:00
Sanford Ryza b5df25e3a8 YARN-1268. TestFairScheduler.testContinuousScheduling is flaky (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529533 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 22:12:24 +00:00
Vinod Kumar Vavilapalli c91addb743 YARN-1271. Addendum patch to remove unused method in ContainerExecutor. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529386 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 05:14:05 +00:00
Vinod Kumar Vavilapalli ea3c2d28f7 YARN-1254. Fixed NodeManager to not pollute container's credentials. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1529382 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529383 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 04:26:37 +00:00
Alejandro Abdelnur 4de1616b82 YARN-1253. Changes to LinuxContainerExecutor to run containers as a single dedicated user in non-secure mode. (rvs via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529326 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 22:00:01 +00:00
Bikas Saha 449f3b9457 Merge r1529251 from trunk to branch-2 for YARN-1232. Configuration to support multiple RMs (Karthik Kambatla via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529285 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 20:37:47 +00:00
Sanford Ryza c03521fd86 YARN-1271. Text file busy errors launching containers again (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529060 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 01:31:26 +00:00
Bikas Saha 7b2cd4b411 Merge r1529039 and r1529048 from trunk to branch-2 for YARN-1256. NM silently ignores non-existent service in StartContainerRequest (Xuan Gong via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529049 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 01:04:26 +00:00
Hitesh Shah 75aeb6070a Merge 1529043 from trunk to branch-2 for YARN-1149. NM throws InvalidStateTransitonException: Invalid event: APPLICATION_LOG_HANDLING_FINISHED at RUNNING. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529044 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 00:46:18 +00:00
Sanford Ryza 33b56c4866 YARN-1236. FairScheduler setting queue name in RMApp is not working. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529035 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 23:32:38 +00:00
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
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
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
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
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
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
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 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
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
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
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 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
Arun Murthy 78045b7abc Merge -c 1526735 from trunk to branch-2 to fix MAPREDUCE-5514. Fix TestRMContainerAllocator. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526736 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 23:03:25 +00:00
Jonathan Turner Eagles e33f5dc85d YARN-819. ResourceManager and NodeManager should check for a minimum allowed version (Robert Parker via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526665 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 20:06:47 +00:00
Vinod Kumar Vavilapalli 30c03cc118 YARN-1157. Fixed ResourceManager UI to behave correctly when apps like distributed-shell do not set tracking urls. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1526371 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526372 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 04:18:28 +00:00
Bikas Saha 9f05462612 Merge r1526078 from trunk to branch-2 for YARN-1214. Register ClientToken MasterKey in SecretManager after it is saved (Jian He via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526079 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 01:15:24 +00:00
Siddharth Seth e23d5672a7 merge YARN-1229 from trunk. Define constraints on Auxiliary Service names. Change ShuffleHandler service name from mapreduce.shuffle to mapreduce_shuffle. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526066 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 00:37:14 +00:00
Vinod Kumar Vavilapalli 2daddb610e YARN-1204. Added separate configuration properties for https for RM and NM without which servers enabled with https will also start on http ports. Contributed by Omkar Vinit Joshi.
MAPREDUCE-5523. Added separate configuration properties for https for JHS without which even when https is enabled, it starts on http port itself. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1525947 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525948 13f79535-47bb-0310-9956-ffa450edef68
2013-09-24 17:20:48 +00:00
Sanford Ryza 6c760083ff YARN-1188. The context of QueueMetrics becomes default when using FairScheduler (Akira Ajisaka via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525517 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 07:06:50 +00:00
Sanford Ryza e9f2112b00 YARN-1128. FifoPolicy.computeShares throws NPE on empty list of Schedulables (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525315 13f79535-47bb-0310-9956-ffa450edef68
2013-09-22 01:55:17 +00:00
Vinod Kumar Vavilapalli d71bb8385b YARN-1203. Changed YARN web-app proxy to handle http and https URLs from AM registration and finish correctly. Contributed by Omkar Vinit Joshi.
MAPREDUCE-5515. Fixed MR AM's webapp to depend on a new config mapreduce.ssl.enabled to enable https and disabling it by default as MR AM needs
to set up its own certificates etc and not depend on clusters'. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1524864 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524867 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 23:51:14 +00:00
Hitesh Shah 2f97dced61 Merge 1524829 from trunk to branch-2 for YARN-353. Add Zookeeper-based store implementation for RMStateStore. Contributed by Bikas Saha, Jian He and Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524831 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 20:40:52 +00:00
Christopher Douglas 629cd3b57e YARN-1184. ClassCastException during preemption enforcement.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523864 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 01:31:18 +00:00
Vinod Kumar Vavilapalli 3828687def YARN-1001. Added a web-service to get statistics about per application-type per state for consumption by downstream projects. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1523855 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523856 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 00:24:51 +00:00
Bikas Saha db17c6ac06 Merge r1523750 from trunk to branch-2 for YARN-1027. Implement RMHAProtocolService (Karthik Kambatla via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523753 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 18:40:28 +00:00
Arun Murthy c061a0da55 Merge -c 1523652 from trunk to branch-2 to fix YARN-1170. YARN & MapReduce proto definitions fixed to specify protobuf package as hadoop.yarn and hadoop.mapreduce respectively. Contributed by Binglin Chang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523653 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 14:06:27 +00:00
Alejandro Abdelnur 460fd2053b YARN-1137. Add support whitelist for system users to Yarn container-executor.c. (rvs via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523589 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 11:02:13 +00:00
Bikas Saha c5ef30971e Merge r1523376 from trunk to branch-2 for YARN-540. Race condition causing RM to potentially relaunch already unregistered AMs on RM restart (Jian He via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523377 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 01:07:11 +00:00
Jason Darrell Lowe d5b84644f0 svn merge -c 1523158 FIXES: YARN-1189. NMTokenSecretManagerInNM is not being told when applications have finished. Contributed by Omkar Vinit Joshi
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523159 13f79535-47bb-0310-9956-ffa450edef68
2013-09-14 00:23:20 +00:00
Bikas Saha 87d09e5ebe Merge r1523146 from trunk to branch-2 YARN-1116. Populate AMRMTokens back to AMRMTokenSecretManager after RM restarts (Jian He via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523149 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 23:57:56 +00:00
Jason Darrell Lowe 039c10e0d9 svn merge -c 1522968 FIXES: YARN-1194. TestContainerLogsPage fails with native builds. Contributed by Roman Shaposhnik
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522971 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 15:20:38 +00:00
Chris Nauroth 399df2cb08 YARN-1078. Merging change r1522644 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522645 13f79535-47bb-0310-9956-ffa450edef68
2013-09-12 16:04:41 +00:00
Thomas Graves 3d2ac297ec YARN-1176. RM web services ClusterMetricsInfo total nodes doesn't include unhealthy nodes (Jonathan Eagles via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522063 13f79535-47bb-0310-9956-ffa450edef68
2013-09-11 22:04:27 +00:00
Jonathan Turner Eagles 0332873a48 YARN-1119. Add ClusterMetrics checks to tho TestRMNodeTransitions tests (Mit Desai via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521623 13f79535-47bb-0310-9956-ffa450edef68
2013-09-10 20:12:05 +00:00
Bikas Saha 67a8eb9766 Merge r1521560 from trunk to branch-2 for YARN-1098. Separate out RM services into Always On and Active (Karthik Kambatla via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521562 13f79535-47bb-0310-9956-ffa450edef68
2013-09-10 17:49:20 +00:00
Vinod Kumar Vavilapalli 715fde7c45 YARN-292. Fixed FifoScheduler and FairScheduler to make their applications data structures thread safe to avoid RM crashing with ArrayIndexOutOfBoundsException. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1521328 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521329 13f79535-47bb-0310-9956-ffa450edef68
2013-09-10 01:25:41 +00:00
Vinod Kumar Vavilapalli e5ee67cbea YARN-910. Augmented auxiliary services to listen for container starts and completions in addition to application events. Contributed by Alejandro Abdelnur.
svn merge --ignore-ancestry -c 1521298 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521299 13f79535-47bb-0310-9956-ffa450edef68
2013-09-09 21:49:00 +00:00
Vinod Kumar Vavilapalli e5a6acb466 YARN-1152. Fixed a bug in ResourceManager that was causing clients to get invalid client token key errors when an appliation is about to finish. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1521292 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521293 13f79535-47bb-0310-9956-ffa450edef68
2013-09-09 21:19:38 +00:00
Alejandro Abdelnur 1680bf7061 YARN-1144. Unmanaged AMs registering a tracking URI should not be proxy-fied. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521044 13f79535-47bb-0310-9956-ffa450edef68
2013-09-09 11:16:43 +00:00
Alejandro Abdelnur 6a7607594f YARN-1049. ContainerExistStatus should define a status for preempted containers. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521037 13f79535-47bb-0310-9956-ffa450edef68
2013-09-09 11:10:23 +00:00
Vinod Kumar Vavilapalli cc4927d4af YARN-696. Changed RMWebservice apps call to take in multiple application states. Contributed by Trevor Lorimer.
svn merge --ignore-ancestry -c 1520736 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520737 13f79535-47bb-0310-9956-ffa450edef68
2013-09-07 07:33:35 +00:00
Vinod Kumar Vavilapalli bbbee0e556 YARN-1107. Fixed a bug in ResourceManager because of which RM in secure mode fails to restart. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1520726 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520727 13f79535-47bb-0310-9956-ffa450edef68
2013-09-07 05:50:42 +00:00
Vinod Kumar Vavilapalli e8ce7cd541 YARN-957. Fixed a bug in CapacityScheduler because of which requests that need more than a node's total capability were incorrectly allocated on that node causing apps to hang. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1520187 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520188 13f79535-47bb-0310-9956-ffa450edef68
2013-09-05 01:21:18 +00:00
Bikas Saha a84e9321c4 Merge 1520135 from trunk to branch-2 for YARN-1065. NM should provide AuxillaryService data to the container (Xuan Gong via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520137 13f79535-47bb-0310-9956-ffa450edef68
2013-09-04 20:51:35 +00:00
Vinod Kumar Vavilapalli 57220dd1d0 YARN-1077. Fixed TestContainerLaunch test failure on Windows. Contributed by Chuan Liu.
svn merge --ignore-ancestry -c 1519333 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519334 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 03:11:06 +00:00
Vinod Kumar Vavilapalli 0246b60e93 YARN-649. Added a new NM web-service to serve container logs in plain text over HTTP. Contributed by Sandy Ryza.
svn merge --ignore-ancestry -c 1519326 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519327 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 00:09:53 +00:00
Sanford Ryza ab02296741 HADOOP-9918. Add addIfService to CompositeService (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519130 13f79535-47bb-0310-9956-ffa450edef68
2013-08-31 02:13:11 +00:00
Vinod Kumar Vavilapalli fbcb35425d YARN-707. Added user information also in the YARN ClientToken so that AMs can implement authorization based on incoming users. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1518868 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518869 13f79535-47bb-0310-9956-ffa450edef68
2013-08-30 01:13:36 +00:00
Thomas Graves 669e939edc YARN-1101. Active nodes can be decremented below 0 (Robert Parker via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518386 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 21:12:21 +00:00
Vinod Kumar Vavilapalli 0fb55f1aec YARN-602. Fixed NodeManager to not let users override some mandatory environmental variables. Contributed by Kenji Kikushima.
svn merge --ignore-ancestry -c 1518077 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518078 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 05:14:15 +00:00
Vinod Kumar Vavilapalli 13ac033578 YARN-1083. Changed ResourceManager to fail when the expiry interval is less than the configured node-heartbeat interval. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1518036 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518037 13f79535-47bb-0310-9956-ffa450edef68
2013-08-27 23:54:33 +00:00
Vinod Kumar Vavilapalli ba89f8efc7 YARN-1085. Addendum patch to address issues with the earlier patch.
svn merge --ignore-ancestry -c 1517721 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517722 13f79535-47bb-0310-9956-ffa450edef68
2013-08-26 23:01:23 +00:00
Alejandro Abdelnur b45b1394b6 YARN-1008. MiniYARNCluster with multiple nodemanagers, all nodes have same key for allocations. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517564 13f79535-47bb-0310-9956-ffa450edef68
2013-08-26 15:42:43 +00:00
Vinod Kumar Vavilapalli fbab2acd46 YARN-1094. Fixed a blocker with RM restart code because of which RM crashes when try to recover an existing app. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1517215 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517216 13f79535-47bb-0310-9956-ffa450edef68
2013-08-24 23:33:15 +00:00
Vinod Kumar Vavilapalli 2d9c88f45e YARN-1074. Cleaned up YARN CLI application list to only display running applications by default. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1517196 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517197 13f79535-47bb-0310-9956-ffa450edef68
2013-08-24 21:17:11 +00:00
Vinod Kumar Vavilapalli a42a5e153c YARN-1085. Modified YARN and MR2 web-apps to do HTTP authentication in secure setup with kerberos. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1517101 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517102 13f79535-47bb-0310-9956-ffa450edef68
2013-08-24 02:48:17 +00:00
Jason Darrell Lowe 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
Jason Darrell Lowe 07360a0d8d svn merge -c 1517073 FIXES: YARN-707. Add user info in the YARN ClientToken. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517077 13f79535-47bb-0310-9956-ffa450edef68
2013-08-23 22:19:04 +00:00
Arun Murthy 6b9ebac35b YARN-1082. Addendum patch.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516353 13f79535-47bb-0310-9956-ffa450edef68
2013-08-22 01:20:18 +00:00
Arun Murthy a878fbceee Merge -c 1516337 from trunk to branch-2 to fix YARN-1082. Create base directories on HDFS after RM login to ensure RM recovery doesn't fail in secure mode. Contributed by Vinod K V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516338 13f79535-47bb-0310-9956-ffa450edef68
2013-08-21 23:55:59 +00:00
Bikas Saha a38dff29bc Merge r1516331 from trunk to branch-2 for YARN-881. Priority#compareTo method seems to be wrong. (Jian He via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516333 13f79535-47bb-0310-9956-ffa450edef68
2013-08-21 23:43:17 +00:00
Luke Lu d83061b71b HADOOP-9784. Add a builder for HttpServer. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1516130 13f79535-47bb-0310-9956-ffa450edef68
2013-08-21 10:13:17 +00:00
Vinod Kumar Vavilapalli af0e9e6195 YARN-1006. Fixed broken rendering in the Nodes list web page on the RM web UI. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1515629 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515631 13f79535-47bb-0310-9956-ffa450edef68
2013-08-19 22:04:43 +00:00
Vinod Kumar Vavilapalli 040e1cd283 YARN-643. Fixed ResourceManager to remove all tokens consistently on app finish. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1515256 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1515257 13f79535-47bb-0310-9956-ffa450edef68
2013-08-19 01:54:22 +00:00
Vinod Kumar Vavilapalli e470be4429 YARN-107. Fixed ResourceManager and clients to better handle forceKillApplication on non-running and finished applications. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1514918 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514919 13f79535-47bb-0310-9956-ffa450edef68
2013-08-16 23:01:38 +00:00
Siddharth Seth d6049bd288 merge YARN-1045. Improve toString implementation for PBImpls. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514186 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 07:21:55 +00:00
Arun Murthy 77a60701c1 Merge -c 1514135 from trunk to branch-2 to fix YARN-1056. Remove dual use of string 'resourcemanager' in yarn.resourcemanager.connect.{max.wait.secs|retry_interval.secs}. Contributed by Karthik Kambatla.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514136 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 02:36:58 +00:00
Alejandro Abdelnur eee2b37a3a HADOOP-9872. Improve protoc version handling and detection. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514074 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 22:29:46 +00:00
Alejandro Abdelnur 677bbd336d HADOOP-9845. Update protobuf to 2.5 from 2.4.x. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514071 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 22:25:26 +00:00
Jason Darrell Lowe 70b8081ac2 svn merge -c 1513888 FIXES: YARN-337. RM handles killed application tracking URL poorly. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1513890 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 14:21:37 +00:00
Sanford Ryza 3f84e0ba32 YARN-1060. Two tests in TestFairScheduler are missing @Test annotation (Niranjan Singh via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1513725 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 04:40:30 +00:00
Sanford Ryza 7f2a646af2 YARN-1046. Disable mem monitoring my default in MiniYARNCluster (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512497 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 21:14:05 +00:00
Sanford Ryza 1050cb5203 YARN-656. In scheduler UI, including reserved memory in Memory Total can make it exceed cluster capacity. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512483 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 20:29:26 +00:00
Sanford Ryza 3820a0701d Amending YARN-589. Adding missing file from patch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512116 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 00:37:54 +00:00
Sanford Ryza 6a90a137ce YARN-589. Expose a REST API for monitoring the fair scheduler (Sandy Ryza).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512115 13f79535-47bb-0310-9956-ffa450edef68
2013-08-09 00:37:29 +00:00
Arun Murthy 25038197b5 Merge -c 1512081 from trunk to branch-2 to fix YARN-1043. Push all metrics consistently. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1512082 13f79535-47bb-0310-9956-ffa450edef68
2013-08-08 22:55:33 +00:00
Jonathan Turner Eagles 75e9f9f3ed YARN-985. Nodemanager should log where a resource was localized (Ravi Prakash via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1511105 13f79535-47bb-0310-9956-ffa450edef68
2013-08-06 19:55:07 +00:00
Vinod Kumar Vavilapalli 9b05d132bf YARN-906. Fixed a bug in NodeManager where cancelling ContainerLaunch at KILLING state causes that the container to hang. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1509924 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509925 13f79535-47bb-0310-9956-ffa450edef68
2013-08-03 00:49:32 +00:00
Vinod Kumar Vavilapalli a416371e7d YARN-903. Changed ContainerManager to suppress unnecessary warnings when stopping already stopped containers. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1509560 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509561 13f79535-47bb-0310-9956-ffa450edef68
2013-08-02 06:55:21 +00:00
Jason Darrell Lowe 83a09512a4 svn merge -c 1509389 FIXES: YARN-573. Shared data structures in Public Localizer and Private Localizer are not Thread safe. Contributed by Omkar Vinit Joshi
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509393 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 19:40:09 +00:00
Sanford Ryza ba19182b77 YARN-758. Augment MockNM to use multiple cores (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509087 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 06:15:46 +00:00
Vinod Kumar Vavilapalli b1cec77b5f YARN-502. Fixed a state machine issue with RMNode inside ResourceManager which was crashing scheduler. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1509060 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509061 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 00:55:37 +00:00
Vinod Kumar Vavilapalli 4120e3b4ef YARN-966. Fixed ContainerLaunch to not fail quietly when there are no localized resources due to some other failure. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1508688 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508689 13f79535-47bb-0310-9956-ffa450edef68
2013-07-31 00:00:28 +00:00
Vinod Kumar Vavilapalli dad1d79a05 YARN-948. Changed ResourceManager to validate the release container list before actually releasing them. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1508609 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508610 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 20:31:19 +00:00
Vinod Kumar Vavilapalli 22e0a210b6 Reverting YARN-245 to fix a critical bug.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508278 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 03:07:26 +00:00
Vinod Kumar Vavilapalli 6737f3d3a5 YARN-945. Removed setting of AMRMToken's service from ResourceManager and changed client libraries do it all the time and correctly. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1508232 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508233 13f79535-47bb-0310-9956-ffa450edef68
2013-07-29 23:18:10 +00:00
Vinod Kumar Vavilapalli 7b38377e2b YARN-961. Changed ContainerManager to enforce Token auth irrespective of security. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1508216 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508217 13f79535-47bb-0310-9956-ffa450edef68
2013-07-29 22:23:58 +00:00
Sanford Ryza 7642501864 YARN-932. TestResourceLocalizationService.testLocalizationInit can fail on JDK7. (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508211 13f79535-47bb-0310-9956-ffa450edef68
2013-07-29 22:15:32 +00:00
Vinod Kumar Vavilapalli 9f37464e71 YARN-245. Fixed NodeManager to handle duplicate responses from ResourceManager. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1508157 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508159 13f79535-47bb-0310-9956-ffa450edef68
2013-07-29 18:15:36 +00:00
Alejandro Abdelnur 126337bba6 YARN-937. Fix unmanaged AM in non-secure/secure setup post YARN-701. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507708 13f79535-47bb-0310-9956-ffa450edef68
2013-07-27 20:08:59 +00:00
Vinod Kumar Vavilapalli 72a08508c9 YARN-960. Fixed ResourceManager to propagate client-submitted credentials irrespective of security. Contributed by Daryn Sharp.
svn merge --ignore-ancestry -c 1507700 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507701 13f79535-47bb-0310-9956-ffa450edef68
2013-07-27 18:51:01 +00:00
Tsz-wo Sze 4c045ebafd svn merge -c 1380921 from trunk for YARN-84. Use Builder to build RPC server.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507582 13f79535-47bb-0310-9956-ffa450edef68
2013-07-27 06:47:40 +00:00
Vinod Kumar Vavilapalli f6663a1198 YARN-688. Fixed NodeManager to properly cleanup containers when it is shut down. Contributed by Jian He.
svn merge --ignore-ancestry -c 1506814 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506815 13f79535-47bb-0310-9956-ffa450edef68
2013-07-25 04:15:16 +00:00
Bikas Saha 34a1610282 YARN-873. Merge r1506732 from trunk to branch-2 for YARNClient.getApplicationReport(unknownAppId) returns a null report (Xuan Gong via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506736 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 21:42:50 +00:00
Vinod Kumar Vavilapalli 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
Alejandro Abdelnur 7f8549f4c9 YARN-461. Fair scheduler should not accept apps with empty string queue name. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505862 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 00:02:22 +00:00
Vinod Kumar Vavilapalli 10e4f3b4bd YARN-853. Fixed CapacityScheduler's maximum-am-resource-percent to properly work beyond refreshing queues. Contributed by Devaraj K.
svn merge --ignore-ancestry -c 1505855 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505856 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 23:50:54 +00:00
Arun Murthy 98932b2c88 Merge -c 1505146 from trunk to branch-2 to fix YARN-897. Ensure child queues are ordered correctly to account for completed containers. Contributed by Djellel Eddine Difallah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505147 13f79535-47bb-0310-9956-ffa450edef68
2013-07-20 15:00:28 +00:00
Arun Murthy 83c776c85d Set version in branch-2 to 2.3.0-SNAPSHOT to reflect that we will only be adding new content to hadoop-2.3.0 and not hadoop-2.2.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504744 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 01:35:34 +00:00
Arun Murthy f7080007ad Merge -c 1504735 from trunk to branch-2 to fix YARN-918. Remove ApplicationAttemptId from RegisterApplicationMasterRequestProto. Contributed by Vinod K V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504736 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 00:58:33 +00:00
Vinod Kumar Vavilapalli 384c86f6e1 YARN-814. Improving diagnostics when containers fail during launch due to various reasons like invalid env etc. Contributed by Jian He.
svn merge --ignore-ancestry -c 1504732 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504733 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 00:28:53 +00:00
Arun Murthy d82a3cd227 Merge -c from trunk to branch-2 to fix YARN-701. Use application tokens irrespective of secure or non-secure mode. Contributed by Vinod K V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504605 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 19:04:37 +00:00
Hitesh Shah db854fd104 Merge r1504288 from trunk to branch-2 for YARN-865. RM webservices can't query based on application Types. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504290 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 21:43:51 +00:00
Bikas Saha 859b53435f Merge r1504261 from trunk to branch-2 for YARN-922. Change FileSystemRMStateStore to use directories (Jian He via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504264 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 20:23:55 +00:00
Vinod Kumar Vavilapalli 9b3b4fe8bb YARN-912. Move client facing exceptions to yarn-api module. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1504032 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504033 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 07:32:23 +00:00
Vinod Kumar Vavilapalli a6865504d7 YARN-62. Modified NodeManagers to avoid AMs from abusing container tokens for repetitive container launches. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1503986 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503987 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 04:25:17 +00:00
Vinod Kumar Vavilapalli 0623ee954a YARN-820. Fixed an invalid state transition in NodeManager caused by failing resource localization. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1503947 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503948 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 23:45:29 +00:00
Vinod Kumar Vavilapalli 14adc33eb4 YARN-661. Fixed NM to cleanup users' local directories correctly when starting up. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1503942 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503943 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 23:31:29 +00:00
Bikas Saha 3990e8b478 Merge r1503933 from trunk to branch-2 for YARN-513. Create common proxy client for communicating with RM (Xuan Gong & Jian He via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503935 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 22:54:55 +00:00
Vinod Kumar Vavilapalli f4f14c079e YARN-523. Modified a test-case to validate container diagnostics on localization failures. Contributed by Jian He.
svn merge --ignore-ancestry -c 1503532 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503533 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 01:04:10 +00:00
Chris Nauroth 4f7b540d14 YARN-909. Merging change r1503357 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503362 13f79535-47bb-0310-9956-ffa450edef68
2013-07-15 17:36:16 +00:00
Alejandro Abdelnur 33465b6050 YARN-333. Schedulers cannot control the queue-name of an application. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502376 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 21:41:10 +00:00
Christopher Douglas 495c24331e YARN-569. Add support for requesting and enforcing preemption requests via
a capacity monitor. Contributed by Carlo Curino, Chris Douglas


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502084 13f79535-47bb-0310-9956-ffa450edef68
2013-07-11 01:20:37 +00:00
Vinod Kumar Vavilapalli 66b20f8486 YARN-295. Fixed a race condition in ResourceManager RMAppAttempt state machine. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1501856 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501857 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 17:09:41 +00:00
Vinod Kumar Vavilapalli 56f8a1a6f3 YARN-368. Fixed a typo in error message in Auxiliary services. Contributed by Albert Chu.
svn merge --ignore-ancestry -c 1501852 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501853 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 17:03:14 +00:00
Bikas Saha 88a0d9cc2c Merge r1501605 from trunk to branch-2 for YARN-369. Handle ( or throw a proper error when receiving) status updates from application masters that have not registered (Mayank Bansal & Abhishek Kapoor via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501606 13f79535-47bb-0310-9956-ffa450edef68
2013-07-09 23:20:08 +00:00
Hitesh Shah 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
Chris Nauroth e9fff0bbba YARN-894. Merging change r1501016 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1501020 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 23:44:30 +00:00
Vinod Kumar Vavilapalli 16841d50c5 YARN-791. Changed RM APIs and web-services related to nodes to ensure that both are consistent with each other. Contributed by Sandy Ryza.
svn merge --ignore-ancestry -c 1500994 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1500995 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 22:33:43 +00:00
Bikas Saha c478992e4c Merge r1499886 from trunk to branch-2. YARN-845. RM crash with NPE on NODE_UPDATE (bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1499888 13f79535-47bb-0310-9956-ffa450edef68
2013-07-04 23:38:29 +00:00
Luke Lu 8a93677f93 YARN-877. Support resource blacklisting for FifoScheduler. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1498024 13f79535-47bb-0310-9956-ffa450edef68
2013-06-29 20:22:19 +00:00
Alejandro Abdelnur 1731028a94 YARN-883. Expose Fair Scheduler-specific queue metrics. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1497885 13f79535-47bb-0310-9956-ffa450edef68
2013-06-28 19:01:48 +00:00
Arun Murthy 9efe263b78 Merge -c 1496751 from trunk to branch-2 to fix YARN-869. Move ResourceManagerAdministrationProtocol out of main YARN api. Contributed by Vinod K V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496754 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 06:03:24 +00:00
Vinod Kumar Vavilapalli a7f7d5b440 YARN-874. Making common RPC to switch to not switch to simple when other mechanisms are enabled and thus fix YARN/MR test failures after HADOOP-9421. Contributed by Daryn Sharp and Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1496692 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496693 13f79535-47bb-0310-9956-ffa450edef68
2013-06-26 00:43:05 +00:00
Alejandro Abdelnur 620f7b0c02 YARN-736. Add a multi-resource fair sharing metric. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1496154 13f79535-47bb-0310-9956-ffa450edef68
2013-06-24 18:35:59 +00:00
Bikas Saha d4980decb4 Merge r1495684 from trunk to branch-2. MiniYARNCluster broken after YARN-827 (bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495686 13f79535-47bb-0310-9956-ffa450edef68
2013-06-22 08:11:51 +00:00
Bikas Saha 772c5a1bb0 Deleting files missed for YARN-827
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495631 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 22:51:33 +00:00
Bikas Saha a6b923e4d1 Merge r1495533 from trunk to branch-2 for YARN-827. Need to make Resource arithmetic methods accessible (Jian He via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495538 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 18:51:17 +00:00
Alejandro Abdelnur f502a476f2 YARN-866. Add test for class ResourceWeights. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495496 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 16:26:52 +00:00
Hitesh Shah bf433c06c7 Merge r1495160 from trunk to branch-2 for YARN-861. TestContainerManager is failing. Contributed by Vinod Kumar Vavilapalli.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495162 13f79535-47bb-0310-9956-ffa450edef68
2013-06-20 20:22:02 +00:00
Vinod Kumar Vavilapalli 9c307dcbf4 YARN-854. Fixing YARN bugs that are failing applications in secure environment. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1494845 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494846 13f79535-47bb-0310-9956-ffa450edef68
2013-06-20 03:42:13 +00:00
Siddharth Seth 5de952dca0 merge YARN-848 from trunk. Fix NodeManager to register with RM using the fully qualified hostname. Contributed by Hitesh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494389 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 23:50:32 +00:00
Vinod Kumar Vavilapalli 368c7ae735 YARN-694. Starting to use NMTokens to authenticate all communication with NodeManagers. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1494369 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494370 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 23:20:34 +00:00
Arun Murthy 63779058cb Merge -c 1494035 from trunk to branch-2 to fix YARN-799. Fix CgroupsLCEResourcesHandler to use /tasks instead of /cgroup.procs. Contributed by Chris Riccomini.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494036 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 06:36:14 +00:00
Vinod Kumar Vavilapalli af90aa5265 YARN-841. Move Auxiliary service to yarn-api, annotate and document it. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1494031 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494032 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 06:23:54 +00:00
Arun Murthy 8ac6ecc7d4 Merge -c 1494027 from trunk to branch-2 to fix YARN-840. Moved ProtoUtils to yarn.api.records.pb.impl. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494029 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 05:59:54 +00:00
Vinod Kumar Vavilapalli c01d820c18 YARN-610. ClientToken is no longer set in the environment of the Containers. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1493968 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493969 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 23:14:15 +00:00
Chris Nauroth b2f8aca282 YARN-839. TestContainerLaunch.testContainerEnvVariables fails on Windows. Contributed by Chuan Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493943 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 21:19:57 +00:00
Vinod Kumar Vavilapalli a601f15ebe YARN-822. Renamed ApplicationToken to be AMRMToken, and similarly the corresponding TokenSelector and SecretManager. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1493889 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493890 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 19:12:12 +00:00
Vinod Kumar Vavilapalli 04bea5f2fd YARN-833. Moved Graph and VisualizeStateMachine into yarn.state package. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1493654 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493655 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 06:52:39 +00:00
Vinod Kumar Vavilapalli e40b5a3eb9 HADOOP-9649. Promoted YARN service life-cycle libraries into Hadoop Common for usage across all Hadoop projects. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1493650 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493651 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 06:41:49 +00:00
Vinod Kumar Vavilapalli 39aaf79717 YARN-826. Moved Clock and SystemClock into yarn.util package. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1493639 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493640 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 04:50:30 +00:00
Vinod Kumar Vavilapalli 81d8fa7120 YARN-825. Fixed javadoc and annotations for yarn-common module. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1493634 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493635 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 03:33:59 +00:00
Arun Murthy 59eab1f4c2 Merge -c 1493626 from trunk to branch-2 to fix YARN-831. Removed minimum resource from GetNewApplicationResponse as a follow-up to YARN-787. Contributed Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493627 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 02:34:04 +00:00
Arun Murthy 68807a65c2 Merge -c 1493623 from trunk to branch-2 to fix YARN-387. Renamed YARN protocols for consistency. Contributed by Vinod K V.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493624 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 02:29:56 +00:00
Arun Murthy ae5df3d869 Merge -c 1493509 from trunk to branch-2 to fix YARN-787. Removed minimum resource from RegisterApplicationMasterResponse. Contributed by Alejandro Abdelnur.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493510 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 14:00:36 +00:00
Vinod Kumar Vavilapalli cf179b9b0a YARN-693. Modified RM to send NMTokens on allocate call so that AMs can then use them for authentication with NMs. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1493448 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493449 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 03:12:04 +00:00
Vinod Kumar Vavilapalli ef1ee646b6 YARN-781. Exposing LOGDIR in all containers' environment which should be used by containers for logging purposes. Contributed by Jian He.
svn merge --ignore-ancestry -c 1493428 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493429 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 23:11:26 +00:00
Vinod Kumar Vavilapalli dc8d2412fe YARN-821. Renamed setFinishApplicationStatus to setFinalApplicationStatus in FinishApplicationMasterRequest for consistency. Contributed by Jian He.
svn merge --ignore-ancestry -c 1493315 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493316 13f79535-47bb-0310-9956-ffa450edef68
2013-06-15 04:58:45 +00:00
Alejandro Abdelnur 97bd8f52dd YARN-789. Enable zero capabilities resource requests in fair scheduler. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493220 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 19:18:18 +00:00
Alejandro Abdelnur e9d68b7de2 YARN-803. factor out scheduler config validation from the ResourceManager to each scheduler implementation. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493161 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 17:09:16 +00:00
Vinod Kumar Vavilapalli da2a0ea3ce YARN-806. Moved ContainerExitStatus from yarn.api to yarn.api.records. Contributed by Jian He.
svn merge --ignore-ancestry -c 1493138 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493139 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 16:11:36 +00:00
Alejandro Abdelnur c881f2e93b YARN-782. vcores-pcores ratio functions differently from vmem-pmem ratio in misleading way. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493065 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 13:43:25 +00:00
Vinod Kumar Vavilapalli d55b5c96da YARN-792. Moved NodeHealthStatus from yarn.api.record to yarn.server.api.record. Contributed by Jian He.
svn merge --ignore-ancestry -c 1492943 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492944 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 03:19:34 +00:00
Vinod Kumar Vavilapalli 677d81386b YARN-692. Creating NMToken master key on RM and sharing it with NM as a part of RM-NM heartbeat. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1492907 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492908 13f79535-47bb-0310-9956-ffa450edef68
2013-06-14 00:07:34 +00:00
Vinod Kumar Vavilapalli 6418929696 YARN-773. Moved YarnRuntimeException from package api.yarn to api.yarn.exceptions. Contributed by Jian He.
svn merge --ignore-ancestry -c 1492903 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492904 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 23:26:20 +00:00
Vinod Kumar Vavilapalli e4e8dc1f6c YARN-746. Renamed Service.register() and Service.unregister() to registerServiceListener() & unregisterServiceListener() respectively. Contributed by Steve Loughran.
svn merge --ignore-ancestry -c 1492780 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492781 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 17:50:09 +00:00
Vinod Kumar Vavilapalli 903f0fea8e YARN-530. Defined Service model strictly, implemented AbstractService for robust subclassing and migrated yarn-common services. Contributed by Steve Loughran.
YARN-117. Migrated rest of YARN to the new service model. Contributed by Steve Louhran.
MAPREDUCE-5298. Moved MapReduce services to YARN-530 stricter lifecycle. Contributed by Steve Loughran.
svn merge --ignore-ancestry -c 1492718 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492720 13f79535-47bb-0310-9956-ffa450edef68
2013-06-13 15:56:44 +00:00
Alejandro Abdelnur 46e514b06b YARN-600. Hook up cgroups CPU settings to the number of virtual cores allocated. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492366 13f79535-47bb-0310-9956-ffa450edef68
2013-06-12 19:00:00 +00:00
Jonathan Turner Eagles f913f4c8ff YARN-427. Coverage fix for org.apache.hadoop.yarn.server.api.* (Aleksey Gorshkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492285 13f79535-47bb-0310-9956-ffa450edef68
2013-06-12 17:01:50 +00:00
Alejandro Abdelnur 7ba28a1cbc YARN-795. Fair scheduler queue metrics should subtract allocated vCores from available vCores. (ywskycn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492025 13f79535-47bb-0310-9956-ffa450edef68
2013-06-12 00:49:06 +00:00
Arun Murthy 9cc1150be1 Merge -c 1491989 from trunk to branch-2 to fix RN-767. Initialize application metrics at RM bootup. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491990 13f79535-47bb-0310-9956-ffa450edef68
2013-06-11 22:16:03 +00:00
Siddharth Seth 05ff189ee1 merge YARN-737 from trunk. Throw some specific exceptions directly instead of wrapping them in YarnException. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1491897 13f79535-47bb-0310-9956-ffa450edef68
2013-06-11 18:48:00 +00:00
Vinod Kumar Vavilapalli efdbd0a006 YARN-642. Removed health parameter from ResourceManager /nodes web-service and cleaned the behaviour of the status parameter. Contributed by Sandy Ryza.
svn merge --ignore-ancestry -c 1490890 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490892 13f79535-47bb-0310-9956-ffa450edef68
2013-06-08 00:55:25 +00:00
Alejandro Abdelnur 8569297e98 YARN-686. Flatten NodeReport. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490828 13f79535-47bb-0310-9956-ffa450edef68
2013-06-07 21:01:23 +00:00
Jason Darrell Lowe 4937b65732 svn merge -c 1490704 FIXES: YARN-760. NodeManager throws AvroRuntimeException on failed start. Conributed by Niranjan Singh
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490706 13f79535-47bb-0310-9956-ffa450edef68
2013-06-07 16:22:55 +00:00
Bikas Saha 485c04d0a4 Merge r1490470 from trunk to branch-2 for YARN-759. Create Command enum in AllocateResponse (bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490473 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 23:43:38 +00:00
Bikas Saha 09c12434a2 Merge r1490392 from trunk to branch-2 for YARN-750. Allow for black-listing resources in YARN API and Impl in CS (acmurthy via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490396 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 19:03:27 +00:00
Thomas Graves 7d1accf8a1 YARN-764. blank Used Resources on Capacity Scheduler page (Nemon Lou via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490388 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 18:26:31 +00:00
Vinod Kumar Vavilapalli 6f8b6699bd YARN-724. Moved ProtoBase from api.records to api.records.impl.pb. Contributed by Jian He.
MAPREDUCE-5303. Changed MR app after moving ProtoBase to package impl.pb via YARN-724. Contributed by Jian He.
svn merge --ignore-ancestry -c 1489658 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489659 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 22:47:05 +00:00
Vinod Kumar Vavilapalli 0b97dc1cd3 YARN-756. Remnants from moving Preemption* records to yarn.api where they really belong. Contributed by Jian He.
svn merge --ignore-ancestry -c 1489614 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489616 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 21:22:41 +00:00
Kihwal Lee a912bcad0c Merging from trunk to branch-2 to fix YARN-742.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489601 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 20:55:56 +00:00
Arun Murthy 27ed92a3fb Set version in branch-2 to 2.2.0-SNAPSHOT.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489479 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 15:34:52 +00:00
Vinod Kumar Vavilapalli 377f3ef85b YARN-755. Renamed AllocateResponse.reboot to AllocateResponse.resync. Contributed by Bikas Saha.
svn merge --ignore-ancestry -c 1489295 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489296 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 05:55:22 +00:00
Vinod Kumar Vavilapalli 3adbeff801 YARN-756. Move Preemption* records to yarn.api where they really belong. Contributed by Jian He.
svn merge --ignore-ancestry -c 1489290 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489291 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 05:05:16 +00:00
Vinod Kumar Vavilapalli 5f20c37919 YARN-635. Renamed YarnRemoteException to YarnException. Contributed by Siddharth Seth.
MAPREDUCE-5301. Updated MR code to work with YARN-635 changes of renaming YarnRemoteException to YarnException. Contributed by Siddharth Seth.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489288 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 04:50:16 +00:00
Vinod Kumar Vavilapalli fa6ec826eb YARN-757. Changed TestRMRestart to use the default scheduler to avoid test failures. Contributed by Bikas Saha.
svn merge --ignore-ancestry -c 1489268 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489269 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 01:14:50 +00:00
Vinod Kumar Vavilapalli cafa5d8bb5 YARN-748. Moved BuilderUtils from yarn-common to yarn-server-common for eventual retirement. Contributed by Jian He.
MAPREDUCE-5297. Updated MR App since BuilderUtils is no longer public after YARN-748. Contributed by Jian He.
svn merge --ignore-ancestry -c 1489257 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489262 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 00:56:26 +00:00
Arun Murthy 75747321b7 Merge -c 1489234 from trunk to branch-2 to fix YARN-726. Fix queue & finish time fields in web-ui for ResourceManager. Contributed by Mayank Bansal.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489235 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 23:50:54 +00:00
Arun Murthy 59d44bb72c Merge -c 1489087 from trunk to branch-2 to fix YARN-398. Make it possible to specify hard locality constraints in resource requests for CapacityScheduler. Contributed by Arun C. Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489088 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 18:15:04 +00:00
Alejandro Abdelnur 7854b322d4 YARN-326. Add multi-resource scheduling to the fair scheduler. (sandyr via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489072 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 17:36:20 +00:00
Siddharth Seth f42fc8f958 merge YARN-720 and MAPREDUCE-5291 from trunk. container-log4j.properties should not refer to mapreduce properties. Update MRApp to use YARN properties for log setup. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488830 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 02:36:44 +00:00