Commit Graph

89 Commits

Author SHA1 Message Date
Vinod Kumar Vavilapalli 5f20c37919 YARN-635. Renamed YarnRemoteException to YarnException. Contributed by Siddharth Seth.
MAPREDUCE-5301. Updated MR code to work with YARN-635 changes of renaming YarnRemoteException to YarnException. Contributed by Siddharth Seth.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1489288 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 04:50:16 +00:00
Konstantin Boudnik 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
Bikas Saha 395afc7b94 Merge r1488485 from trunk for YARN-660. Improve AMRMClient with matching requests (bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488487 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 08:31:50 +00:00
Siddharth Seth 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
Siddharth Seth 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
Vinod Kumar Vavilapalli 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
Suresh Srinivas 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
Suresh Srinivas 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
Suresh Srinivas 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
Suresh Srinivas 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
Siddharth Seth 9bd8b0c4f1 merge YARN-716 from trunk. Fixed unit test failures - TestDistributedShell and TestUnmanagedAMLauncher. Contributed by Vinod Kumar Vavilapalli.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1485580 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 05:49:07 +00:00
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
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 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 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
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 ab3c4b7e68 Merge -c 1460954 from trunk to branch-2 for YARN-498. Unmanaged AM launcher does not set various constants in env for an AM, also does not handle failed AMs properly (Hitesh Shah via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460955 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 02:37:17 +00:00
Bikas Saha 6d784e9be0 merge -c r1460846 from trunk to branch-2 for YARN-497. Yarn unmanaged-am launcher jar does not define a main class in its manifest (Hitesh Shah via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460847 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 18:59:05 +00:00
Bikas Saha 67250d7a00 merge -c r1460064 from trunk to branch-2 for YARN-417. Addendum patch (Sandy Ryza via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1460065 13f79535-47bb-0310-9956-ffa450edef68
2013-03-23 00:11:04 +00:00
Bikas Saha 4b1556e846 merge -c r1459555 from trunk to branch-2 for YARN-417. Create AMRMClient wrapper that provides asynchronous callbacks. (Sandy Ryza via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1459557 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 22:30:10 +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
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 60230692dc merge -c 1437156 from trunk to branch-2 to fix YARN-277. Use AMRMClient in DistributedShell to exemplify the approach. Contriubed by Bikas Saha
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1437159 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 20:53:47 +00:00
Thomas White db8545d924 Merge -r 1411234:1411235 from trunk to branch-2. Fixes: YARN-129. Simplify classpath construction for mini YARN tests.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1411239 13f79535-47bb-0310-9956-ffa450edef68
2012-11-19 15:16:57 +00:00
Siddharth Seth 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
Vinod Kumar Vavilapalli 011046e778 YARN-94. Modify DistributedShell to point to main-class by default, clean up the help message, and hard-code the AM class. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1396226 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1396253 13f79535-47bb-0310-9956-ffa450edef68
2012-10-09 19:56:32 +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
Vinod Kumar Vavilapalli ddf8691f03 YARN-78. Changed UnManagedAM application to use YarnClient. Contributed by Bikas Saha.
svn merge --ignore-ancestry -c 1383705 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1383706 13f79535-47bb-0310-9956-ffa450edef68
2012-09-12 00:50:25 +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 e7082c371b YARN-83. Change package of YarnClient to org.apache.hadoop. Contributed by Bikas Saha.
svn merge --ignore-ancestry -c 1381273 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1381275 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 17:55:53 +00:00
Vinod Kumar Vavilapalli 8d66c65130 YARN-10. Fix DistributedShell module to not have a dependency on hadoomapreduce-client-core. Contributed by Hitesh Shah.
svn merge --ignore-ancestry -c 1380879 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1380887 13f79535-47bb-0310-9956-ffa450edef68
2012-09-04 21:01:58 +00:00
Siddharth Seth 00874120d2 merge YARN-29 from trunk. Add a yarn-client module. (Contributed by Vinod Kumar Vavilapalli)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377782 13f79535-47bb-0310-9956-ffa450edef68
2012-08-27 18:30:42 +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