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
Vinod Kumar Vavilapalli
Arun Murthy
Alejandro Abdelnur
Siddharth Seth
Konstantin Boudnik
Jason Darrell Lowe
Suresh Srinivas
Robert Joseph Evans
Christopher Douglas
Thomas White
Bikas Saha
Thomas Graves