Jian He
9df6ddd282
Merge r1586522 from trunk. YARN-1903. Set exit code and diagnostics when container is killed at NEW/LOCALIZING state. Contributed by Zhijie Shen
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586523 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 01:28:22 +00:00
Arun Murthy
243bb224a2
Merge -c 1584954 from trunk to branch-2 to fix YARN-1898. Addendum patch to ensure /jmx and /metrics are re-directed to Active RM.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584955 13f79535-47bb-0310-9956-ffa450edef68
2014-04-05 02:52:35 +00:00
Zhijie Shen
d5f1c9a044
YARN-1898. Made Standby RM links conf, stacks, logLevel, metrics, jmx, logs and static not be redirected to Active RM. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1583833 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583835 13f79535-47bb-0310-9956-ffa450edef68
2014-04-02 00:05:15 +00:00
Jian He
39871241a0
Merge r1583203 from trunk. YARN-1893. Mark AtMostOnce annotation to ApplicationMasterProtocol#allocate. Contributed by Xuan Gong
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583205 13f79535-47bb-0310-9956-ffa450edef68
2014-03-30 21:38:27 +00:00
Jian He
859f27040d
Merge r1581678 from trunk. YARN-1521. Mark Idempotent/AtMostOnce annotations to the APIs in ApplicationClientProtcol, ResourceManagerAdministrationProtocol and ResourceTrackerProtocol so that they work in HA scenario. Contributed by Xuan Gong
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581679 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 03:48:46 +00:00
Vinod Kumar Vavilapalli
45d6277ec2
YARN-1850. Introduced the ability to optionally disable sending out timeline-events in the TimelineClient. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1581189 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581190 13f79535-47bb-0310-9956-ffa450edef68
2014-03-25 02:23:08 +00:00
Vinod Kumar Vavilapalli
b51df9d67d
YARN-1863. Fixed test failure in TestRMFailover after YARN-1859. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1580094 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580095 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 00:25:51 +00:00
Vinod Kumar Vavilapalli
80f3726024
YARN-1839. Fixed handling of NMTokens in ResourceManager such that containers launched by AMs running on the same machine as the AM are correctly propagated. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1578631 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578632 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 22:22:58 +00:00
Jonathan Turner Eagles
8e38068076
YARN-1136. Replace junit.framework.Assert with org.junit.Assert (Chen He via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578546 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 20:20:22 +00:00
Vinod Kumar Vavilapalli
3ac3e5f897
YARN-1658. Modified web-app framework to let standby RMs redirect web-service calls to the active RM. Contributed by Cindy Li.
...
svn merge --ignore-ancestry -c 1577408 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577409 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 02:40:28 +00:00
Zhijie Shen
7834c7f193
YARN-1389. Made ApplicationClientProtocol and ApplicationHistoryProtocol expose analogous getApplication(s)/Attempt(s)/Container(s) APIs. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1577052 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577053 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 07:45:30 +00:00
Vinod Kumar Vavilapalli
cbe653f9a2
YARN-1764. Modified YarnClient to correctly handle failover of ResourceManager after the submitApplication call goes through. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1576160 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576162 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 00:52:33 +00:00
Vinod Kumar Vavilapalli
fca260d0db
YARN-1787. Fixed help messages for applicationattempt and container sub-commands in bin/yarn. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1575482 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575483 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 04:50:20 +00:00
Vinod Kumar Vavilapalli
71a8953ae9
YARN-1410. Added tests to validate that clients can fail-over to a new RM
...
after getting an application-ID but before submission and can still submit
to the newly active RM with no issues. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1575478 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575479 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 04:44:02 +00:00
Karthik Kambatla
09671ddb46
YARN-1525. Web UI should redirect to active RM when HA is enabled. (Cindy Li via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575167 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 04:35:01 +00:00
Vinod Kumar Vavilapalli
f70da813f0
YARN-1780. Improved logging in the Timeline client and server. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1575141 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575145 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 03:53:31 +00:00
Vinod Kumar Vavilapalli
4bdb4a9b16
YARN-1761. Modified RMAdmin CLI to check whether HA is enabled or not before it executes any of the HA admin related commands. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1574661 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574662 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 21:08:20 +00:00
Ravi Prakash
b5e010ca0d
YARN-1768. Fixed error message being too verbose when killing a non-existent application. Contributed by Tsuyoshi Ozawa
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574403 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 09:45:28 +00:00
Vinod Kumar Vavilapalli
7c17cff55c
YARN-986. Changed client side to be able to figure out the right RM Delegation token for the right ResourceManager when HA is enabled. Contributed by Karthik Kambatla.
...
svn merge --ignore-ancestry -c 1574190 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574191 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 20:39:33 +00:00
Vinod Kumar Vavilapalli
3406b14755
YARN-1588. Enhanced RM and the scheduling protocol to also send NMTokens of transferred containers from previous app-attempts to new AMs after YARN-1490. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1572230 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572232 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 20:20:39 +00:00
Vinod Kumar Vavilapalli
ece585643c
YARN-1749. Updated application-history related configs to reflect the latest reality and to be consistently named. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1570948 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570949 13f79535-47bb-0310-9956-ffa450edef68
2014-02-23 02:05:28 +00:00
Vinod Kumar Vavilapalli
507ddad47f
YARN-1687. Renamed user-facing records for the timeline-service to be simply named after 'timeline' instead of 'apptimeline'. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1570922 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570924 13f79535-47bb-0310-9956-ffa450edef68
2014-02-22 20:55:42 +00:00
Arun Murthy
1ccccb8534
Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569186 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 04:41:01 +00:00
Vinod Kumar Vavilapalli
7e252cdc9d
YARN-1553. Modified YARN and MR to stop using HttpConfig.isSecure() and
...
instead rely on the http policy framework. And also fix some bugs related
to https handling in YARN web-apps. Contributed by Haohui Mai.
svn merge --ignore-ancestry -c 1568501 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568503 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 20:01:32 +00:00
Sanford Ryza
cf75df69f2
YARN-1497. Fix comment and remove accidental println
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567491 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 01:46:27 +00:00
Sanford Ryza
4032e147e8
YARN-1497. Command line additions for moving apps between queues (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567485 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 01:22:02 +00:00
Zhijie Shen
f181cf0a3b
YARN-1637. Implemented a client library for Java users to post timeline entities and events. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1566752 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1566753 13f79535-47bb-0310-9956-ffa450edef68
2014-02-10 21:33:41 +00:00
Vinod Kumar Vavilapalli
c16df11991
YARN-1665. Simplify the configuration of RM HA by having better default values. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1565517 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565518 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 02:40:02 +00:00
Vinod Kumar Vavilapalli
d349a29b7e
YARN-1673. Fix option parsing in YARN's application CLI after it is broken by YARN-967. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1564188 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564189 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 04:08:51 +00:00
Sanford Ryza
a01eba048b
YARN-1630. Introduce timeout for async polling operations in YarnClientImpl (Aditya Acharya via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562290 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 22:30:45 +00:00
Vinod Kumar Vavilapalli
1c8e403fdd
YARN-1605. Fixed formatting issues in the new module on branch YARN-321. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1559004 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562219 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:19:53 +00:00
Vinod Kumar Vavilapalli
4a3b6b7367
YARN-1595. Made enabling history service configurable and fixed test failures on branch YARN-321. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1559001 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562218 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:18:42 +00:00
Vinod Kumar Vavilapalli
ff83e97655
YARN-1596. Fixed Javadoc warnings on branch YARN-321. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1557957 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562215 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:14:54 +00:00
Vinod Kumar Vavilapalli
b7a3d0ae93
YARN-967. Added the client and CLI interfaces for obtaining ApplicationHistory data. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1556747 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562202 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:00:38 +00:00
Karthik Kambatla
1561f56b30
YARN-1598. HA-related rmadmin commands don't work on a secure cluster (kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558253 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 01:00:19 +00:00
Vinod Kumar Vavilapalli
f35f702426
YARN-888. Cleaned up POM files so that non-leaf modules don't include any dependencies and thus compact the dependency list for leaf modules. Contributed by Alejandro Abdelnur.
...
svn merge --ignore-ancestry -c 1557801 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557802 13f79535-47bb-0310-9956-ffa450edef68
2014-01-13 18:34:39 +00:00
Vinod Kumar Vavilapalli
c15f25363b
YARN-1482. Modified WebApplicationProxy to make it work across ResourceManager fail-over. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1556380 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556381 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 22:17:00 +00:00
Vinod Kumar Vavilapalli
9b38eb2c2e
YARN-1029. Added embedded leader election in the ResourceManager. Contributed by Karthik Kambatla.
...
svn merge --ignore-ancestry -c 1556103 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556105 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 01:56:56 +00:00
Jian He
0d0ccfd7c1
Merge r1555975 from trunk. YARN-1560. Fixed TestYarnClient#testAMMRTokens failure with null AMRM token. (Contributed by Ted Yu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1555977 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 19:03:43 +00:00
Karthik Kambatla
db2afa8bae
YARN-1559. Race between ServerRMProxy and ClientRMProxy setting RMProxy#INSTANCE. (kasha and vinodkv via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1555971 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 18:43:09 +00:00
Jian He
59df96e4e3
Merge r1553596 from trunk. Fixed yarn rmadmin command to print the correct usage info. Contributed by Akira AJISAKA.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553597 13f79535-47bb-0310-9956-ffa450edef68
2013-12-26 22:15:41 +00:00
Karthik Kambatla
2dc61dea3c
YARN-1028. Addendum patch. Added FailoverProxyProvider capability to ResourceManager to help with RM failover.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552921 13f79535-47bb-0310-9956-ffa450edef68
2013-12-21 16:30:06 +00:00
Vinod Kumar Vavilapalli
237310d89a
YARN-1028. Added FailoverProxyProvider capability to ResourceManager to help with RM failover. Contributed by Karthik Kambatla.
...
svn merge --ignore-ancestry -c 1551739 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551740 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 22:33:16 +00:00
Vinod Kumar Vavilapalli
4aeef4181d
YARN-1446. Changed client API to retry killing application till RM acknowledges so as to account for RM crashes/failover. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1551444 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551445 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 02:16:59 +00:00
Vinod Kumar Vavilapalli
e3f9b1457e
YARN-312. Introduced ResourceManagerAdministrationProtocol changes to support changing resources on node. Contributed by Junping Du.
...
svn merge --ignore-ancestry -c 1551403 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551404 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 23:38:25 +00:00
Sanford Ryza
cf465c26a8
YARN-1332. In TestAMRMClient, replace assertTrue with assertEquals where possible (Sebastian Wong via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547642 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 23:23:49 +00:00
Arun Murthy
439a690ad1
Setting version to 2.4.0-SNAPSHOT in branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547165 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 19:40:42 +00:00
Sanford Ryza
3c0ad2500d
YARN-1381. Same relaxLocality appears twice in exception message of AMRMClientImpl#checkLocalityRelaxationConflict() (Ted Yu via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537636 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 20:53:56 +00:00
Vinod Kumar Vavilapalli
924f0429b7
YARN-1321. Changed NMTokenCache to support both singleton and an instance usage. Contributed by Alejandro Abdelnur.
...
svn merge --ignore-ancestry -c 1537334 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537335 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 22:38:38 +00:00
Chris Nauroth
bbda888b57
YARN-1358. Merging change r1537305 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537307 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 21:16:13 +00:00
Bikas Saha
330ada83eb
Merge r1536888 from trunk to branch-2 for YARN-1068. Add admin support for HA operations (Karthik Kambatla via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536899 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 21:21:06 +00:00
Bikas Saha
eab6a16ce6
Merge r1536248 from trunk to branch-2 for YARN-1022. Unnecessary INFO logs in AMRMClientAsync (haosdent via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536250 13f79535-47bb-0310-9956-ffa450edef68
2013-10-28 04:51:23 +00:00
Jonathan Turner Eagles
d93e30e3a2
HADOOP-9598. Improve code coverage of RMAdminCLI (Aleksey Gorshkov and Andrey Klochkov via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534906 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 04:15:16 +00:00
Vinod Kumar Vavilapalli
c2cc6b6c4f
YARN-1167. Fixed Distributed Shell to not incorrectly show empty hostname on RM UI. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1529376 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529377 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 01:44:46 +00:00
Bikas Saha
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
Hitesh Shah
2cc1005b92
Merge 1529068 from trunk to branch-2 for YARN-1131. logs command should return an appropriate error message if YARN application is still running. Contributed by Siddharth Seth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529069 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 02:38:17 +00:00
Hitesh Shah
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
Jonathan Turner Eagles
ffe45a5129
YARN-425. coverage fix for yarn api (Aleksey Gorshkov via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528644 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 21:57:00 +00:00
Colin McCabe
fa2a3c94f2
HADOOP-9998. Provide methods to clear only part of the DNSToSwitchMapping. (Junping Du via Colin Patrick McCabe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526568 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 15:24:40 +00:00
Hitesh Shah
d437cfb16d
Merge r1526330 from trunk to branch-2 for YARN-49. Improve distributed shell application to work on a secure cluster. Contributed by Vinod Kumar Vavilapalli.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526332 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 23:41:05 +00:00
Bikas Saha
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
Vinod Kumar Vavilapalli
d32a81d55c
YARN-1124. Modified YARN CLI application list to display new and submitted applications together with running apps by default, following up YARN-1074. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1519869 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519871 13f79535-47bb-0310-9956-ffa450edef68
2013-09-03 22:19:17 +00:00
Vinod Kumar Vavilapalli
3fea164bb1
YARN-1117. Improved help messages for "yarn application" and "yarn node" commands. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1519117 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519118 13f79535-47bb-0310-9956-ffa450edef68
2013-08-30 23:26:36 +00:00
Bikas Saha
148db9d4f5
Merge 1519107. from trunk to branch-2 for YARN-771. AMRMClient support for resource blacklisting (Junping Du via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519112 13f79535-47bb-0310-9956-ffa450edef68
2013-08-30 23:03:44 +00:00
Vinod Kumar Vavilapalli
bc70667ae1
YARN-1081. Made a trivial change to YARN node CLI header to avoid potential confusion. Contributed by Akira AJISAKA.
...
svn merge --ignore-ancestry -c 1518080 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518081 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 05:46:57 +00:00
Vinod Kumar Vavilapalli
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
Sanford Ryza
3fe608f611
YARN-905. Add state filters to nodes CLI (Wei Yan via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517087 13f79535-47bb-0310-9956-ffa450edef68
2013-08-23 22:58:30 +00:00
Vinod Kumar Vavilapalli
e470be4429
YARN-107. Fixed ResourceManager and clients to better handle forceKillApplication on non-running and finished applications. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1514918 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1514919 13f79535-47bb-0310-9956-ffa450edef68
2013-08-16 23:01:38 +00:00
Bikas Saha
299b910a01
Merging r1510070 from trunk to branch-2 for YARN-994. HeartBeat thread in AMRMClientAsync does not handle runtime exception correctly (Xuan Gong via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1510071 13f79535-47bb-0310-9956-ffa450edef68
2013-08-03 22:38:58 +00:00
Vinod Kumar Vavilapalli
9b05d132bf
YARN-906. Fixed a bug in NodeManager where cancelling ContainerLaunch at KILLING state causes that the container to hang. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1509924 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1509925 13f79535-47bb-0310-9956-ffa450edef68
2013-08-03 00:49:32 +00:00
Vinod Kumar Vavilapalli
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
Luke Lu
79fa2c5e79
YARN-347. Node CLI should show CPU info besides memory in node status. (Junping Du via llu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507958 13f79535-47bb-0310-9956-ffa450edef68
2013-07-29 07:31:40 +00:00
Alejandro Abdelnur
126337bba6
YARN-937. Fix unmanaged AM in non-secure/secure setup post YARN-701. (tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1507708 13f79535-47bb-0310-9956-ffa450edef68
2013-07-27 20:08:59 +00:00
Bikas Saha
5f64166ba3
Merge r1506750 from trunk to branch-2 for YARN-875. Application can hang if AMRMClientAsync callback thread has exception (Xuan Gong via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506752 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 22:16:37 +00:00
Bikas Saha
34a1610282
YARN-873. Merge r1506732 from trunk to branch-2 for YARNClient.getApplicationReport(unknownAppId) returns a null report (Xuan Gong via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506736 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 21:42:50 +00:00
Vinod Kumar Vavilapalli
f487f4eb19
YARN-926. Modified ContainerManagerProtcol APIs to take in requests for multiple containers. Contributed by Jian He.
...
MAPREDUCE-5412. Update MR app to use multiple containers API of ContainerManager after YARN-926. Contributed by Jian He.
svn merge --ignore-ancestry -c 1506391 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1506392 13f79535-47bb-0310-9956-ffa450edef68
2013-07-24 03:42:52 +00:00
Arun Murthy
83c776c85d
Set version in branch-2 to 2.3.0-SNAPSHOT to reflect that we will only be adding new content to hadoop-2.3.0 and not hadoop-2.2.0.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504744 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 01:35:34 +00:00
Arun Murthy
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
Arun Murthy
d82a3cd227
Merge -c from trunk to branch-2 to fix YARN-701. Use application tokens irrespective of secure or non-secure mode. Contributed by Vinod K V.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1504605 13f79535-47bb-0310-9956-ffa450edef68
2013-07-18 19:04:37 +00:00
Bikas Saha
ace3a40b23
Merge r1503960 from trunk to branch-2 for YARN-927. Change ContainerRequest to not have more than 1 container count and remove StoreContainerRequest (bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503965 13f79535-47bb-0310-9956-ffa450edef68
2013-07-17 01:01:03 +00:00
Bikas Saha
3990e8b478
Merge r1503933 from trunk to branch-2 for YARN-513. Create common proxy client for communicating with RM (Xuan Gong & Jian He via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503935 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 22:54:55 +00:00
Bikas Saha
0055e40226
Trivial fix for minor refactor error for YARN-521
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503922 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 22:15:47 +00:00
Bikas Saha
644b6a54ad
Merge r1503526 from trunk to branch-2 for YARN-521. Augment AM - RM client module to be able to request containers only at specific locations (Sandy Ryza via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503527 13f79535-47bb-0310-9956-ffa450edef68
2013-07-16 00:28:29 +00:00
Bikas Saha
dc8ad1213b
Merge r1503353 from trunk to branch-2 for YARN-654. AMRMClient: Perform sanity checks for parameters of public methods (Xuan Gong via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1503354 13f79535-47bb-0310-9956-ffa450edef68
2013-07-15 17:18:47 +00:00
Bikas Saha
469e65c3aa
Merge r1502914 from trunk to branch-2 for YARN-763. AMRMClientAsync should stop heartbeating after receiving shutdown from RM (Xuan Gong via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502916 13f79535-47bb-0310-9956-ffa450edef68
2013-07-13 23:38:27 +00:00
Bikas Saha
c1b0106711
Merge r1502906 from trunk to branch-2 for YARN-541. getAllocatedContainers() is not returning all the allocated containers (bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1502907 13f79535-47bb-0310-9956-ffa450edef68
2013-07-13 22:42:47 +00:00
Hitesh Shah
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
Vinod Kumar Vavilapalli
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
Arun Murthy
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
Vinod Kumar Vavilapalli
34dfd27833
YARN-851. Share NMTokens using NMTokenCache (api-based) between AMRMClient and NMClient instead of memory based approach which is used currently. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1495247 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1495248 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 00:09:45 +00:00
Arun Murthy
6f790ac7ad
Merge -c 1494476 from trunk to branch-2 to fix YARN-553. Replaced YarnClient.getNewApplication with YarnClient.createApplication which provides a directly usable ApplicationSubmissionContext to simplify the api. Contributed by Karthik Kambatla.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494477 13f79535-47bb-0310-9956-ffa450edef68
2013-06-19 07:07:44 +00:00
Vinod Kumar Vavilapalli
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
Bikas Saha
68d97a6aac
Merge r1494309 from trunk to branch-2 for YARN-850. Rename getClusterAvailableResources to getAvailableResources in AMRMClients (Jian He via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494311 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 21:22:48 +00:00
Vinod Kumar Vavilapalli
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
Arun Murthy
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
Vinod Kumar Vavilapalli
8e9a719712
YARN-834. Fixed annotations for yarn-client module, reorganized packages and clearly differentiated *Async apis. Contributed by Arun C Murthy and Zhijie Shen.
...
svn merge --ignore-ancestry -c 1494017 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1494018 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 04:03:43 +00:00
Siddharth Seth
5e257b8925
merge YARN-805 from trunk. Fix javadoc and annotations on classes in the yarn-api package. Contributed by Jian He.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493993 13f79535-47bb-0310-9956-ffa450edef68
2013-06-18 03:14:38 +00:00
Vinod Kumar Vavilapalli
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
Arun Murthy
bb43d35c90
Merge -c 1493631 from trunk to branch-2 to fix YARN-824. Added static factory methods to hadoop-yarn-client interfaces. Contributed by Jian He.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493632 13f79535-47bb-0310-9956-ffa450edef68
2013-06-17 03:20:22 +00:00
Arun Murthy
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
Alejandro Abdelnur
1d116f7178
YARN-752. In AMRMClient, automatically add corresponding rack requests for requested nodes. (sandyr via tucu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493601 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 22:18:30 +00:00
Vinod Kumar Vavilapalli
19bf81198e
YARN-823. Moved RMAdmin from yarn.client to yarn.client.cli and renamed it to be RMAdminCLI. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1493596 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1493597 13f79535-47bb-0310-9956-ffa450edef68
2013-06-16 21:43:27 +00:00
Vinod Kumar Vavilapalli
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
Vinod Kumar Vavilapalli
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
Vinod Kumar Vavilapalli
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
Vinod Kumar Vavilapalli
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
Alejandro Abdelnur
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
Bikas Saha
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
Bikas Saha
99aff64f1a
Merge r1490437 from trunk to branch-2 for YARN-761. TestNMClientAsync fails sometimes (Zhijie Shen via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1490440 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 20:55:02 +00:00
Bikas Saha
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
Arun Murthy
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
Vinod Kumar Vavilapalli
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
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
Vinod Kumar Vavilapalli
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
Arun Murthy
62ab1db78b
Merge -c 1488840 from trunk to branch-2 to fix YARN-730. Fix NMClientAsync to remove completed containers. Contributed by Zhijie Shen.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488841 13f79535-47bb-0310-9956-ffa450edef68
2013-06-03 04:12:45 +00:00
Vinod Kumar Vavilapalli
404b3896c9
YARN-733. Fixed TestNMClient from failing occasionally. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1488618 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488619 13f79535-47bb-0310-9956-ffa450edef68
2013-06-01 22:02:44 +00:00
Vinod Kumar Vavilapalli
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
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
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
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
Siddharth Seth
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
Vinod Kumar Vavilapalli
604fe963fd
YARN-422. Add a NM Client library to help application-writers. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1487184 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487187 13f79535-47bb-0310-9956-ffa450edef68
2013-05-29 01:43:01 +00:00
Vinod Kumar Vavilapalli
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
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
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
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
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
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
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
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
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
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
Bikas Saha
9f7823656b
merge -c r1458065 from trunk to branch-2 for YARN-481. Add AM Host and RPC Port to ApplicationCLI Status Output (Chris Riccomini via bikas)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1458067 13f79535-47bb-0310-9956-ffa450edef68
2013-03-19 00:00:12 +00:00
Vinod Kumar Vavilapalli
ef48c24a74
YARN-380. Fix yarn node -status output to be better readable. Contributed by Omkar Vinit Joshi.
...
svn merge --ignore-ancestry -c 1451711. ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1451712 13f79535-47bb-0310-9956-ffa450edef68
2013-03-01 20:39:59 +00:00
Suresh Srinivas
dbb624ed74
YARN-390. Merge r1449980 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1449986 13f79535-47bb-0310-9956-ffa450edef68
2013-02-26 00:57:35 +00:00
Siddharth Seth
035d367933
merge YARN-383 from trunk. AMRMClientImpl should handle null rmClient in stop(). Contributed by Hitesh Shah.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1443700 13f79535-47bb-0310-9956-ffa450edef68
2013-02-07 20:22:34 +00:00
Siddharth Seth
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
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
Thomas Graves
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
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
Siddharth Seth
bcd93d2fda
merge YARN-103 from trunk. Add a yarn AM-RM client module. Contributed by Bikas Saha.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1428555 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 19:12:30 +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
Arun Murthy
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
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
8792f157a4
YARN-40. Provided support for missing YARN commands Contributed by Devaraj K and Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1395793 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1395794 13f79535-47bb-0310-9956-ffa450edef68
2012-10-08 22:19:43 +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
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
eb78183b2b
YARN-79. Implement close on all clients to YARN so that RPC clients don't throw exceptions on shut-down. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1380942 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1380943 13f79535-47bb-0310-9956-ffa450edef68
2012-09-05 00:16:22 +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