Commit Graph

660 Commits

Author SHA1 Message Date
Arpit Agarwal c03108299b YARN-2018: Merging r1592783 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592784 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 15:47:01 +00:00
Junping Du ffb4fc03c2 Merge r1592197 from trunk: YARN-1201. TestAMAuthorization fails with local hostname cannot be resolved. (Wangda Tan via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592198 13f79535-47bb-0310-9956-ffa450edef68
2014-05-03 13:06:32 +00:00
Vinod Kumar Vavilapalli 4c1f66d7fa YARN-1929. Fixed a deadlock in ResourceManager that occurs when failover happens right at the time of shutdown. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1591071 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591072 13f79535-47bb-0310-9956-ffa450edef68
2014-04-29 19:50:17 +00:00
Jason Darrell Lowe 413d84fabb svn merge -c 1591030 FIXES: YARN-738. TestClientRMTokens is failing irregularly while running all yarn tests. Contributed by Ming Ma
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591031 13f79535-47bb-0310-9956-ffa450edef68
2014-04-29 17:49:09 +00:00
Jing Zhao fa6c972283 HADOOP-10535. Merge r1589905 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589906 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 23:05:25 +00:00
Jason Darrell Lowe fa9fea80e2 svn merge -c 1589859 FIXES: YARN-1975. Used resources shows escaped html in CapacityScheduler and FairScheduler page. Contributed by Mit Desai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589860 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 20:06:44 +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
Vinod Kumar Vavilapalli 1aad26034b YARN-1281. Fixed TestZKRMStateStoreZKClientConnections to not fail intermittently due to ZK-client timeouts. Contributed by Tsuyoshi Ozawa.
svn merge --ignore-ancestry -c 1588369 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588371 13f79535-47bb-0310-9956-ffa450edef68
2014-04-17 20:58:23 +00:00
Junping Du e39ce638b6 Merge r1588365 from trunk: YARN-1947. TestRMDelegationTokens#testRMDTMasterKeyStateOnRollingMasterKey is failing intermittently. (Jian He via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588367 13f79535-47bb-0310-9956-ffa450edef68
2014-04-17 20:30:30 +00:00
Jian He 838602d23a Merge r1587776 from trunk. YARN-1934. Fixed a potential NPE in ZKRMStateStore caused by handling Disconnected event from ZK. Contributed by Karthik Kambatla
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587778 13f79535-47bb-0310-9956-ffa450edef68
2014-04-16 02:03:54 +00:00
Zhijie Shen 7c7d00d779 YARN-1892. Improved some logs in the scheduler. Contributed by Jian He.
svn merge --ignore-ancestry -c 1587717 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587718 13f79535-47bb-0310-9956-ffa450edef68
2014-04-15 20:40:53 +00:00
Vinod Kumar Vavilapalli 1134ccdb0d YARN-1928. Fixed a race condition in TestAMRMRPCNodeUpdates which caused it to fail occassionally. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1587114 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587115 13f79535-47bb-0310-9956-ffa450edef68
2014-04-13 22:40:43 +00:00
Vinod Kumar Vavilapalli 2595a27092 YARN-1933. Fixed test issues with TestAMRestart and TestNodeHealthService. Contributed by Jian He.
svn merge --ignore-ancestry -c 1587104 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587105 13f79535-47bb-0310-9956-ffa450edef68
2014-04-13 21:52:09 +00:00
Sanford Ryza 755e8c684c YARN-1923. Make Fair Scheduler resource ratio calculations terminate faster (Anubhav Dhoot via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586795 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 23:23:33 +00:00
Zhijie Shen befba101f3 YARN-1924. Made ZKRMStateStore updateApplication(Attempt)StateInternal work when Application(Attempt) state hasn't been stored before. Contributed by Jian He.
svn merge --ignore-ancestry -c 1586547 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586548 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 03:38:27 +00:00
Vinod Kumar Vavilapalli 614faccf1d YARN-1910. Fixed a race condition in TestAMRMTokens that causes the test to fail more often on Windows. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1586192 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586193 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 01:37:22 +00:00
Kihwal Lee f10bf59e6e svn merge -c 1585992 merging from trunk to branch-2 to fix:YARN-1907. TestRMApplicationHistoryWriter#testRMWritingMassiveHistory intermittently fails. Contributed by Mit Desai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585993 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 15:35:13 +00:00
Karthik Kambatla fa3c632fb2 YARN-1784. TestContainerAllocation assumes CapacityScheduler. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585895 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 05:55:11 +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
Jian He 85c733feee Merge r1584862 from trunk. YARN-1837. Fixed TestMoveApplication#testMoveRejectedByScheduler failure. Contributed by Hong Zhiguo
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584863 13f79535-47bb-0310-9956-ffa450edef68
2014-04-04 18:43:59 +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
Sanford Ryza 06d62b1982 YARN-1889. In Fair Scheduler, avoid creating objects on each call to AppSchedulable comparator (Hong Zhiguo via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583494 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 23:53:58 +00:00
Jonathan Turner Eagles a467e88ae4 YARN-1883. TestRMAdminService fails due to inconsistent entries in UserGroups (Mit Desai via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582865 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 19:45:05 +00:00
Tsz-wo Sze a6c405b99f svn merge -c 1582856 from trunk for HDFS-6168. Remove a deprecated constructor and the deprecated methods reportChecksumFailure, getDelegationToken(Text), renewDelegationToken and cancelDelegationToken from DistributedFileSystem.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582857 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 18:36:20 +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 7bd77e23d7 YARN-1867. Fixed a bug in ResourceManager that was causing invalid ACL checks in the web-services after fail-over. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1581662 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581664 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 03:04:02 +00:00
Vinod Kumar Vavilapalli dd8a9bbadf YARN-1866. Fixed an issue with renewal of RM-delegation tokens on restart or fail-over. Contributed by Jian He.
svn merge --ignore-ancestry -c 1581448 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581450 13f79535-47bb-0310-9956-ffa450edef68
2014-03-25 18:22:59 +00:00
Jian He cb9fcd7f03 Merge r1580997 from trunk. YARN-1852. Fixed RMAppAttempt to not resend AttemptFailed/AttemptKilled events to already recovered Failed/Killed RMApps. Contributed by Rohith Sharmaks
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581001 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 19:06:50 +00:00
Zhijie Shen ebd254117d YARN-1577. Made UnmanagedAMLauncher do launchAM after the attempt reaches the LAUNCHED state. Contributed by Jian He.
svn merge --ignore-ancestry -c 1580164 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580165 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 04:37:46 +00:00
Jian He 21b5ec140a Merge r1580154 from trunk. YARN-1776. Fixed DelegationToken renewal to survive RM failover. Contributed by Zhijie Shen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580156 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 04:14:42 +00:00
Karthik Kambatla 1bb24f2c18 YARN-1536. Cleanup: Get rid of ResourceManager#get*SecretManager() methods and use the RMContext methods instead. (Anubhav Dhoot via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580129 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 02:38:23 +00:00
Vinod Kumar Vavilapalli 8f3f0caee1 YARN-1854. Fixed test failure in TestRMHA#testStartAndTransitions. Contributed by Rohith Sharma KS.
svn merge --ignore-ancestry -c 1580097 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580098 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 00:30:11 +00:00
Jian He b701a84d37 Merge r1580077 from trunk. YARN-1849. Fixed NPE in ResourceTrackerService#registerNodeManager for UAM. Contributed by Karthik Kambatla
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580078 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 22:57:09 +00:00
Vinod Kumar Vavilapalli e1bda693dd YARN-1811. Fixed AMFilters in YARN to correctly accept requests from either web-app proxy or the RMs when HA is enabled. Contributed by Robert Kanter.
svn merge --ignore-ancestry -c 1579877 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579878 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 04:21:14 +00:00
Vinod Kumar Vavilapalli af6b5b8e9a YARN-1640. Fixed manual failover of ResourceManagers to work correctly in secure clusters. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1579510 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579511 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 02:40:54 +00:00
Karthik Kambatla d33b320214 YARN-1705. Reset cluster-metrics on transition to standby. (Rohith via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579015 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 19:03:24 +00:00
Karthik Kambatla de68e1d6de YARN-1846. TestRM#testNMTokenSentForNormalContainer assumes CapacityScheduler. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578767 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 07:00:29 +00:00
Vinod Kumar Vavilapalli 0c6db6af6e YARN-1512. Enhanced CapacityScheduler to be able to decouple scheduling from node-heartbeats. Contributed by Arun C Murthy.
svn merge --ignore-ancestry -c 1578722 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578724 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 02:53:50 +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
Vinod Kumar Vavilapalli 597c7d054f YARN-1591. Fixed AsyncDispatcher to handle interrupts on shutdown in a sane manner and thus fix failure of TestResourceTrackerService. Contributed by Tsuyoshi Ozawa.
svn merge --ignore-ancestry -c 1578628 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578629 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 22:18:09 +00:00
Vinod Kumar Vavilapalli 6aae750762 YARN-1685. Fixed few bugs related to handling of containers' log-URLs on ResourceManager and history-service. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1578602 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578603 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 21:36:51 +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
Jian He ed83fe61e2 Merge r1578486 from trunk. YARN-1830. Fixed TestRMRestart#testQueueMetricsOnRMRestart failure due to race condition when app is submitted. Contributed by Zhijie Shen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578487 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 18:06:17 +00:00
Jonathan Turner Eagles b3b33de0d2 YARN-1833. TestRMAdminService Fails in trunk and branch-2 (Mit Desais via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577743 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 22:15:02 +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
Jason Darrell Lowe 16669efeea svn merge -c 1576960 FIXES: YARN-1789. ApplicationSummary does not escape newlines in the app name. Contributed by Tsuyoshi OZAWA
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576962 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 22:27:01 +00:00
Vinod Kumar Vavilapalli eac9b53bd8 YARN-1816. Fixed ResourceManager to get RMApp correctly handle ATTEMPT_FINISHED event at ACCEPTED state that can happen after RM restarts. Contributed by Jian He.
svn merge --ignore-ancestry -c 1576911 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576913 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 21:19:22 +00:00
Vinod Kumar Vavilapalli 15744c614b YARN-1812. Fixed ResourceManager to synchrously renew tokens after recovery and thus recover app itself synchronously and avoid races with resyncing NodeManagers. Contributed by Jian He.
svn merge --ignore-ancestry -c 1576843 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576844 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 18:26:53 +00:00
Arun Murthy 8c4578e894 Merge -c 1576751 from trunk to branch-2 to fix YARN-1444. Fix CapacityScheduler to deal with cases where applications specify host/rack requests without off-switch request. Contributed by Wangda Tan.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576752 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 14:37:27 +00:00
Karthik Kambatla 6f4d705a63 YARN-1821. NPE on registerNodeManager if the request has containers for UnmanagedAMs (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576527 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 22:19: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 8a3978b18a YARN-1788. Fixed a bug in ResourceManager to set the apps-completed and apps-killed metrics correctly for killed applications. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1576072 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576073 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 20:37:09 +00:00
Jian He 8d6fb7e920 Merge r1576023 from trunk. Fixed ClientRMService#forceKillApplication not killing unmanaged application. Contributed by Karthik Kambatla
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576026 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 18:03:47 +00:00
Sanford Ryza d220391721 YARN-1790. Fair Scheduler UI not showing apps table (bc Wong via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575488 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 05:13:04 +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 f3a95ed841 YARN-1774. FS: Submitting to non-leaf queue throws NPE. (Anubhav Dhoot and Karthik Kambatla via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575417 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 21:34:51 +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
Jian He 296ad40766 Merge r1574623 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574625 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 19:09:01 +00:00
Karthik Kambatla a2e3fab710 YARN-1785. FairScheduler treats app lookup failures as ERRORs. (bc Wong via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574605 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 18:23:24 +00:00
Vinod Kumar Vavilapalli 75f0ecee01 YARN-1766. Fixed a bug in ResourceManager to use configuration loaded from the configuration-provider when booting up. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1574252 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574253 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 23:35:51 +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 595121a601 YARN-1765. Added test cases to verify that killApplication API works across ResourceManager failover. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1573735 ../../trunk/
svn merge --ignore-ancestry -c 1573736 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573737 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 20:39:34 +00:00
Vinod Kumar Vavilapalli dd0942a90d YARN-1758. Fixed ResourceManager to not mandate the presence of site specific configuration files and thus fix failures in downstream tests. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1573695 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573697 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 19:42:24 +00:00
Karthik Kambatla d85cce539d YARN-1760. Addendum patch. TestRMAdminService assumes Capacity Scheduler.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573135 13f79535-47bb-0310-9956-ffa450edef68
2014-03-01 08:47:02 +00:00
Karthik Kambatla 052e6e7fa6 YARN-1528. Allow setting auth for ZK connections. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573017 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 17:36:04 +00:00
Zhijie Shen 55c947b769 YARN-1301. Added the INFO level log of the non-empty blacklist additions and removals inside ApplicationMasterService. Contributed by Tsuyoshi Ozawa.
svn merge --ignore-ancestry -c 1572400 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572402 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 02:10:43 +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
Junping Du 9aefa59ace Merge r1571924 from trunk: YARN-1561. Fix a generic type warning in FairScheduler. (Chen He via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571927 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 05:25:47 +00:00
Karthik Kambatla d4b882d09f YARN-1760. TestRMAdminService assumes CapacityScheduler. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571778 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 18:16:04 +00:00
Vinod Kumar Vavilapalli ffd554b271 YARN-1734. Fixed ResourceManager to update the configurations when it transits from standby to active mode so as to assimilate any changes that happened while it was in standby mode. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1571539 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571540 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 02:08:36 +00:00
Sanford Ryza 2368b73cb3 YARN-1678. Fair scheduler gabs incessantly about reservations (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571469 13f79535-47bb-0310-9956-ffa450edef68
2014-02-24 22:36:03 +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
Zhijie Shen bff7b4daee YARN-1071. Enabled ResourceManager to recover cluster metrics numDecommissionedNMs after restarting. Contributed by Jian He.
svn merge --ignore-ancestry -c 1570469 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570471 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 06:49:43 +00:00
Vinod Kumar Vavilapalli 17d43bd735 YARN-1398. Fixed a deadlock in ResourceManager between users requesting queue-acls and completing containers. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1570415 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570416 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 02:21:13 +00:00
Karthik Kambatla a280313c8a YARN-1736. FS: AppSchedulable.assignContainer's priority argument is redundant. (Naren Koneru via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570337 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 20:13:14 +00:00
Vinod Kumar Vavilapalli cb4541446a YARN-713. Fixing missing update on branch-2 and branch-2.4.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570032 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 01:26:37 +00:00
Vinod Kumar Vavilapalli 5dcbc034f2 YARN-713. Fixed ResourceManager to not crash while building tokens when DNS issues happen transmittently. Contributed by Jian He.
svn merge --ignore-ancestry -c 1569979 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569980 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 23:39:48 +00:00
Sanford Ryza 34baa74273 YARN-1718. Fix a couple isTerminals in Fair Scheduler queue placement rules (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569929 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 21:37:24 +00:00
Jonathan Turner Eagles 07c3667c84 YARN-1479. Invalid NaN values in Hadoop REST API JSON response (Chen He via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569859 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 17:58:04 +00:00
Vinod Kumar Vavilapalli 0bbc1f4d95 YARN-1666. Modified RM HA handling of include/exclude node-lists to be available across RM failover by making using of a remote configuration-provider. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1569856 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569857 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 17:53:45 +00:00
Jian He f33f8df2be Merge from r1569585. YARN-1428. Fixed RM to write the final state of RMApp/RMAppAttempt to the application history store in the transition to the final state. (Contributed by Zhijie Shen)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569600 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 01:47:21 +00:00
Vinod Kumar Vavilapalli eeae0cd829 YARN-1590. Fixed ResourceManager, web-app proxy and MR JobHistoryServer to expand _HOST properly in their kerberos principles. Contributed by Mohammad Kamrul Islam.
svn merge --ignore-ancestry -c 1569537 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569539 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 21:51:06 +00:00
Sanford Ryza ebb9cb3ee5 YARN-1724. Race condition in Fair Scheduler when continuous scheduling is turned on (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569451 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 18:07:59 +00:00
Sanford Ryza 90cbdfaf9d YARN-1721. When moving app between queues in Fair Scheduler, grab lock on FSSchedulerApp (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569445 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 17:52:30 +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
Vinod Kumar Vavilapalli d951cbaa47 YARN-1417. Modified RM to generate container-tokens not at creation time, but at allocation time so as to prevent RM
from shelling out containers with expired tokens. Contributed by Omkar Vinit Joshi and Jian He.
svn merge --ignore-ancestry -c 1568060 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568061 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 22:02:38 +00:00
Vinod Kumar Vavilapalli dc8e01e752 YARN-1676. Modified RM HA handling of user-to-group mappings to be available across RM failover by making using of a remote configuration-provider. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1568041 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568042 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 21:25:34 +00:00
Jian He d05f300504 Merge r1567820 from trunk. YARN-1345. Remove FINAL_SAVING state from YarnApplicationAttemptState. Contributed by Zhijie Shen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567821 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 01:01:40 +00:00
Sanford Ryza fafe240ead YARN-1692. ConcurrentModificationException in fair scheduler AppSchedulable (Sangjin Lee via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567789 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 23:06:11 +00:00
Karthik Kambatla ee0d2f6eab YARN-1641. ZK store should attempt a write periodically to ensure it is still Active. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567629 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 14:11:37 +00:00
Sanford Ryza 9de407364d YARN-1499. Fair Scheduler changes for moving apps between queues (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567484 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 01:19:42 +00:00
Sanford Ryza 5d53da64db YARN-1498 addendum to fix findbugs warning
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567483 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 01:16:55 +00:00
Sanford Ryza 673ba4c00e YARN-1504. RM changes for moving apps between queues (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567482 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 01:16:05 +00:00
Sanford Ryza 41b2227119 YARN-1498. Common scheduler changes for moving apps between queues (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567481 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 01:05:40 +00:00
Sanford Ryza 81bff204c3 YARN-1496. Protocol additions to allow moving apps between queues (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567479 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 01:00:08 +00:00
Vinod Kumar Vavilapalli 3cd8219519 YARN-1459. Changed ResourceManager to depend its service initialization on the configuration-provider mechanism during startup too. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1566791 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1566793 13f79535-47bb-0310-9956-ffa450edef68
2014-02-10 22:51:30 +00:00
Vinod Kumar Vavilapalli 2ad6a71880 YARN-1660. Simplified the RM HA configuration to accept and be able to simply depend just on
configuration properties of the form yarn.resourcemanager.hostname.RMID and use the default
ports for all service addresses. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1565523 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565524 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 03:19:04 +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
Zhijie Shen 3945a44bdb YARN-1689. Made RMAppAttempt get killed when RMApp is at ACCEPTED. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1565497 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565498 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 00:21:13 +00:00
Zhijie Shen 2017bac9e4 YARN-1461. Added tags for YARN applications and changed RM to handle them. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1564633 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564634 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 04:58:50 +00:00
Vinod Kumar Vavilapalli afa5cebbc1 YARN-1669. Modified RM HA handling of protocol level service-ACLS to be available across RM failover by making using of a remote configuration-provider. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1564549 ../../trunk/
Ran into minor import related conflicts that I merged manually.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564552 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 22:57:37 +00:00
Vinod Kumar Vavilapalli 615716010e YARN-1667. Modified RM HA handling of super users (with proxying ability) to be available across RM failover by making using of a remote configuration-provider. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1564100 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564101 13f79535-47bb-0310-9956-ffa450edef68
2014-02-03 22:11:22 +00:00
Vinod Kumar Vavilapalli 884958ce31 YARN-1668. Modified RM HA handling of admin-acls to be available across RM failover by making using of a remote configuration-provider. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1564043 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564044 13f79535-47bb-0310-9956-ffa450edef68
2014-02-03 20:16:56 +00:00
Vinod Kumar Vavilapalli bd84052ff6 YARN-1639. Modified RM HA configuration handling to have a way of not requiring separate configuration files for each RM. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1564032 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564033 13f79535-47bb-0310-9956-ffa450edef68
2014-02-03 19:55:58 +00:00
Vinod Kumar Vavilapalli d083be9bc5 YARN-1611. Introduced the concept of a configuration provider which can be used by ResourceManager to read configuration locally or from remote systems so as to help RM failover. Contributed by Xuan Gong.
svn merge -c 1564002 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564003 13f79535-47bb-0310-9956-ffa450edef68
2014-02-03 19:08:26 +00:00
Jonathan Turner Eagles 37c24d133d YARN-1632. TestApplicationMasterServices should be under org.apache.hadoop.yarn.server.resourcemanager package (Chen He via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563159 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 16:13:21 +00:00
Sanford Ryza e03d7a2e8f YARN-1617. Remove ancient comment and surround LOG.debug in AppSchedulingInfo.allocate (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563005 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 22:41:16 +00:00
Karthik Kambatla dee247d0e2 YARN-1618. Fix invalid RMApp transition from NEW to FINAL_SAVING (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562532 13f79535-47bb-0310-9956-ffa450edef68
2014-01-29 18:06:18 +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 b786be0307 YARN-1597. Fixed Findbugs warnings on branch YARN-321. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1557958 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562217 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:17:27 +00:00
Vinod Kumar Vavilapalli a6dfb7b045 YARN-1413. Implemented serving of aggregated-logs in the ApplicationHistory server. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1556752 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562206 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:03:04 +00:00
Vinod Kumar Vavilapalli 0f87e4928b YARN-953. Changed ResourceManager to start writing history data. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1556738 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562192 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:56:28 +00:00
Vinod Kumar Vavilapalli f8cd06194d YARN-974. Added more information to RMContainer to be collected and recorded in Application-History. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1556733 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562188 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:53:17 +00:00
Vinod Kumar Vavilapalli 3ec30a2941 YARN-934. Updated patch for HistoryWriter to split the write operations into a startOp and a finishOp. Contributed by Zhijie Shen.
YARN-947. Updated patch to have separate data object for startOp and finishOp. Contributed by Zhijie Shen.
YARN-956. Updated patch for In-memory Storage after the above two changes.
svn merge --ignore-ancestry -c 1556726 ../YARN-321


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562182 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:50:28 +00:00
Sanford Ryza 059262e5a5 YARN-1629. IndexOutOfBoundsException in MaxRunningAppsEnforcer (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561998 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 08:36:19 +00:00
Karthik Kambatla b650f912ad YARN-1573. ZK store should use a private password for root-node-acls. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560595 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 06:26:23 +00:00
Sanford Ryza b227defc4c YARN-1623. Include queue name in RegisterApplicationMasterResponse (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560555 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 22:45:33 +00:00
Sanford Ryza 0377619e7d YARN-1607. TestRM relies on the scheduler assigning multiple containers in a single node update (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560534 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 22:08:37 +00:00
Sanford Ryza 700a81d9ba YARN-1624. QueuePlacementPolicy format is not easily readable via a JAXB parser (Aditya Acharya via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560471 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 18:52:25 +00:00
Karthik Kambatla a560488df6 YARN-1616. RMFatalEventDispatcher should log the cause of the event (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1559903 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 02:02:24 +00:00
Sanford Ryza f5e4562408 YARN-1351. Invalid string format in Fair Scheduler log warn message (Konstantin Weitz via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558602 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 23:23:01 +00:00
Junping Du 534c8ce4c8 Merge 1558340 from trunk: YARN-1603. Remove two *.orig files which were unexpectedly committed. (Zhijie Shen via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558342 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 11:12:28 +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
Sanford Ryza 04c7b8afb5 YARN-1567. In Fair Scheduler, allow empty queues to change between leaf and parent on allocation file reload (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558229 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 22:38:23 +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 cb3d61bbe7 YARN-1041. Added the ApplicationMasterProtocol API for applications to use the ability in ResourceManager to optionally not kill containers when the ApplicationMaster exits. Contributed by Jian He.
svn merge --ignore-ancestry -c 1557318 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557319 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 07:08:06 +00:00
Jian He 0bdfb9f754 Merge r1557296 from trunk. YARN-1166. Fixed app-specific and attempt-specific QueueMetrics to be triggered by accordingly app event and attempt event. Contributed by Zhijie Shen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557297 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 01:18:55 +00:00
Karthik Kambatla a7632fa9e2 YARN-1574. RMDispatcher should be reset on transition to standby. (Xuan Gong via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557249 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 20:20:01 +00:00
Karthik Kambatla aa9e5b5b1a YARN-1033. Expose RM active/standby state to Web UI and REST API (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557183 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 16:40:45 +00:00
Vinod Kumar Vavilapalli 76fc12eadf YARN-1490. Introduced the ability to make ResourceManager optionally not kill all containers when an ApplicationMaster exits. Contributed by Jian He.
svn merge --ignore-ancestry -c 1557143 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557144 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 15:05:18 +00:00
Karthik Kambatla 72d69856d5 YARN-1568. Rename clusterid to clusterId in ActiveRMInfoProto (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556436 13f79535-47bb-0310-9956-ffa450edef68
2014-01-08 03:31:36 +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
Vinod Kumar Vavilapalli 8e135fc73c YARN-1493. Changed ResourceManager and Scheduler interfacing to recognize app-attempts separately from apps. Contributed by Jian He.
svn merge --ignore-ancestry -c 1554896 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554898 13f79535-47bb-0310-9956-ffa450edef68
2014-01-02 20:21:03 +00:00
Vinod Kumar Vavilapalli 48e255ff5d YARN-1549. Fixed a bug in ResourceManager's ApplicationMasterService that was causing unamanged AMs to not finish correctly. Contributed by haosdent.
svn merge --ignore-ancestry -c 1554886 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554887 13f79535-47bb-0310-9956-ffa450edef68
2014-01-02 19:54:34 +00:00
Vinod Kumar Vavilapalli e81796015a YARN-1522. Fixed a race condition in the test TestApplicationCleanup that was causing it to randomly fail. Contributed by Liyin Liang.
svn merge --ignore-ancestry -c 1554328 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554329 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 22:22:24 +00:00
Karthik Kambatla b81315077c YARN-1481. Reverting addendum patch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553995 13f79535-47bb-0310-9956-ffa450edef68
2013-12-29 05:44:41 +00:00
Vinod Kumar Vavilapalli ee20593b64 YARN-1541. Changed ResourceManager to invalidate ApplicationMaster host/port information once an AM crashes. Contributed by Jian He.
svn merge --ignore-ancestry -c 1553772 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553773 13f79535-47bb-0310-9956-ffa450edef68
2013-12-28 01:10:02 +00:00
Karthik Kambatla 05ff546482 YARN-1481. Addendum patch to fix synchronization in AdminService
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553741 13f79535-47bb-0310-9956-ffa450edef68
2013-12-27 21:11:12 +00:00
Karthik Kambatla b99dd5de74 YARN-1523. Use StandbyException instead of RMNotYetReadyException (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553620 13f79535-47bb-0310-9956-ffa450edef68
2013-12-27 03:32:05 +00:00
Karthik Kambatla 4d85f9a0ed YARN-1172. Convert SecretManagers in RM to services (Tsuyoshi OZAWA via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553432 13f79535-47bb-0310-9956-ffa450edef68
2013-12-26 00:25:05 +00:00
Vinod Kumar Vavilapalli ba1286fec1 YARN-1307. Redesign znode structure for Zookeeper based RM state-store for better organization and scalability. Contributed by Tsuyoshi OZAWA.
svn merge --ignore-ancestry -c 1552209 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552210 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 02:33:33 +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
Karthik Kambatla fb0bcec05b YARN-1451. TestResourceManager relies on the scheduler assigning multiple containers in a single node update. (Sandy Ryza via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551441 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 01:48:15 +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
Vinod Kumar Vavilapalli 690ae75385 YARN-1485. Modified RM HA configuration validation to also ensure that service-address configuration are configured for every RM. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1550854 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550855 13f79535-47bb-0310-9956-ffa450edef68
2013-12-13 23:55:31 +00:00
Jian He 2b3af36c65 Merge r1550613 and r1550615 from trunk to branch-2 to fix YARN-1311. Fixed app specific scheduler-events' names to be app-attempt based. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550618 13f79535-47bb-0310-9956-ffa450edef68
2013-12-13 02:07:21 +00:00
Jian He f6a716bd50 Merge r1550594 from trunk to branch-2 to revert YARN-1311. Fixed app specific scheduler-events' names to be app-attempt based. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550596 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 23:53:45 +00:00
Jian He abcacc1fc6 Merge r1550579 from trunk to branch-2 to fix YARN-1311. Fixed app specific scheduler-events' names to be app-attempt based. Contributed by Vinod Kumar Vavilapalli
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550584 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 23:14:03 +00:00
Vinod Kumar Vavilapalli 3033fad821 YARN-1325. Modified RM HA configuration validation to also ensure that multiple RMs are configured. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1550524 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550527 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 20:50:43 +00:00
Vinod Kumar Vavilapalli 05c923a455 YARN-408. Change CapacityScheduler to not disable delay-scheduling by default. Contributed by Mayank Bansal.
svn merge --ignore-ancestry -c 1550245 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550246 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 20:15:47 +00:00
Karthik Kambatla 4e5ba02d6b YARN-1481. Move internal services logic from AdminService to ResourceManager. (vinodkv via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550168 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 15:15:35 +00:00
Vinod Kumar Vavilapalli eeeca16747 YARN-1405. Fixed ResourceManager to not hang when init/start fails with an exception w.r.t state-store. Contributed by Jian He.
svn merge --ignore-ancestry -c 1548992 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548993 13f79535-47bb-0310-9956-ffa450edef68
2013-12-08 04:30:58 +00:00
Vinod Kumar Vavilapalli 82f1335e36 YARN-1378. Implemented a cleaner of old finished applications from the RM state-store. Contributed by Jian He.
svn merge --ignore-ancestry -c 1548990 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548991 13f79535-47bb-0310-9956-ffa450edef68
2013-12-08 04:19:16 +00:00
Sanford Ryza cee74196c2 YARN-807. When querying apps by queue, iterating over all apps is inefficient and limiting (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548985 13f79535-47bb-0310-9956-ffa450edef68
2013-12-08 03:14:43 +00:00
Sanford Ryza 339c11b406 YARN-546. Allow disabling the Fair Scheduler event log. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548362 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 01:34:42 +00:00
Sanford Ryza 51d3c26b99 YARN-1403. Separate out configuration loading from QueueManager in the Fair Scheduler (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548007 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 03:30:17 +00:00
Vinod Kumar Vavilapalli 2e30ca92f3 YARN-1454. Fixed test failure issue with TestRMRestart. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1547651 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547653 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 00:22:52 +00:00
Vinod Kumar Vavilapalli 45bfbbbabe YARN-895. Changed RM state-store to not crash immediately if RM restarts while the state-store is down. Contributed by Jian He.
svn merge --ignore-ancestry -c 1547538 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547539 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 19:28:42 +00:00
Vinod Kumar Vavilapalli 92cf368172 YARN-1318. Promoted AdminService to an Always-On service and merged it into RMHAProtocolService. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1547212 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547214 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 22:19:43 +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 ce913ffd49 YARN-1241. In Fair Scheduler, maxRunningApps does not work for non-leaf queues. (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1546626 13f79535-47bb-0310-9956-ffa450edef68
2013-11-29 19:14:36 +00:00
Vinod Kumar Vavilapalli db027316e6 YARN-1239. Modified ResourceManager state-store implementations to start storing version numbers. Contributed by Jian He.
svn merge --ignore-ancestry -c 1546229 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1546230 13f79535-47bb-0310-9956-ffa450edef68
2013-11-27 23:23:01 +00:00
Vinod Kumar Vavilapalli 43d4537dcb YARN-1416. Fixed a few invalid transitions in RMApp, RMAppAttempt and in some tests. Contributed by Jian He.
svn merge --ignore-ancestry -c 1545448 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545449 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 23:11:01 +00:00
Sanford Ryza c0bcf404d5 YARN-1423. Support queue placement by secondary group in the Fair Scheduler (Ted Malaska via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545158 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 06:17:27 +00:00
Bikas Saha 0bf221368f Merge r1543952 from trunk to branch-2 for YARN-1425. TestRMRestart fails because MockRM.waitForState(AttemptId) uses current attempt instead of the attempt passed as argument (Omkar Vinit Joshi via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543954 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 21:22:34 +00:00
Bikas Saha 49377f273e Merge r1543707 from trunk to branch-2 for YARN-744. Race condition in ApplicationMasterService.allocate .. It might process same allocate request twice resulting in additional containers getting allocated. (Omkar Vinit Joshi via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543709 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 05:22:40 +00:00
Sanford Ryza da6d4dbc13 YARN-1407. RM Web UI and REST APIs should uniformly use YarnApplicationState (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543678 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 00:49:34 +00:00
Sanford Ryza b98b50b46c YARN-786: Addendum so that RMAppAttemptImpl#getApplicationResourceUsageReport won't return null
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543600 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 22:26:12 +00:00
Sanford Ryza 86fd96080d YARN-584. In scheduler web UIs, queues unexpand on refresh. (Harshit Daga via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543352 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 09:03:31 +00:00
Vinod Kumar Vavilapalli 0b57905309 YARN-674. Fixed ResourceManager to renew DelegationTokens on submission asynchronously to work around potential slowness in state-store. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1543312 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543313 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 05:21:45 +00:00
Vinod Kumar Vavilapalli 8613e7ef3d YARN-1210. Changed RM to start new app-attempts on RM restart only after ensuring that previous AM exited or after expiry time. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1543310 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543311 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 05:17:56 +00:00
Vinod Kumar Vavilapalli a70140e1ba YARN-709. Added tests to verify validity of delegation tokens and logging of appsummary after RM restart. Contributed by Jian He.
svn merge --ignore-ancestry -c 1543269 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543271 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 00:52:04 +00:00
Jason Darrell Lowe 40129be1fe svn merge -c 1543117 FIXES: YARN-1419. TestFifoScheduler.testAppAttemptMetrics fails intermittently under jdk7. Contributed by Jonathan Eagles
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543121 13f79535-47bb-0310-9956-ffa450edef68
2013-11-18 19:29:29 +00:00
Bikas Saha 0cab547b2d Merge r1542367 from trunk to branch-2 for YARN-1411. HA config shouldn't affect NodeManager RPC addresses (Karthik Kambatla via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542380 13f79535-47bb-0310-9956-ffa450edef68
2013-11-15 19:48:12 +00:00
Sanford Ryza 516e657ac7 YARN-1392. Allow sophisticated app-to-queue placement policies in the Fair Scheduler (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542108 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 22:20:38 +00:00
Bikas Saha 63115de6fd Merging r1541995 from trunk to branch-2 for YARN-1222. Make improvements in ZKRMStateStore for fencing (Karthik Kambatla via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542026 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 19:09:40 +00:00
Sanford Ryza fd1dd57fc5 YARN-1387. RMWebServices should use ClientRMService for filtering applications (Karthik Kambatla via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540856 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 21:52:07 +00:00
Vinod Kumar Vavilapalli ec91e5da1b YARN-1121. Changed ResourceManager's state-store to drain all events on shut-down. Contributed by Jian He.
svn merge --ignore-ancestry -c 1540232 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540233 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 00:56:26 +00:00
Luke Lu 9b1122e0eb YARN-311. RM/scheduler support for dynamic resource configuration. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539132 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 21:20:05 +00:00
Vinod Kumar Vavilapalli c8d2faab1b YARN-1374. Changed ResourceManager to start the preemption policy monitors as active services. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1539089 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539090 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 18:26:07 +00:00
Sanford Ryza cc280ad063 YARN-1388. Fair Scheduler page always displays blank fair share (Liyin Liang via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538856 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 02:16:51 +00:00
Sanford Ryza ba85796267 YARN-786. Expose application resource usage in RM REST API (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537811 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 03:03:24 +00:00
Sanford Ryza 7ff13102d5 YARN-1290. Let continuous scheduling achieve more balanced task assignment (Wei Yan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537735 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 22:07:09 +00:00
Vinod Kumar Vavilapalli ad46e707f4 YARN-891. Modified ResourceManager state-store to remember completed applications so that clients can get information about them post RM-restart. Contributed by Jian He.
svn merge --ignore-ancestry -c 1537560 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537561 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 17:25:37 +00:00
Alejandro Abdelnur 5ac97bbe25 YARN-1343. NodeManagers additions/restarts are not reported as node updates in AllocateResponse responses to AMs. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537369 13f79535-47bb-0310-9956-ffa450edef68
2013-10-31 02:57:33 +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
Sanford Ryza 2301e3a163 YARN-1333. Support blacklisting in the Fair Scheduler (Tsuyoshi Ozawa via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535902 13f79535-47bb-0310-9956-ffa450edef68
2013-10-26 00:34:14 +00:00
Sanford Ryza 81d6bead1e YARN-1335. Move duplicate code from FSSchedulerApp and FiCaSchedulerApp into SchedulerApplication (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535583 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 23:17:45 +00:00
Bikas Saha 7f27c99a44 Merge r1534884 from trunk to branch-2 YARN-1305. RMHAProtocolService#serviceInit should handle HAUtil's IllegalArgumentException (Tsuyoshi Ozawa via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534887 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 01:16:05 +00:00
Sanford Ryza 6d2ef587d0 YARN-1330. Fair Scheduler: defaultQueueSchedulingPolicy does not take effect (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534862 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 23:58:15 +00:00
Sanford Ryza 0d445fe01f YARN-1315. TestQueueACLs should also test FairScheduler (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534510 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 06:33:11 +00:00
Sanford Ryza 829fc289cf YARN-1288. Make Fair Scheduler ACLs more user friendly (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534316 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 18:46:14 +00:00
Vinod Kumar Vavilapalli 06d24042b6 YARN-1185. Fixed FileSystemRMStateStore to not leave partial files that prevent subsequent ResourceManager recovery. Contributed by Omkar Vinit Joshi.
svn merge --ignore-ancestry -c 1533803 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533805 13f79535-47bb-0310-9956-ffa450edef68
2013-10-19 18:15:18 +00:00
Sanford Ryza 59e7d9f5c2 YARN-1259. In Fair Scheduler web UI, queue num pending and num active apps switched. (Robert Kanter via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532096 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 21:07:55 +00:00
Sanford Ryza 37d80b1629 YARN-305. Fair scheduler logs too many "Node offered to app" messages. (Lohit Vijayarenu via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531818 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 08:52:56 +00:00
Sanford Ryza ae42ecbc01 YARN-1044. used/min/max resources do not display info in the scheduler page (Sangjin Lee via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531449 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 22:17:24 +00:00