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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
7246cf9b41
Merge -c 1488806 from trunk to branch-2 to fix YARN-749. Rename ResourceRequest.(get,set)HostName to ResourceRequest.(get,set)ResourceName. Contributed by Arun C. Murthy.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488807 13f79535-47bb-0310-9956-ffa450edef68
2013-06-02 22:55:31 +00:00
41ed12124c
YARN-717. Put object creation factories for Token in the class itself and remove useless derivations for specific tokens. Contributed by Jian He.
...
MAPREDUCE-5289. Updated MR App to use Token directly after YARN-717. Contributed by Jian He.
svn merge --ignore-ancestry -c 1488616 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488617 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 21:45:24 +00:00
6e0b55c5b7
Setting artifact versions to 2.1.0-SNAPSHOT to refrecl recent release of 2,0.5-alpha
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488586 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 20:06:41 +00:00
cdab92d0c3
merge YARN-735 from trunk. Make ApplicationAttemptId, ContainerId and NodeId immutable. Contributed by Jian He.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488440 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 00:15:53 +00:00
ab4b602ca6
YARN-392. Make it possible to specify hard locality constraints in resource requests. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488328 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 17:28:10 +00:00
e6a9c87a11
YARN-684. ContainerManager.startContainer should use ContainerTokenIdentifier instead of the entire Container. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488086 13f79535-47bb-0310-9956-ffa450edef68
2013-05-31 04:14:27 +00:00
a099537780
YARN-716. Making ApplicationID immutable. Contributed by Siddharth Seth.
...
MAPREDUCE-5282. Updating MR App to use immutable ApplicationID after YARN-716. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1487994 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487995 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 20:19:53 +00:00
0fb465cbc4
merge YARN-719 from trunk. Move RMIdentifier from Container to ContainerTokenIdentifier. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487746 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 05:01:40 +00:00
dfa5f198f0
YARN-638. Modified ResourceManager to restore RMDelegationTokens after restarting. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1487720 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487721 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 04:15:05 +00:00
cfdb09b7cb
YARN-578. Fixed NM to use SecureIOUtils for reading and aggregating logs. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1487672 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487686 13f79535-47bb-0310-9956-ffa450edef68
2013-05-30 00:01:04 +00:00
c4c2f45c6c
svn merge -c 1487498 FIXES: YARN-512. Log aggregation root directory check is more expensive than it needs to be. Contributed by Maysam Yabandeh
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487500 13f79535-47bb-0310-9956-ffa450edef68
2013-05-29 14:29:38 +00:00
6c5055fe92
YARN-571. Remove user from ContainerLaunchContext. Contributed by Omkar Vinit Joshi.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486251 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 23:11:25 +00:00
1a895a3fd6
HADOOP-8562. Merge r1477427 for HDFS-4610, r1477408 for YARN-506, r1477403 for MAPREDUCE-5177
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486241 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 22:29:49 +00:00
f0829a44e4
HADOOP-8562. Merge r1469667 for YARN-493 and HADOOP-9486 and r1469996 for HADOOP-9488.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486231 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 21:58:04 +00:00
3694a73ff8
HADOOP-9290. Merge r1476586 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486159 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 18:37:58 +00:00
de7911b528
HADOOP-8562. Merge r1469996 for HADOOP-9488, r1469998 for YARN-593
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1486101 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 16:03:32 +00:00
9b910c5c88
HADOOP-8562. Merge r1464780 HDFS-4625, r1465869 YARN-557, r1466148 HDFS-4674, r1466306 HADOOP-9437, r1466746 YARN-487
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485934 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 05:34:41 +00:00
02205fa797
HADOOP-8562. Merge r1457069 for HDFS-4604, r1459514 for YARN-488, r1459520 for YARN-490, r1459526 for YARN-491, r1459544 for MAPREDUCE-5078 and r1459573 for HDFS-4607
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485911 13f79535-47bb-0310-9956-ffa450edef68
2013-05-24 00:51:31 +00:00
4bf02c3be8
YARN-711. Copied BuilderUtil methods in individual API records as BuilderUtils is going to be dismantled. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1485888 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485890 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 22:48:13 +00:00
a1235b5ba9
HADOOP-8562. Merge r1453486 from trunk
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485845 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 20:41:53 +00:00
35dc9545e1
YARN-563. Add the concept of an application-type for each application. Contributed by Mayank Bansal.
...
MAPREDUCE-5246. Specify application-type at the time of job submission after YARN-563. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1485790 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485792 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 18:02:45 +00:00
356be82fc5
YARN-708. Moved RecordFactory classes to hadoop-yarn-api, and put some miscellaneous fixes to the interfaces. Contributed by Siddharth Seth.
...
svn merge --ignore-ancestry -c 1485478 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485479 13f79535-47bb-0310-9956-ffa450edef68
2013-05-22 22:51:51 +00:00
f0bd8da38b
YARN-617. Made ContainerTokens to be used for validation at NodeManager also in unsecure mode to prevent AMs from faking resource requirements in unsecure mode. Contributed by Omkar Vinit Joshi.
...
Merge from trunk revision 1483667 with little test modifications for proper merge.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483668 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 06:38:03 +00:00
59a272eae6
svn merge -c 1483578 FIXES: YARN-690. RM exits on token cancel/renew problems (daryn via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483579 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 21:42:41 +00:00
3904614953
YARN-628. Fix the way YarnRemoteException is being unrolled to extract out the underlying exception. Contributed by Siddharth Seth.
...
svn merge --ignore-ancestry -c 1483207 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1483208 13f79535-47bb-0310-9956-ffa450edef68
2013-05-16 06:59:19 +00:00
1f922d3c51
merge YARN-615 from trunk. Rename ContainerLaunchContext.containerTokens to tokens. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1482200 13f79535-47bb-0310-9956-ffa450edef68
2013-05-14 04:13:00 +00:00
af10c356bc
YARN-590. Added an optional mesage to be returned by ResourceMaanger when RM asks an RM to shutdown/resync etc so that NMs can log this message locally for better debuggability. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1481234 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481235 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 23:38:35 +00:00
0abf49936a
YARN-663. Changed ResourceTracker API and LocalizationProtocol API to throw YarnRemoteException and IOException. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1481215 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481216 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 21:59:59 +00:00
2594db460f
YARN-634. Modified YarnRemoteException to be not backed by PB and introduced a separate SerializedException record. Contributed by Siddharth Seth.
...
MAPREDUCE-5239. Updated MR App to reflect YarnRemoteException changes after YARN-634. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1481205 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1481209 13f79535-47bb-0310-9956-ffa450edef68
2013-05-10 21:51:32 +00:00
a88f23aec3
YARN-568. Add support for work preserving preemption to the FairScheduler.
...
Contributed by Carlo Curino and Sandy Ryza
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480837 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 23:29:38 +00:00
98f63813b4
YARN-598. Add virtual cores to queue metrics. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480817 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 22:24:29 +00:00
de8b9c94a4
YARN-655. Fair scheduler metrics should subtract allocated memory from available memory. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480810 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 22:17:36 +00:00
5d11e610a4
YARN-637. FS: maxAssign is not honored. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480803 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 21:52:43 +00:00
b257aed8bd
YARN-507. Add interface visibility and stability annotations to FS interfaces/classes. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480800 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 21:48:53 +00:00
6aa0edc793
YARN-630. Changed AMRMProtocol api to throw IOException and YarnRemoteException. Contributed by Xuan Gong.
...
MAPREDUCE-5226. Handling YarnRemoteException separately from IOException in MR App's use of AMRMProtocol after YARN-630. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1480529 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480530 13f79535-47bb-0310-9956-ffa450edef68
2013-05-09 05:32:52 +00:00
fc693ff519
YARN-631. Changed ClientRMProtocol api to throw IOException and YarnRemoteException. Contributed by Xuan Gong.
...
MAPREDUCE-5212. Handling YarnRemoteException separately from IOException in MR App after YARN-631. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1480494 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480495 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 22:54:07 +00:00
0ec689c9a8
YARN-582. Changed ResourceManager to recover Application token and client tokens for app attempt so that RM can be restarted while preserving current applications. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1480168 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1480169 13f79535-47bb-0310-9956-ffa450edef68
2013-05-08 06:21:02 +00:00
2136542f1b
YARN-632. Changed ContainerManager api to throw IOException and YarnRemoteException. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1479740 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479741 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 00:43:32 +00:00
486391f766
YARN-629. Make YarnRemoteException not be rooted at IOException. Contributed by Xuan Gong.
...
MAPREDUCE-5204. Handling YarnRemoteException separately from IOException in MR app after YARN-629. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1479680 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479684 13f79535-47bb-0310-9956-ffa450edef68
2013-05-06 19:20:02 +00:00
8b755237f8
YARN-645. Moved RMDelegationTokenSecretManager from yarn-server-common to yarn-server-resourcemanager where it really belongs. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1479022 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479026 13f79535-47bb-0310-9956-ffa450edef68
2013-05-04 01:13:43 +00:00
0b64df0630
YARN-625. Move the utility method unwrapAndThrowException from YarnRemoteExceptionPBImpl to RPCUtil. Contributed by Siddharth Seth.
...
svn merge --ignore-ancestry -c 1478594 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478595 13f79535-47bb-0310-9956-ffa450edef68
2013-05-02 22:45:30 +00:00
fbdc7ed67d
YARN-618. Modified RM_INVALID_IDENTIFIER to be -1 instead of zero. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1478230 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1478235 13f79535-47bb-0310-9956-ffa450edef68
2013-05-01 23:48:32 +00:00
e2a1f994a1
YARN-599. Refactoring submitApplication in ClientRMService and RMAppManager to separate out various validation checks depending on whether they rely on RM configuration or not. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1477478 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1477479 13f79535-47bb-0310-9956-ffa450edef68
2013-04-30 05:44:45 +00:00
373db7be2a
YARN-516. Reverting the patch from branch-2 as HADOOP-9357 also got reverted.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476839 13f79535-47bb-0310-9956-ffa450edef68
2013-04-28 21:15:39 +00:00
d5331b18a9
YARN-576. Modified ResourceManager to reject NodeManagers that don't satisy minimum resource requirements. Contributed by Kenji Kikushima.
...
svn merge --ignore-ancestry -c 1476824 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476825 13f79535-47bb-0310-9956-ffa450edef68
2013-04-28 20:04:47 +00:00
ffe3368d94
YARN-562. Modified NM to reject any containers allocated by a previous ResourceManager. Contributed by Jian He.
...
MAPREDUCE-5167. Update MR App after YARN-562 to use the new builder API for the container. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476346 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 19:08:44 +00:00
141fe2f5e5
YARN-363. Add webapps/proxy directory without which YARN proxy-server fails when started in stand-alone mode. Contributed by Kenji Kikushima.
...
svn merge --ignore-ancestry -c 1476330 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476332 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 18:31:04 +00:00
27404b1190
YARN-591. Moved RM recovery related records out of public API as they do not belong there. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1476324 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1476327 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 18:04:24 +00:00
07ab02a982
Merge -r 1475680:1475681 from trunk to branch-2. Fixes: YARN-289. Fair scheduler allows reservations that won't fit on node. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475682 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 09:18:24 +00:00
3bed8dc7b9
Merge -r 1475669:1475670 from trunk to branch-2. Fixes: YARN-595. Refactor fair scheduler to use common Resources. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475672 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 08:36:22 +00:00
a1fe9a0c9f
YARN-577. Add application-progress also to ApplicationReport. Contributed by Hitesh Shah.
...
MAPREDUCE-5178. Update MR App to set progress in ApplicationReport after YARN-577. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1475636 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1475637 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 05:45:15 +00:00
c4feeefb2b
merge YARN-579 from trunk. Stop setting the Application Token in the AppMaster env, in favour of the copy present in the container token field. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471815 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 02:48:18 +00:00
909e52274c
YARN-605. Fix failing unit test in TestNMWebServices when versionInfo has parantheses like when running on a git checkout. Contributed by Hitesh Shah.
...
svn merge --ignore-ancestry -c 1471608 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471609 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 19:43:23 +00:00
2dfecb78e5
YARN-561. Modified NodeManager to set key information into the environment of every container that it launches. Contributed by Xuan Gong.
...
MAPREDUCE-5175. Updated MR App to not set envs that will be set by NMs anyways after YARN-561. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471207 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 00:01:08 +00:00
700a6aa0a0
YARN-581. Added a test to verify that app delegation tokens are restored after RM restart. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1471187 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1471188 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 22:51:19 +00:00
23f099da0b
YARN-583. Moved application level local resources to be localized under the filecache sub-directory under application directory. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1470812 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470813 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 04:38:45 +00:00
66beaf2c7d
Merge -c r1470243 from trunk to branch-2 for YARN-594. Update test and add comments in YARN-534 (Jian He via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470245 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 22:06:41 +00:00
e2b5e3c2b4
YARN-542. Changed the default global AM max-attempts value to be not one. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1470094 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470095 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 00:36:07 +00:00
a02788f864
YARN-547. Fixed race conditions in public and private resource localization which used to cause duplicate downloads. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1470076 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470078 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 22:36:52 +00:00
1bfb6af49f
YARN-441. Removed unused utility methods for collections from two API records. Contributed by Xuan Gong.
...
MAPREDUCE-5163. Update MR App to not use API utility methods for collections after YARN-441. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1469657 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469658 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 01:34:04 +00:00
15d5394221
YARN-482. FS: Extend SchedulingMode to intermediate queues. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469511 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 18:13:36 +00:00
27bef76501
YARN-585. Fix failure in TestFairScheduler#testNotAllowSubmitApplication caused by YARN-514. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1469492 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469494 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 17:49:57 +00:00
039d673794
Merge -c r1469059 from trunk to branch-2 for YARN-514. Delayed store operations should not result in RM unavailability for app submission (Zhijie Shen via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1469062 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 20:30:48 +00:00
8cc3b081fa
YARN-444. Moved special container exit codes from YarnConfiguration to API where they belong. Contributed by Sandy Ryza.
...
MAPREDUCE-5151. Updated MR AM to use standard exit codes from the API after YARN-444. Contributed by Sandy Ryza.
svn merge --ignore-ancestry -c 1468276 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1468277 13f79535-47bb-0310-9956-ffa450edef68
2013-04-15 23:55:26 +00:00
ac7d455a0f
Merge -c 1467244 from trunk to branch-2 to fix YARN-412. Fixed FifoScheduler to check hostname of a NodeManager rather than its host:port during scheduling which caused incorrect locality for containers. Contributed by Roger Hoover.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467245 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 12:15:17 +00:00
a84c8bcbd4
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467130 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 23:04:09 +00:00
51dc407f30
YARN-319. Submitting a job to a fair scheduler queue for which the user does not have permission causes the client to wait forever. Contributed by Shenhong.
...
svn merge --ignore-ancestry -c 1437336 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1467110 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 22:00:10 +00:00
d6f8a7f7ee
YARN-539. Addressed memory leak of LocalResource objects NM when a resource localization fails. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1466756 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466757 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 02:08:49 +00:00
81a684ebd3
YARN-495. Changed NM reboot behaviour to be a simple resync - kill all containers and re-register with RM. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1466752 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466753 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 02:01:44 +00:00
91a676fc41
Setting version in branch-2 to be 2.0.5-SNAPSHOT.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466320 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 03:16:30 +00:00
fd5224e62c
YARN-534. Change RM restart recovery to also account for AM max-attempts configuration after the restart. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1466208 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466209 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 20:16:56 +00:00
76d72db5eb
YARN-112. Fixed a race condition during localization that fails containers. Contributed by Omkar Vinit Joshi.
...
MAPREDUCE-5138. Fix LocalDistributedCacheManager after YARN-112. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1466196 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466197 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 19:57:10 +00:00
335e02124b
YARN-99. Modify private distributed cache to localize files such that no local directory hits unix file count limits and thus prevent job failures. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1465853 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465854 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 01:35:05 +00:00
0aa44dc7ac
Merge -c 1465731 from trunk to branch-2 for YARN-479. NM retry behavior for connection to RM should be similar for lost heartbeats (Jian He via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465733 13f79535-47bb-0310-9956-ffa450edef68
2013-04-08 19:19:33 +00:00
e97e0eaec7
Merge -c 1465067 from trunk to branch-2 for YARN-193. Scheduler.normalizeRequest does not account for allocation requests that exceed maximumAllocation limits (Zhijie Shen via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465069 13f79535-47bb-0310-9956-ffa450edef68
2013-04-05 17:48:35 +00:00
d002c038b2
svn merge -c 1465009 FIXES: YARN-525. make CS node-locality-delay refreshable. Contributed by Thomas Graves
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1465012 13f79535-47bb-0310-9956-ffa450edef68
2013-04-05 15:34:40 +00:00
53b3dd18a5
YARN-532. Change RMAdmin and Localization client protocol PB implementations to implement closeable so that they can be stopped when needed via RPC.stopProxy(). Contributed by Siddharth Seth.
...
svn merge --ignore-ancestry -c 1464788 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464789 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 23:31:12 +00:00
2190ac6fd9
YARN-536. Removed the unused objects ContainerStatus and ContainerStatus from Container which also don't belong to the container. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1464271 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464272 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 03:43:04 +00:00
c582c13c30
YARN-101. Fix NodeManager heartbeat processing to not lose track of completed containers in case of dropped heartbeats. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1464105 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1464106 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 16:57:40 +00:00
8565f5f81d
YARN-467. Modify public distributed cache to localize files such that no local directory hits unix file count limits and thus prevent job failures. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1463823 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463824 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 05:01:35 +00:00
379f6e9085
Merge -c 1463653 from trunk to branch-2 for YARN-382. SchedulerUtils improve way normalizeRequest sets the resource capabilities (Zhijie Shen via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463656 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 18:09:40 +00:00
a0bccf2586
YARN-447. Move ApplicationComparator in CapacityScheduler to use comparator in ApplicationId. Contributed by Nemon Lou.
...
svn merge --ignore-ancestry -c 1463405 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463406 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 06:59:51 +00:00
e6608ce1c0
YARN-516. Fix failure in TestContainerLocalizer caused by HADOOP-9357. Contributed by Andrew Wang.
...
svn merge --ignore-ancestry -c 1463362 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463363 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 02:17:14 +00:00
9baac1676a
YARN-309. Changed NodeManager to obtain heart-beat interval from the ResourceManager. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1463346 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463347 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 01:05:19 +00:00
853e93dac4
svn merge -c 1462632 FIXES: YARN-515. Node Manager not getting the master key. Contributed by Robert Joseph Evans
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1462634 13f79535-47bb-0310-9956-ffa450edef68
2013-03-29 20:27:05 +00:00
17fbf78888
YARN-460. CS user left in list of active users for the queue even when application finished (tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1462500 13f79535-47bb-0310-9956-ffa450edef68
2013-03-29 15:32:16 +00:00
ad1695cb1e
Merge -c 1462271 from trunk to branch-2 for YARN-450. Define value for * in the scheduling protocol (Zhijie Shen via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1462274 13f79535-47bb-0310-9956-ffa450edef68
2013-03-28 19:48:52 +00:00
d80e21f7bc
YARN-24. Nodemanager fails to start if log aggregation enabled and namenode unavailable. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461892 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 23:15:54 +00:00
c23fa2aff4
YARN-209. Fix CapacityScheduler to trigger application-activation when the cluster capacity changes. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1461773 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461790 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 18:52:21 +00:00
10ff818f30
YARN-474. Fix CapacityScheduler to trigger application-activation when am-resource-percent configuration is refreshed. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1461402 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461729 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 17:26:36 +00:00
f26fa51029
YARN-496. Fair scheduler configs are refreshed inconsistently in reinitialize. Contributed by Sandy Ryza
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461667 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 15:51:20 +00:00
81299911b4
YARN-474. Revert since compilations fails: svn merge --change -1461403 .
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461626 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 14:57:43 +00:00
8a21e3925c
YARN-474. Fix CapacityScheduler to trigger application-activation when am-resource-percent configuration is refreshed. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1461402 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461403 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 03:46:20 +00:00
340c65b9f0
merge YARN-440 from trunk. Flatten RegisterNodeManagerResponse. Contributed by Xuan Gong.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1461257 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 18:21:43 +00:00
13aa009480
YARN-469. Make scheduling mode in FS pluggable. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460962 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 03:27:26 +00:00
8ce818a836
YARN-378. Fix RM to make the AM max attempts/retries to be configurable per application by clients. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1460895 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460897 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 21:14:42 +00:00
4410861077
merge YARN-439 from trunk. Flatten NodeHeartbeatResponse. Contributed by Xuan Gong.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460812 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 18:30:15 +00:00
a427b71a25
merge YARN-71 from trunk. Fix the NodeManager to clean up local-dirs on restart. Contributed by Xuan Gong.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460809 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 18:25:13 +00:00
9fbf4dedb4
merge -c 1460001 from trunk to branch-2 to fix YARN-470. Support a way to disable resource monitoring on the NodeManager. Contributed by Siddharth Seth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460002 13f79535-47bb-0310-9956-ffa450edef68
2013-03-22 21:29:45 +00:00
1de797794e
merge -c 1459040 from trunk to branch-2 to fix YARN-396. Rationalize AllocateResponse in RM Scheduler API. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459044 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 20:46:22 +00:00
f854b9863b
svn merge -c 1458466 FIXES: YARN-200. yarn log does not output all needed information, and is in a binary format. Contributed by Ravi Prakash
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458473 13f79535-47bb-0310-9956-ffa450edef68
2013-03-19 19:39:31 +00:00
a21de508a1
merge -c 1457038 from trunk to branch-2 to fix YARN-196. Nodemanager should be more robust in handling connection failure to ResourceManager when a cluster is started. Contributed by Xuan Gong.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1457041 13f79535-47bb-0310-9956-ffa450edef68
2013-03-15 18:07:04 +00:00
a74edd5178
svn merge -c 1456458 FIXES: YARN-468. coverage fix for org.apache.hadoop.yarn.server.webproxy.amfilter (Aleksey Gorshkov via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1456459 13f79535-47bb-0310-9956-ffa450edef68
2013-03-14 14:55:04 +00:00
0cfa3f7fdc
YARN-198. Added a link to RM pages from the NodeManager web app. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1455800 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1455802 13f79535-47bb-0310-9956-ffa450edef68
2013-03-13 04:25:26 +00:00
3401855c1a
YARN-443. allow OS scheduling priority of NM to be different than the containers it launches (tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1454413 13f79535-47bb-0310-9956-ffa450edef68
2013-03-08 14:53:38 +00:00
d6481d4a60
merge -c 1453501 from trunk to branch-2 to fix YARN-429. capacity-scheduler config missing from yarn-test artifact. Contributed by Siddharth Seth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453502 13f79535-47bb-0310-9956-ffa450edef68
2013-03-06 19:29:12 +00:00
b7134a90e2
YARN-227. Application expiration difficult to debug for end-users (Jason Lowe via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1453087 13f79535-47bb-0310-9956-ffa450edef68
2013-03-05 23:23:18 +00:00
3cfae3cc79
svn merge -c 1452548 FIXES: YARN-345. Many InvalidStateTransitonException errors for ApplicationImpl in Node Manager. Contributed by Robert Parker
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1452549 13f79535-47bb-0310-9956-ffa450edef68
2013-03-04 21:54:03 +00:00
2b7d8ed210
merge YARN-376 from trunk. Fixes a bug which would prevent the NM knowing about completed containers and applications. Contributed by Jason Lowe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451474 13f79535-47bb-0310-9956-ffa450edef68
2013-03-01 06:01:02 +00:00
6072cb98a9
MAPREDUCE-4896. mapred queue -info spits out ugly exception when queue does not exist. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451453 13f79535-47bb-0310-9956-ffa450edef68
2013-03-01 01:28:50 +00:00
4a4b0d9402
svn merge -r 1451340:1451341 Merging from trunk to branch-2 to fix YARN-269.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451342 13f79535-47bb-0310-9956-ffa450edef68
2013-02-28 21:04:10 +00:00
829a798201
svn merge -c 1450807 FIXES: YARN-426. Failure to download a public resource prevents further downloads (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450811 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 15:33:22 +00:00
c215e12419
merge YARN-365 from trunk. Change NM heartbeat handling to not generate a scheduler event on each heartbeat. Contributed by Xuan Gong.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1450008 13f79535-47bb-0310-9956-ffa450edef68
2013-02-26 03:33:01 +00:00
937ef703eb
YARN-236. RM should point tracking URL to RM web page when app fails to start (Jason Lowe via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448408 13f79535-47bb-0310-9956-ffa450edef68
2013-02-20 21:00:05 +00:00
e9880d5942
YARN-400. RM can return null application resource usage report leading to NPE in client (Jason Lowe via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1448243 13f79535-47bb-0310-9956-ffa450edef68
2013-02-20 15:37:27 +00:00
1709c222d9
HADOOP-9117. replace protoc ant plugin exec with a maven plugin. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1446021 13f79535-47bb-0310-9956-ffa450edef68
2013-02-14 01:36:47 +00:00
19e5586651
merge YARN-391 from trunk. Formatting fixes for LCEResourceHandler classes. Contributed by Steve Loughran.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445883 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 19:41:22 +00:00
208238887c
YARN-249. Capacity Scheduler web page should show list of active users per queue like it used to (in 1.x) (Ravi Prakash via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1445691 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 15:52:05 +00:00
ab78c4c252
svn merge -c 1443796 from trunk for YARN-377. Use the new StringUtils methods added by HADOOP-9252 and fix TestContainersMonitor.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443799 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 23:57:41 +00:00
b887c9e8f5
merge YARN-355 from trunk. Fixes a bug where RM app submission could jam under load. Contributed by Daryn Sharp.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443134 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 19:06:22 +00:00
1bce97d9ef
svn merge -c 1443016 FIXES: YARN-357. App submission should not be synchronized (daryn)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443021 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:36:55 +00:00
0c2206db70
Merge -c 1423706 from trunk to branch-2 to fix YARN-3. Add support for CPU isolation/monitoring of containers. Contributed by Andrew Ferguson.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443010 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:17:57 +00:00
196341fc09
Setting version to 2.0.4-SNAPSHOT in branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442956 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 13:23:45 +00:00
807f694973
Merge -c 1442840 from trunk to branch-2 to fix YARN-370. Fix SchedulerUtils to correctly round up the resource for containers. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442841 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 04:27:54 +00:00
992ba4c79c
merge YARN-360 from trunk. Allow apps to concurrently register tokens for renewal. Contributed by Daryn Sharp.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1442442 13f79535-47bb-0310-9956-ffa450edef68
2013-02-05 00:27:36 +00:00
6eead06fa2
merge -c 1441668 from trunk to branch-2 to fix YARN-372. Move InlineDispatcher from hadoop-yarn-server-resourcemanager to hadoop-yarn-common. Contributed by Siddharth Seth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1441669 13f79535-47bb-0310-9956-ffa450edef68
2013-02-02 00:45:37 +00:00
1456adb9e1
YARN-343. Capacity Scheduler maximum-capacity value -1 is invalid (Xuan Gong via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1440460 13f79535-47bb-0310-9956-ffa450edef68
2013-01-30 15:18:40 +00:00
1321717f60
svn merge -c 1437775 FIXES: YARN-354. WebAppProxyServer exits immediately after startup. Contributed by Lian Xie
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1437776 13f79535-47bb-0310-9956-ffa450edef68
2013-01-23 22:10:50 +00:00
bec2ef4cf7
merge -c 1437245 from trunk to branch-2 to fix YARN-231. RM Restart - Add FS-based persistent store implementation for RMStateStore. Contributed by Bikas Saha
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1437246 13f79535-47bb-0310-9956-ffa450edef68
2013-01-23 00:59:57 +00:00
832e6c2953
YARN-302. Fair scheduler assignmultiple should default to false. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1434997 13f79535-47bb-0310-9956-ffa450edef68
2013-01-18 00:48:45 +00:00
f596c9b629
HADOOP-9215. when using cmake-2.6, libhadoop.so doesn't get created (only libhadoop.so.1.0.0). Contributed by Colin Patrick McCabe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1434531 13f79535-47bb-0310-9956-ffa450edef68
2013-01-17 01:37:45 +00:00
44b3be14bc
merge YARN-135 from trunk. Client tokens should be per app-attempt, and should be unregistered on App-finish. Contributed by Vinod Kumar Vavilapalli
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433571 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 18:35:10 +00:00
238a985dd0
Merge -r 1433525:1433526 from trunk to branch-2. Fixes: YARN-336. Fair scheduler FIFO scheduling within a queue only allows 1 app at a time. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433549 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 17:38:31 +00:00
416e23ad47
Merge -r 1433483:1433484 from trunk to branch-2. Fixes: YARN-335. Fair scheduler doesn't check whether rack needs containers before assigning to node. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433504 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 16:41:04 +00:00
f2c7de8f4e
Merge -c 1433138 from trunk to branch-2 to fix YARN-330. Fix flakey test: TestNodeManagerShutdown#testKillContainersOnShutdown. Contributed by Sandy Ryza
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433147 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 21:36:32 +00:00
dc426254d3
YARN-334. Maven RAT plugin is not checking all source files (tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1432939 13f79535-47bb-0310-9956-ffa450edef68
2013-01-14 15:01:01 +00:00
9b571e9ebc
YARN-325. RM CapacityScheduler can deadlock when getQueueInfo() is called and a container is completing (Arun C Murthy via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431076 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 21:04:39 +00:00
6821a98c70
merge YARN-320 from trunk. RM should always be able to renew its own tokens. Contributed by Daryn Sharp
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1431023 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 19:34:01 +00:00
b412841745
Merge -c 1430682 from trunk to branch-2 to fix YARN-2. Enhanced CapacityScheduler to account for CPU alongwith memory for multi-dimensional resource scheduling. Contributed by Arun C. Murthy.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430683 13f79535-47bb-0310-9956-ffa450edef68
2013-01-09 05:17:31 +00:00
e4a933b550
YARN-253. Fixed container-launch to not fail when there are no local resources to localize. Contributed by Tom White.
...
svn merge --ignore-ancestry -c 1430269 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1430270 13f79535-47bb-0310-9956-ffa450edef68
2013-01-08 13:23:04 +00:00
6a52f90017
YARN-170. Change NodeManager stop to be reentrant. Contributed by Sandy Ryza.
...
svn merge --ignore-ancestry -c 1429796 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429797 13f79535-47bb-0310-9956-ffa450edef68
2013-01-07 13:45:31 +00:00
c166490bf0
YARN-315. Using the common security token protobuf definition from hadoop common. Contributed by Suresh Srinivas.
...
svn merge --ignore-ancestry -c 1429748 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429749 13f79535-47bb-0310-9956-ffa450edef68
2013-01-07 11:10:04 +00:00
199df2b770
svn merge -c 1429114 FIXES: MAPREDUCE-4819. AM can rerun job after reporting final job status to the client (bobby and Bikas Saha via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429115 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 20:38:36 +00:00
5596a8cb11
YARN-50. Implement renewal / cancellation of Delegation Tokens(Siddharth Seth via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429104 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 20:31:12 +00:00
ece31146cf
Merge -r 1428399:1428400 from trunk to branch-2. Fixes: YARN-301. Fair scheduler throws ConcurrentModificationException when iterating over app's priorities. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428401 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 15:29:17 +00:00
7fcf0ec2aa
Merge -r 1428386:1428387 from trunk to branch-2. Fixes: YARN-300. After YARN-271, fair scheduler can infinite loop and not schedule any application. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428393 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 15:10:14 +00:00
cd468dc7da
Merge -r 1428361:1428362 from trunk to branch-2. Fixes: YARN-288. Fair scheduler queue doesn't accept any jobs when ACLs are configured. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428383 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 15:02:51 +00:00
1a7512987d
Merge -r 1428313:1428314 from trunk to branch-2. Fixes: YARN-192. Node update causes NPE in the fair scheduler. Contributed by Sandy Ryza
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428316 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 12:30:20 +00:00
b59f4e5e60
svn merge -c 1428095 FIXES: YARN-293. Node Manager leaks LocalizerRunner object for every Container. Contributed by Robert Joseph Evans
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428097 13f79535-47bb-0310-9956-ffa450edef68
2013-01-02 22:46:35 +00:00
4b5a93bc1d
svn merge -c 1426515 FIXES: YARN-225. Proxy Link in RM UI thows NPE in Secure mode (Devaraj K via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1426516 13f79535-47bb-0310-9956-ffa450edef68
2012-12-28 14:22:23 +00:00
674d6ba079
YARN-285. Added a temporary plugin interface for RM to be able to redirect to JobHistory server for apps that it no longer tracks. Contributed by Derek Dagit.
...
svn merge --ignore-ancestry -c 1425210 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425211 13f79535-47bb-0310-9956-ffa450edef68
2012-12-22 00:28:02 +00:00
c28831a0bd
YARN-280. RM does not reject app submission with invalid tokens (Daryn Sharp via tgraves)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1425085 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 18:56:09 +00:00
74d9349962
YARN-283. Fair scheduler fails to get queue info without root prefix. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424999 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 16:22:41 +00:00
b57c64f93f
YARN-282. Fair scheduler web UI double counts Apps Submitted. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424997 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 16:16:29 +00:00
15c515f6be
YARN-278. Fair scheduler maxRunningApps config causes no apps to make progress. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424992 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 16:09:14 +00:00
cc2c01fc94
YARN-272. Fair scheduler log messages try to print objects without overridden toString methods. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424988 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 16:03:50 +00:00
0e9379a9f1
Merge -r 1424944:1424945 from trunk to branch-2. Fixes: YARN-271. Fair scheduler hits IllegalStateException trying to reserve different apps on same node. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424946 13f79535-47bb-0310-9956-ffa450edef68
2012-12-21 15:11:43 +00:00
8636b12e35
YARN-223. Update process tree instead of getting new process trees. (Radim Kolar via llu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1424242 13f79535-47bb-0310-9956-ffa450edef68
2012-12-20 00:19:40 +00:00
50a515b45b
Merge -c 1423758 from trunk to branch-2 to fix YARN-230. RM Restart phase 1 - includes support for saving/restarting all applications on an RM bounce. Contributed by Bikas Saha.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1423759 13f79535-47bb-0310-9956-ffa450edef68
2012-12-19 04:34:54 +00:00
7b7fc7b788
YARN-254. Update fair scheduler web UI for hierarchical queues. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1423743 13f79535-47bb-0310-9956-ffa450edef68
2012-12-19 03:06:49 +00:00
6a29bf5703
YARN-264. y.s.rm.DelegationTokenRenewer attempts to renew token even after removing an app. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1421578 13f79535-47bb-0310-9956-ffa450edef68
2012-12-13 22:21:16 +00:00
30eaf879e3
Merge -r 1420703:1420704 from trunk to branch-2. Fixes: YARN-267. Fix fair scheduler web UI. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420706 13f79535-47bb-0310-9956-ffa450edef68
2012-12-12 14:36:07 +00:00
e2c0cf69ca
svn merge -c 1420232 FIXES: YARN-266. RM and JHS Web UIs are blank because AppsBlock is not escaping string properly. Contributed by Ravi Prakash
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420233 13f79535-47bb-0310-9956-ffa450edef68
2012-12-11 15:51:12 +00:00
1e5a61e3e8
svn merge -c 1417948 FIXES: YARN-258. RM web page UI shows Invalid Date for start and finish times. Contributed by Ravi Prakash
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1417950 13f79535-47bb-0310-9956-ffa450edef68
2012-12-06 15:41:20 +00:00
25bb7ad028
Merge -r 1416483:1416484 from trunk to branch-2. Fixes: YARN-72. NM should handle cleaning up containers when it shuts down. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1416485 13f79535-47bb-0310-9956-ffa450edef68
2012-12-03 12:14:04 +00:00
74122abb1f
svn merge -c 1415742 FIXES: YARN-251. Proxy URI generation fails for blank tracking URIs. Contributed by Tom White
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1415745 13f79535-47bb-0310-9956-ffa450edef68
2012-11-30 17:10:39 +00:00
232cc5d59c
Merge -r 1415591:1415592 from trunk to branch-2. Fixes: YARN-187. Add hierarchical queues to the fair scheduler. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1415593 13f79535-47bb-0310-9956-ffa450edef68
2012-11-30 12:05:13 +00:00
7b092edd2f
Merge -c 1415029 from trunk to branch-2 to fix YARN-229. Remove old unused RM recovery code. Contributed by Bikas Saha.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1415030 13f79535-47bb-0310-9956-ffa450edef68
2012-11-29 01:59:49 +00:00
3eedaed911
Merge -r 1414728:1414729 from trunk to branch-2. Fixes: MAPREDUCE-4778. Fair scheduler event log is only written if directory exists on HDFS. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414730 13f79535-47bb-0310-9956-ffa450edef68
2012-11-28 14:42:22 +00:00
c3448fe289
Merge -r 1414654:1414655 from trunk to branch-2. Fixes: YARN-222. Fair scheduler should create queue for each user by default. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414723 13f79535-47bb-0310-9956-ffa450edef68
2012-11-28 14:23:32 +00:00
0e1b19a111
Merge -r 1414646:1414647 from trunk to branch-2. Fixes: YARN-224. Fair scheduler logs too many nodeUpdate INFO messages. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1414648 13f79535-47bb-0310-9956-ffa450edef68
2012-11-28 12:28:35 +00:00
f1653b3ea8
svn merge -c 1411289 FIXES: YARN-219. NM should aggregate logs when application finishes. (bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411295 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 16:45:14 +00:00
94c43d250e
YARN-184. Remove unnecessary locking in fair scheduler, and address findbugs excludes. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410830 13f79535-47bb-0310-9956-ffa450edef68
2012-11-18 05:46:29 +00:00
0685e9eb75
svn merge -c 1410564 FIXES: YARN-151. Browser thinks RM main page JS is taking too long (Ravi Prakash via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410565 13f79535-47bb-0310-9956-ffa450edef68
2012-11-16 21:03:41 +00:00
af25e22798
svn merge -c 1410522 FIXES: YARN-214. RMContainerImpl does not handle event EXPIRE at state RUNNING (jeagles via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1410524 13f79535-47bb-0310-9956-ffa450edef68
2012-11-16 18:29:21 +00:00
fcc84bcf2a
svn merge -c 1409827 FIXES: YARN-188. Coverage fixing for CapacityScheduler (Aleksey Gorshkov via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409829 13f79535-47bb-0310-9956-ffa450edef68
2012-11-15 15:19:30 +00:00
8ca6059743
svn merge -c 1409313 FIXES: YARN-216. Remove jquery theming support. Contributed by Robert Joseph Evans.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1409314 13f79535-47bb-0310-9956-ffa450edef68
2012-11-14 19:26:54 +00:00
630ca65de1
svn merge -c 1408812 FIXES: YARN-212. NM state machine ignores an APPLICATION_CONTAINER_FINISHED event when it shouldn't. Contributed by Nathan Roberts
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1408819 13f79535-47bb-0310-9956-ffa450edef68
2012-11-13 16:04:47 +00:00
f7f9924ef8
YARN-206. TestApplicationCleanup.testContainerCleanup occasionally fails. (jlowe via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407607 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 19:55:37 +00:00
c6dd3c0263
Merge -r 1407432:1407433 from trunk to branch. Fixes: YARN-183. Clean up fair scheduler code. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407434 13f79535-47bb-0310-9956-ffa450edef68
2012-11-09 12:39:26 +00:00
0a9a5650c7
svn merge -c 1407171 FIXES: YARN-186. Coverage fixing LinuxContainerExecutor (Aleksey Gorshkov via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407172 13f79535-47bb-0310-9956-ffa450edef68
2012-11-08 17:28:00 +00:00
1eb5c00016
Merge -r 1406998:1406999 from trunk to branch-2. Fixes: YARN-169. Update log4j.appender.EventCounter to use org.apache.hadoop.log.metrics.EventCounter. Contributed by Anthony Rojas.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1407000 13f79535-47bb-0310-9956-ffa450edef68
2012-11-08 10:34:33 +00:00
b71f09c5f4
Merge -c 1406834 from trunk to branch-2 to fix YARN-201. Fix CapacityScheduler to be less conservative for starved off-switch requests. Contributed by Jason Lowe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1406835 13f79535-47bb-0310-9956-ffa450edef68
2012-11-07 21:57:01 +00:00
4722d76b4c
YARN-189. Fixed a deadlock between RM's ApplicationMasterService and the dispatcher. Contributed by Thomas Graves.
...
svn merge --ignore-ancestry -c 1404431 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404432 13f79535-47bb-0310-9956-ffa450edef68
2012-11-01 00:33:32 +00:00
aaa448f9dd
svn merge -c 1404247 FIXES: YARN-166. capacity scheduler doesn't allow capacity < 1.0 (tgraves via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404249 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 17:00:01 +00:00
08bae96f5c
svn merge -c 1404228 FIXES: YARN-159. RM web ui applications page should be sorted to display last app first (tgraves via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404230 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 16:24:25 +00:00
763c672ba2
svn merge -c 1404211 FIXES: YARN-165. RM should point tracking URL to RM web page for app when AM fails (jlowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1404213 13f79535-47bb-0310-9956-ffa450edef68
2012-10-31 15:50:53 +00:00
348faf8f36
Merge -r 1402656:1402657 from trunk to branch-2. Fixes: YARN-145. Add a Web UI to the fair share scheduler. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1402659 13f79535-47bb-0310-9956-ffa450edef68
2012-10-26 21:03:20 +00:00
c4defd0cff
svn merge -c 1401703 FIXES: YARN-180. Capacity scheduler - containers that get reserved create container token to early (acmurthy and bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401705 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 14:20:09 +00:00
1ef0ff3af5
merge -r 1401667:1401668 from trunk. FIXES: YARN-177
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401669 13f79535-47bb-0310-9956-ffa450edef68
2012-10-24 13:25:19 +00:00
e49fb14997
YARN-181. Fixed eclipse settings broken by capacity-scheduler.xml move via YARN-140. Contributed by Siddharth Seth.
...
svn merge --ignore-ancestry -c 1401504 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401508 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 22:49:37 +00:00
243966374b
merge YARN-179 from trunk. Fix some unit test failures. (Contributed by Vinod Kumar Vavilapalli)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401482 13f79535-47bb-0310-9956-ffa450edef68
2012-10-23 21:07:42 +00:00
9c70dfcf25
YARN-174. Modify NodeManager to pass the user's configuration even when rebooting. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1401086 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1401088 13f79535-47bb-0310-9956-ffa450edef68
2012-10-22 21:25:56 +00:00
e0ced0a835
YARN-140. Add capacity-scheduler-default.xml to provide a default set of configurations for the capacity scheduler. (ahmed via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400337 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 23:18:00 +00:00
aafad662be
merge YARN-136 from trunk. Make ClientToAMTokenSecretManager part of RMContext (Contributed by Vinod Kumar Vavilapalli)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400279 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 20:39:41 +00:00
767897d631
svn merge -c 1400189 FIXES: YARN-163. Retrieving container log via NM webapp can hang with multibyte characters in log (jlowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1400190 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 17:36:26 +00:00
60cd4f4c7a
reverting commit 1399959 (HADOOP-8887 again)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399971 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 05:30:30 +00:00
c6f60985a8
HADOOP-8887. Use a Maven plugin to build the native code using CMake. (cmccabe via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399959 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 03:59:39 +00:00
a2b01168e2
HDFS-8887 reverting commit r1399904 due to build failure and other issues
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399949 13f79535-47bb-0310-9956-ffa450edef68
2012-10-19 02:22:24 +00:00
26e7aae08e
HADOOP-8887. Use a Maven plugin to build the native code using CMake. (cmccabe via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399904 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 22:49:07 +00:00
9b7e8c4274
YARN-32. Fix TestApplicationTokens to not depend on test order and thus pass on JDK7. Contributed by Vinod Kumar Vavilapali.
...
svn merge --ignore-ancestry -c 1399795 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399796 13f79535-47bb-0310-9956-ffa450edef68
2012-10-18 19:12:53 +00:00
32d3e4e9f5
YARN-43. Fix TestResourceTrackerService to not depend on test order and thus pass on JDK7. Contributed by Thomas Graves.
...
svn merge --ignore-ancestry -c 1399066 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399067 13f79535-47bb-0310-9956-ffa450edef68
2012-10-17 01:29:12 +00:00
0aad6f2dac
Merge -r 1396971:1396972 from trunk to branch-2. Fixes: YARN-146. Add unit tests for computing fair share in the fair scheduler. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396977 13f79535-47bb-0310-9956-ffa450edef68
2012-10-11 10:30:53 +00:00
13fe2bd483
merge YARN-150 from trunk. Fixes AppRejectedTransition does not unregister a rejected app-attempt from the ApplicationMasterService (Contributed by Bikas Saha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396430 13f79535-47bb-0310-9956-ffa450edef68
2012-10-10 00:09:29 +00:00
9d7c8f5d89
YARN-30. Fixed tests verifying web-services to work on JDK7. Contributed by Thomas Graves.
...
svn merge --ignore-ancestry -c 1396391 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396392 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 22:55:11 +00:00
9f60339854
merge YARN-33 from trunk. Change LocalDirsHandlerService to validate the configured local and log dirs. (Contributed by Mayank Bansal)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395845 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 02:27:18 +00:00
b98a3a3787
merge YARN-134 from trunk. Fixes ClientToAMSecretManager creates keys without checking for validity of the appID. (Contributed by Vinod Kumar Vavilapalli)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395843 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 01:58:07 +00:00
59da1ac1fc
YARN-127. Move RMAdmin tool to its correct location - the client module. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1395781 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395782 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 21:24:37 +00:00
ae68ae6919
YARN-23. FairScheduler: FSQueueSchedulable#updateDemand() - potential redundant aggregation. (kkambatl via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1394322 13f79535-47bb-0310-9956-ffa450edef68
2012-10-04 23:02:28 +00:00
60a5f6b520
merge YARN-102 from trunk. Move the apache header to the top of the file in MemStore.java. (Contributed by Devaraj K)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393771 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 21:20:10 +00:00
9f3f66375e
merge YARN-131 from trunk. Fix incorrect ACL properties in capacity scheduler documentation. (Contributed by Ahmed Radwan)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1393263 13f79535-47bb-0310-9956-ffa450edef68
2012-10-03 02:57:25 +00:00
41aa8aeb07
Merge -c 1391944 from trunk to branch-2 to fix YARN-138. Ensure default values for minimum/maximum container sizes is sane. Contributed by Harsh J and Siddharth Seth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391945 13f79535-47bb-0310-9956-ffa450edef68
2012-09-30 03:46:51 +00:00
7418b5f357
Merge -c 1391929 from trunk to branch-2 to fix YARN-137. Change the default YARN scheduler to be the CapacityScheduler. Contributed by Siddharth Seth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391930 13f79535-47bb-0310-9956-ffa450edef68
2012-09-30 00:44:15 +00:00
060e4f256d
merge YARN-116 from trunk. Add the ability to change the RM include/exclude file without a restart. (Contributed by xieguiming and Harsh J)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391913 13f79535-47bb-0310-9956-ffa450edef68
2012-09-29 22:40:58 +00:00
b2db4b2917
svn merge -c 1391649 FIXES: YARN-106. Nodemanager needs to set permissions of local directories (jlowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391651 13f79535-47bb-0310-9956-ffa450edef68
2012-09-28 20:53:14 +00:00
aa94aea3c2
svn merge -c 1382072 FIXES: YARN-57. Allow process-tree based resource calculation et al. to be pluggable to support it on multiple platforms. Contributed by Radim Kolar.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1391094 13f79535-47bb-0310-9956-ffa450edef68
2012-09-27 16:38:54 +00:00
f1749af465
Fix NodeManager to verify the application's user-name
...
svn merge --ignore-ancestry -c 1390825 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390826 13f79535-47bb-0310-9956-ffa450edef68
2012-09-27 03:45:05 +00:00
e5e1887092
merge -r 1390556:1390557 from trunk. FIXES: MAPREDUCE-4647
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390563 13f79535-47bb-0310-9956-ffa450edef68
2012-09-26 15:25:05 +00:00
c51c5c1297
Merge -c 1390218 from trunk to branch-2 to fix YARN-9. Rename YARN_HOME to HADOOP_YARN_HOME. Contributed by Vinod K V.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1390219 13f79535-47bb-0310-9956-ffa450edef68
2012-09-25 23:40:14 +00:00
e7b414289c
YARN-53. Added the missing getGroups API to ResourceManager. Contributed by Bo Wang.
...
svn merge --ignore-ancestry -c 1389176 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1389177 13f79535-47bb-0310-9956-ffa450edef68
2012-09-24 00:52:55 +00:00
4212596dc6
merge YARN-88 from trunk. DefaultContainerExecutor can fail to set proper permissions. (Contributed by Jason Lowe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1388583 13f79535-47bb-0310-9956-ffa450edef68
2012-09-21 17:36:18 +00:00
1415f8490d
YARN-93. Fixed RM to propagate diagnostics from applications that have finished but failed Contributed by Jason Lowe.
...
svn merge --ignore-ancestry -c 1384169 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1384170 13f79535-47bb-0310-9956-ffa450edef68
2012-09-13 00:47:54 +00:00
f403be7569
Set version in branch-2 to 2.0.3-SNAPSHOT
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1382809 13f79535-47bb-0310-9956-ffa450edef68
2012-09-10 12:57:48 +00:00
69d9fa75bc
Merge -c r1381868 from trunk to branch-2 to fix YARN-80. Add support for delaying rack-local containers in CapacityScheduler. Contributed by Arun C. Murthy.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381873 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 05:11:46 +00:00
3f22ec2960
YARN-75. Fixing spurious patch apply.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381822 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 00:29:26 +00:00
445a340593
YARN-75. Modified ResourceManager's RMContainer to handle a valid RELEASE event at RUNNING state. Contributed by Siddharth Seth.
...
svn merge -r 1381806:1381809 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381816 13f79535-47bb-0310-9956-ffa450edef68
2012-09-07 00:21:36 +00:00
4b9c47375d
merge -r 1381458:1381459 from trunk. FIXES: YARN-87
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381460 13f79535-47bb-0310-9956-ffa450edef68
2012-09-06 02:11:00 +00:00
36a45e3995
svn merge -c 1381317 FIXES: YARN-68. NodeManager will refuse to shutdown indefinitely due to container log aggregation (daryn via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381318 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 19:41:21 +00:00
dad420c609
YARN-42. Modify NM's non-aggregating logs' handler to stop properly so that NMs don't get NPEs on startup errors. Contributed by Devaraj K.
...
svn merge --ignore-ancestry -c 1380954 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1380955 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 02:47:02 +00:00
cde65024a2
YARN-60: Fix minor merge conflict (bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379558 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 19:28:21 +00:00
bbfbbf31c8
YARN-60. Fixed a bug in ResourceManager which causes all NMs to get NPEs and thus causes all containers to be rejected. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1379550 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379551 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 19:12:57 +00:00
7287665955
svn merge -c 1379498. FIXES: YARN-63. RMNodeImpl is missing valid transitions from the UNHEALTHY state (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1379500 13f79535-47bb-0310-9956-ffa450edef68
2012-08-31 16:34:33 +00:00
57c4f237e2
YARN-31. Fix TestDelegationTokenRenewer to not depend on test order so as to pass tests on jdk7. Contributed by Thomas Graves.
...
svn merge --ignore-ancestry -c 1377961 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377963 13f79535-47bb-0310-9956-ffa450edef68
2012-08-28 03:33:20 +00:00
d2b4457eaf
merge YARN-37 from trunk. Change TestRMAppTransitions to use the DrainDispatcher. (Contributed by Mayank Bansal)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377805 13f79535-47bb-0310-9956-ffa450edef68
2012-08-27 19:38:24 +00:00
bf08346d3c
merge YARN-39 from trunk. RM-NM secret-keys should be randomly generated and rolled every so often. (Contributed by Vinod Kumar Vavilapalli and Siddharth Seth)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377181 13f79535-47bb-0310-9956-ffa450edef68
2012-08-25 02:25:12 +00:00
6b62c018e3
MAPREDUCE-2374. "Text File Busy" errors launching MR tasks. Contributed by Andy Isaacson.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1376634 13f79535-47bb-0310-9956-ffa450edef68
2012-08-23 18:25:10 +00:00
d5190bbe00
merge YARN-22 from trunk. Fix ContainerLogs to work if the log-dir is specified as a URI. (Contributed by Mayank Bansal)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375831 13f79535-47bb-0310-9956-ffa450edef68
2012-08-21 22:28:58 +00:00
9f82b74cbe
svn merge -c 1375164 from trunk FIXES: MAPREDUCE-4323. NM leaks filesystems (Jason Lowe via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375178 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 19:32:11 +00:00
d6c75fbbb1
merge -r 1375082:1375083 from trunk. FIXES: YARN-27
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375084 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 16:06:25 +00:00
8a5ab9229d
merge -r 1375065:1375066 from trunk. FIXES: YARN-27
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1375067 13f79535-47bb-0310-9956-ffa450edef68
2012-08-20 15:37:43 +00:00
fa76c71e62
svn merge -c 1374696 from trunk for HADOOP-8240. Add a new API to allow users to specify a checksum type on FileSystem.create(..).
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374697 13f79535-47bb-0310-9956-ffa450edef68
2012-08-19 05:51:37 +00:00
e94632c765
merge -r 1374423:1374424 from trunk. FIXES: YARN-25
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1374425 13f79535-47bb-0310-9956-ffa450edef68
2012-08-17 20:31:09 +00:00
b344870bdd
HADOOP-8681. add support for HTTPS to the web UIs. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1372642 13f79535-47bb-0310-9956-ffa450edef68
2012-08-13 21:56:31 +00:00
ced2087998
HADOOP-8659. Native libraries must build with soft-float ABI for Oracle JVM on ARM. Contributed by Trevor Robinson.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1371508 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 21:58:29 +00:00
2b97a4cce4
svn merge -c 1371390 FIXES: YARN-14. Symlinks to peer distributed cache files no longer work (Jason Lowe via bobby)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1371395 13f79535-47bb-0310-9956-ffa450edef68
2012-08-09 19:18:37 +00:00
3960c66081
YARN-13. Fix pom versions for YARN in branch-2. Contributed by Todd Lipcon.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370933 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 20:12:38 +00:00
9337abd0b0
Merge -c 1370889 from trunk to branch-2 to fix YARN-12. Fix findbugs warnings in FairScheduler. Contributed by Junping Du.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370890 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 18:54:26 +00:00
92a99de731
Merge -c 1370666 from trunk to branch-2 to fix YARN-1. Promote YARN to be a sub-project of Apache Hadoop.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1370667 13f79535-47bb-0310-9956-ffa450edef68
2012-08-08 05:33:56 +00:00
Sanford Ryza
Jason Darrell Lowe
Vinod Kumar Vavilapalli
Arun Murthy
Alejandro Abdelnur
Bikas Saha
Hitesh Shah
Jonathan Turner Eagles
Siddharth Seth
Christopher Douglas
Chris Nauroth
Thomas Graves
Luke Lu
Tsz-wo Sze
Kihwal Lee
Konstantin Boudnik
Suresh Srinivas
Robert Joseph Evans
Thomas White
Daryn Sharp
Todd Lipcon
Aaron Myers