Commit Graph

697 Commits

Author SHA1 Message Date
Vinod Kumar Vavilapalli 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
Christopher Douglas e8585afa03 YARN-45. Add protocol for schedulers to request containers back from
ApplicationMasters. Contributed by Carlo Curino and Chris Douglas.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479773 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 06:18:25 +00:00
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli c114469fbd YARN-633. Changed RMAdminProtocol api to throw IOException and YarnRemoteException. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1479738 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1479739 13f79535-47bb-0310-9956-ffa450edef68
2013-05-07 00:38:57 +00:00
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Siddharth Seth 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
Vinod Kumar Vavilapalli 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
Bikas Saha 778b64e29f Merge -c r1470797 from trunk to branch-2 for YARN-549. YarnClient.submitApplication should wait for application to be accepted by the RM (Zhijie Shen via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470798 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 03:12:54 +00:00
Vinod Kumar Vavilapalli 6c37becf87 YARN-586. Fixed a typo in ApplicationSubmissionContext#setApplicationId. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1470068 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1470069 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 22:25:53 +00:00
Vinod Kumar Vavilapalli 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
Bikas Saha 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Arun Murthy 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli db7b5e12d0 YARN-475. Remove a unused constant in the public API - ApplicationConstants.AM_APP_ATTEMPT_ID_ENV. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1463033 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1463034 13f79535-47bb-0310-9956-ffa450edef68
2013-03-31 19:18:42 +00:00
Bikas Saha 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
Vinod Kumar Vavilapalli 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
Hitesh Shah b53ed760a0 merge -c 1459054 from trunk to branch-2 to fix YARN-297. Improve hashCode implementations for PB records. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459055 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 21:11:16 +00:00
Hitesh Shah 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
Alejandro Abdelnur 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
Siddharth Seth 41c3449751 merge YARN-385 from trunk. Add missing fields - location and #containers to ResourceRequestPBImpl's toString(). Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443704 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 20:29:15 +00:00
Arun Murthy 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
Hitesh Shah 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
Siddharth Seth 5048687d5e merge YARN-135 commit amendment from trunk. Add missing files from previous commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433598 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 19:31:08 +00:00
Siddharth Seth 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
Suresh Srinivas ead0693d68 YARN-328. Merge r1433231 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1433233 13f79535-47bb-0310-9956-ffa450edef68
2013-01-15 00:22:56 +00:00
Arun Murthy 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 29a34c16a6 YARN-217. Fix RMAdmin protocol description to make it work in secure mode also. Contributed by Devaraj K.
svn merge --ignore-ancestry -c 1429683 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1429684 13f79535-47bb-0310-9956-ffa450edef68
2013-01-07 06:37:30 +00:00
Thomas Graves 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
Thomas White c77f41224d Merge -r 1428780:1428781 from trunk to branch-2. Fixes: YARN-286. Add a YARN ApplicationClassLoader.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428782 13f79535-47bb-0310-9956-ffa450edef68
2013-01-04 11:02:51 +00:00
Alejandro Abdelnur 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
Arun Murthy 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
Siddharth Seth 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
Vinod Kumar Vavilapalli 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
Arun Murthy 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
Thomas Graves 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
Arun Murthy 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
Arun Murthy 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
Vinod Kumar Vavilapalli 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
Todd Lipcon 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
Arun Murthy 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