Commit Graph

717 Commits

Author SHA1 Message Date
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
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
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
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
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
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 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
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 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
Colin McCabe fa2a3c94f2 HADOOP-9998. Provide methods to clear only part of the DNSToSwitchMapping. (Junping Du via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526568 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 15:24:40 +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
Hitesh Shah d437cfb16d Merge r1526330 from trunk to branch-2 for YARN-49. Improve distributed shell application to work on a secure cluster. Contributed by Vinod Kumar Vavilapalli.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526332 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 23:41:05 +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 9e56f8c7ab Fix credit for YARN-1188
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525519 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 07:11:24 +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
Jing Zhao c084582988 HDFS-5231. Merge change r1525133 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525134 13f79535-47bb-0310-9956-ffa450edef68
2013-09-20 20:35:45 +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
Arun Murthy 3836473c73 Preparing for hadoop-2.1.1-beta release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523892 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 05:23:39 +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
Chris Nauroth 4a8ac4d59d YARN-1025. Merging change r1521670 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521671 13f79535-47bb-0310-9956-ffa450edef68
2013-09-10 22:52:55 +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
Alejandro Abdelnur 9e810fbb14 Amending yarn CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521455 13f79535-47bb-0310-9956-ffa450edef68
2013-09-10 12:15:28 +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 4cb86bf2db Fixing CHANGES.txt for YARN-758 as it is now merged into branch-2.1-beta.
svn merge --ignore-ancestry -c 1520659 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520660 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 18:30:59 +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 d32a81d55c YARN-1124. Modified YARN CLI application list to display new and submitted applications together with running apps by default, following up YARN-1074. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1519869 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519871 13f79535-47bb-0310-9956-ffa450edef68
2013-09-03 22:19:17 +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 b5ec50756d YARN-1120. Made ApplicationConstants.Environment.USER definition OS neutral as the corresponding value is now set correctly end-to-end. Contributed by Chuan Liu.
svn merge --ignore-ancestry -c 1519330 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519331 13f79535-47bb-0310-9956-ffa450edef68
2013-09-02 02:31:55 +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
Vinod Kumar Vavilapalli 2ddc961c85 YARN-981. Fixed YARN webapp so that /logs servlet works like before. Addendum patch to fix bugs in the first patch. Contributed by Jian He.
svn merge --ignore-ancestry -c 1519208 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519210 13f79535-47bb-0310-9956-ffa450edef68
2013-08-31 20:02:30 +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 3fea164bb1 YARN-1117. Improved help messages for "yarn application" and "yarn node" commands. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1519117 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519118 13f79535-47bb-0310-9956-ffa450edef68
2013-08-30 23:26:36 +00:00
Bikas Saha 148db9d4f5 Merge 1519107. from trunk to branch-2 for YARN-771. AMRMClient support for resource blacklisting (Junping Du via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519112 13f79535-47bb-0310-9956-ffa450edef68
2013-08-30 23:03:44 +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
Vinod Kumar Vavilapalli 8966d37557 YARN-1080. Improved help message for "yarn logs" command. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1518731 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518732 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 17:56:18 +00:00
Sanford Ryza 732c70f814 YARN-1034. Remove experimental in the Fair Scheduler documentation. (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518445 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 02:24:43 +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 bc70667ae1 YARN-1081. Made a trivial change to YARN node CLI header to avoid potential confusion. Contributed by Akira AJISAKA.
svn merge --ignore-ancestry -c 1518080 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518081 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 05:46:57 +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 b156434fd5 YARN-981. Fixed YARN webapp so that /logs servlet works like before. Contributed by Jian He.
svn merge --ignore-ancestry -c 1518030 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518031 13f79535-47bb-0310-9956-ffa450edef68
2013-08-27 23:39:16 +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
Sanford Ryza 922647fe26 YARN-942. In Fair Scheduler documentation, inconsistency on which properties have prefix (Akira Ajisaka via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517692 13f79535-47bb-0310-9956-ffa450edef68
2013-08-26 20:48:54 +00:00
Sanford Ryza 6686dab93e YARN-1093. Corrections to Fair Scheduler documentation (Wing Yew Poon via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517669 13f79535-47bb-0310-9956-ffa450edef68
2013-08-26 19:59:12 +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
Sanford Ryza 3fe608f611 YARN-905. Add state filters to nodes CLI (Wei Yan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517087 13f79535-47bb-0310-9956-ffa450edef68
2013-08-23 22:58:30 +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
Arun Murthy aa3f77675b Preparing for hadoop-2.1.0-beta rc2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514471 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 20:34:25 +00:00
Siddharth Seth 56cfd507f1 Update CHANGES.txt to move YARN-1045 and MAPREDUCE-5352 to the correct version.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514433 13f79535-47bb-0310-9956-ffa450edef68
2013-08-15 18:46:03 +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
Bikas Saha 299b910a01 Merging r1510070 from trunk to branch-2 for YARN-994. HeartBeat thread in AMRMClientAsync does not handle runtime exception correctly (Xuan Gong via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510071 13f79535-47bb-0310-9956-ffa450edef68
2013-08-03 22:38:58 +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 d10bda6ad9 svn merge -c 1509475 FIXES: Correct fix versions for MAPREDUCE-5428 and YARN-573.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509476 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 23:55:30 +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
Arun Murthy e65416a459 Updating release date for hadoop-2.1.0-beta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1508408 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 12:25:13 +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
Luke Lu 79fa2c5e79 YARN-347. Node CLI should show CPU info besides memory in node status. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507958 13f79535-47bb-0310-9956-ffa450edef68
2013-07-29 07:31:40 +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 5f64166ba3 Merge r1506750 from trunk to branch-2 for YARN-875. Application can hang if AMRMClientAsync callback thread has exception (Xuan Gong via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506752 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 22:16:37 +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
Kihwal Lee b2b14eb45e svn merge -c 1506675 merging from trunk to branch-2 to fix YARN-968.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506678 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 19:45:49 +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
Jason Darrell Lowe d6be90bccf svn merge -c 1506226 FIXES: MAPREDUCE-5356. Ability to refresh aggregated log retention period and check interval. Contributed by Ashwin Shankar
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506230 13f79535-47bb-0310-9956-ffa450edef68
2013-07-23 19:25:19 +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
Vinod Kumar Vavilapalli 9c790a8fb7 Fixing YARN CHANGES.txt. The general bug list got mixed up with HADOOP-8562 sub-tasks.
svn merge --ignore-ancestry -c 1505847 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1505848 13f79535-47bb-0310-9956-ffa450edef68
2013-07-22 23:32:51 +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
Hitesh Shah c2a02fb917 merge -c 1504970 from trunk to branch-2 to fix YARN-919. Document setting default heap sizes in yarn env.sh Contributed by Mayank Bansal.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504971 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 19:24:13 +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 1f65519b8a Fixed CHANGES.txt to reflect that new content in branch-2 goes to hadoop-2.3.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504743 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 01:30:18 +00:00
Arun Murthy 78137a3634 Fixed CHANGES.txt to reflect that all fixes in 2.1.1-beta are now in 2.1.0-beta.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504739 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 01:04:10 +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
Bikas Saha ace3a40b23 Merge r1503960 from trunk to branch-2 for YARN-927. Change ContainerRequest to not have more than 1 container count and remove StoreContainerRequest (bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503965 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 01:01:03 +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
Bikas Saha 0055e40226 Trivial fix for minor refactor error for YARN-521
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503922 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 22:15:47 +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
Bikas Saha 644b6a54ad Merge r1503526 from trunk to branch-2 for YARN-521. Augment AM - RM client module to be able to request containers only at specific locations (Sandy Ryza via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503527 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 00:28:29 +00:00