Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,387 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

181 Commits

Author SHA1 Message Date
subru bf4394e160 YARN-2576. Making test patch pass in branch. Contributed by Subru Krishnan and Carlo Curino. 
(cherry picked from commit 90ac0be86b)
(cherry picked from commit 5e10a13bb4)
(cherry picked from commit ae0f16ccc8)
 2014-10-06 10:29:14 -07:00
subru d244b2ae3a YARN-2080. Integrating reservation system with ResourceManager and client-RM protocol. Contributed by Subru Krishnan and Carlo Curino. 
(cherry picked from commit 8baeaead85)

Conflicts:
	hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java
(cherry picked from commit 6261f7cc69)
(cherry picked from commit cbfbdf60d6)
 2014-10-06 10:29:13 -07:00
junping_du 8871bf37fe YARN-2613. Support retry in NMClient for rolling-upgrades. (Contributed by Jian He) 2014-10-01 17:11:59 -07:00
Jian He cb08ed1484 YARN-668. Changed NMTokenIdentifier/AMRMTokenIdentifier/ContainerTokenIdentifier to use protobuf object as the payload. Contributed by Junping Du. 
(cherry picked from commit 5391919b09)
 2014-09-26 17:53:35 -07:00
Zhijie Shen 9333ee3068 YARN-2568. Fixed the potential test failures due to race conditions when RM work-preserving recovery is enabled. Contributed by Jian He. 
(cherry picked from commit 6fe5c6b746)
 2014-09-18 22:02:53 -07:00
Jian He 4cabeef931 YARN-2563. Fixed YarnClient to call getTimeLineDelegationToken only if the Token is not present. Contributed by Zhijie Shen 
(cherry picked from commit eb92cc67df)
 2014-09-18 14:41:14 -07:00
Vinod Kumar Vavilapalli 514bfeafd9 YARN-1779. Fixed AMRMClient to handle AMRMTokens correctly across ResourceManager work-preserving-restart or failover. Contributed by Jian He. 
(cherry picked from commit a3d9934f91)
 2014-09-18 10:17:24 -07:00
Jian He 09ad86d70c YARN-2542. Fixed NPE when retrieving ApplicationReport from TimeLineServer. Contributed by Zhijie Shen 
(cherry picked from commit a0ad975ea1)
 2014-09-12 15:28:10 -07:00
junping_du efa9ab3638 YARN-2033. Merging generic-history into the Timeline Store (Contributed by Zhijie Shen) 
(cherry picked from commit 6b8b1608e6)
 2014-09-12 10:08:06 +08:00
Jian He ceae7be6b2 YARN-415. Capture aggregate memory allocation at the app-level for chargeback. Contributed by Eric Payne & Andrey Klochkov 
(cherry picked from commit 83be3ad444)
 2014-09-10 18:22:07 -07:00
Zhijie Shen af83e57e82 YARN-1954. Added waitFor to AMRMClient(Async). Contributed by Tsuyoshi Ozawa. 
svn merge --ignore-ancestry -c 1617002 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617003 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-09 18:48:15 +00:00
Xuan Gong 4365c4530b YARN-2212 ApplicationMaster needs to find a way to update the AMRMToken periodically. Contributed by Xuan Gong 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616891 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 21:37:35 +00:00
Junping Du 8abd45b5bb Merge r1616100 from trunk: YARN-2298. Move TimelineClient to yarn-common project (Zhijie Shen via junping_du) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616102 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-06 05:56:34 +00:00
Jian He eeb024c034 Merge r1613515 from trunk. YARN-2211. Persist AMRMToken master key in RMStateStore for RM recovery. Contributed by Xuan Gong 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613516 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-25 20:44:30 +00:00
Vinod Kumar Vavilapalli bfefa9301f YARN-2228. Augmented TimelineServer to load pseudo authentication filter when authentication = simple. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1610575 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610576 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-15 04:34:16 +00:00
Jian He b05080053e Merge r1609254 from trunk. YARN-1366. Changed AMRMClient to re-register with RM and send outstanding requests back to RM on work-preserving RM restart. Contributed by Rohith 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609255 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-09 18:28:00 +00:00
Karthik Kambatla 9133e3142c Preparing for 2.6.0 development. Updated versions. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607541 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-03 06:11:57 +00:00
Vinod Kumar Vavilapalli a2e2c8ad97 YARN-2152. Added missing information into ContainerTokenIdentifier so that NodeManagers can report the same to RM when RM restarts. Contributed Jian He. 
svn merge --ignore-ancestry -c 1605205 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605206 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-24 21:44:00 +00:00
Jian He d79919f175 Merge r1603028 from trunk. YARN-1885. Fixed a bug that RM may not send application-clean-up signal to NMs where the completed applications previously ran in case of RM restart. Contributed by Wangda Tan 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603030 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-17 00:02:57 +00:00
Zhijie Shen 48520b43ff YARN-2075. Fixed the test failure of TestRMAdminCLI. Contributed by Kenji Kikushima. 
svn merge --ignore-ancestry -c 1602071 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602073 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 06:48:49 +00:00
Bikas Saha fe66a3b00b Merge 1602043 from trunk to branch-2 for YARN-2148. TestNMClient failed due more exit code values added and passed to AM (Wangda Tan via bikas) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602045 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 22:49:19 +00:00
Vinod Kumar Vavilapalli 3cc1cddffb YARN-2121. Fixed NPE handling in Timeline Server's TimelineAuthenticator. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1601000 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601001 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-06 20:33:10 +00:00
Vinod Kumar Vavilapalli 65a5e2cc46 YARN-1936. Added security support for the Timeline Client. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1597153 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597154 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-23 18:49:21 +00:00
Vinod Kumar Vavilapalli 18457f8ed0 YARN-2049. Added delegation-token support for the Timeline Server. Contributed by Zhijie Shen. 
svn merge --ignore-ancestry -c 1597130 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597131 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-23 17:10:22 +00:00
Vinod Kumar Vavilapalli 155e816bc2 YARN-1861. Fixed a bug in RM to reset leader-election on fencing that was causing both RMs to be stuck in standby mode when automatic failover is enabled. Contributed by Karthik Kambatla and Xuan Gong. 
svn merge --ignore-ancestry -c 1594356 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594357 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-13 20:03:52 +00:00
Vinod Kumar Vavilapalli a098b692f4 YARN-1962. Changed Timeline Service client configuration to be off by default given the non-readiness of the feature yet. Contributed by Mohammad Kamrul Islam. 
svn merge --ignore-ancestry -c 1593750 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593751 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-11 00:15:48 +00:00
Chris Nauroth de1f0bf3e4 YARN-1970. Merging change r1589001 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589004 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-21 23:39:16 +00:00
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