Commit Graph

1074 Commits

Author SHA1 Message Date
Junping Du 0d50c2f697 Merge r1607655 from trunk: YARN-2242. Improve exception information on AM launch crashes. (Contributed by Li Lu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607656 13f79535-47bb-0310-9956-ffa450edef68
2014-07-03 14:19:18 +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 0ac01d7cfc YARN-2232. Fixed ResourceManager to allow DelegationToken owners to be able to cancel their own tokens in secure mode. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1607484 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607485 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 21:37:20 +00:00
Karthik Kambatla 99bced167b YARN-2241. ZKRMStateStore: On startup, show nicer messages if znodes already exist. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607475 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 20:36:09 +00:00
Steve Loughran 4cfc90590c YARN-2065 AM cannot create new containers after restart
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607440 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 18:34:09 +00:00
Karthik Kambatla 14858cd6f7 YARN-2204. Explicitly enable vmem check in TestContainersMonitor#testContainerKillOnMemoryOverflow. (Anubhav Dhoot via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607233 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 02:07:48 +00:00
Vinod Kumar Vavilapalli 8f1f458729 YARN-1713. Added get-new-app and submit-app functionality to RM web services. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1607216 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607217 13f79535-47bb-0310-9956-ffa450edef68
2014-07-02 00:23:49 +00:00
Xuan Gong c2eaeadaab TestRMApplicationHistoryWriter sometimes fails in trunk. Contributed by Zhijie Shen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606834 13f79535-47bb-0310-9956-ffa450edef68
2014-06-30 16:51:04 +00:00
Jian He a385b77df7 Merge r1606557 from trunk. YARN-2052. Embedded an epoch number in container id to ensure the uniqueness of container id after RM restarts. Contributed by Tsuyoshi OZAWA
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606558 13f79535-47bb-0310-9956-ffa450edef68
2014-06-29 18:26:08 +00:00
Jian He c63e3f027b Merge r1606407 from trunk. YARN-614. Changed ResourceManager to not count disk failure, node loss and RM restart towards app failures. Contributed by Xuan Gong
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606408 13f79535-47bb-0310-9956-ffa450edef68
2014-06-28 23:41:51 +00:00
Zhijie Shen 705a5cede9 YARN-2201. Made TestRMWebServicesAppsModification be independent of the changes on yarn-default.xml. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1606285 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606286 13f79535-47bb-0310-9956-ffa450edef68
2014-06-28 03:33:46 +00:00
Jason Darrell Lowe dfe7cbb050 svn merge -c 1606265 FIXES: YARN-2104. Scheduler queue filter failed to work because index of queue column changed. Contributed by Wangda Tan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606266 13f79535-47bb-0310-9956-ffa450edef68
2014-06-27 23:13:14 +00:00
Karthik Kambatla 94ac07e4a5 YARN-2204. Addendum patch. TestAMRestart#testAMRestartWithExistingContainers assumes CapacityScheduler. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606170 13f79535-47bb-0310-9956-ffa450edef68
2014-06-27 18:18:12 +00:00
Ravi Prakash b2e3e76e2f YARN 2163. WebUI: Order of AppId in apps table should be consistent with ApplicationId.compareTo()
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605965 13f79535-47bb-0310-9956-ffa450edef68
2014-06-27 06:45:57 +00:00
Vinod Kumar Vavilapalli 8317fd5de6 YARN-2171. Improved CapacityScheduling to not lock on nodemanager-count when AMs heartbeat in. Contributed by Jason Lowe.
svn merge --ignore-ancestry -c 1605616 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605617 13f79535-47bb-0310-9956-ffa450edef68
2014-06-25 21:57:28 +00:00
Karthik Kambatla 7e252055bf YARN-2204. TestAMRestart#testAMRestartWithExistingContainers assumes CapacityScheduler. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605550 13f79535-47bb-0310-9956-ffa450edef68
2014-06-25 18:54:15 +00:00
Jian He 63940d6e13 Merge r1605263 from trunk. YARN-1365. Changed ApplicationMasterService to allow an app to re-register after RM restart. Contributed by Anubhav Dhoot
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605264 13f79535-47bb-0310-9956-ffa450edef68
2014-06-25 04:45:50 +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
Thomas Graves 1c2052e200 YARN-2072. RM/NM UIs and webservices are missing vcore information. (Nathan Roberts via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605166 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 19:41:56 +00:00
Karthik Kambatla e9cf83174a YARN-2109. Fix TestRM to work with both schedulers. (Anubhav Dhoot via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605144 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 17:34:29 +00:00
Karthik Kambatla 1307f2aeae YARN-2192. TestRMHA fails when run with a mix of Schedulers. (Anubhav Dhoot via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605139 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 17:14:22 +00:00
Sanford Ryza d66a477781 YARN-2111. In FairScheduler.attemptScheduling, we don't count containers as assigned if they have 0 memory but non-zero cores (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605115 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 15:48:51 +00:00
Vinod Kumar Vavilapalli c8dfed19ba YARN-2074. Changed ResourceManager to not count AM preemptions towards app failures. Contributed by Jian He.
svn merge --ignore-ancestry -c 1605106 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605107 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 15:16:36 +00:00
Devarajulu K 7741cc62b4 YARN-2195. Clean a piece of code in ResourceRequest. Contributed by Wei Yan.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605085 13f79535-47bb-0310-9956-ffa450edef68
2014-06-24 13:58:14 +00:00
Jian He 5addc7d50e Merge r1604949 from trunk. YARN-2191. Added a new test to ensure NM will clean up completed applications in the case of RM restart. Contributed by Wangda Tan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604950 13f79535-47bb-0310-9956-ffa450edef68
2014-06-23 22:54:15 +00:00
Karthik Kambatla e79f3f194b YARN-2187. FairScheduler: Disable max-AM-share check by default. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604322 13f79535-47bb-0310-9956-ffa450edef68
2014-06-21 07:33:04 +00:00
Jason Darrell Lowe 0873304b90 svn merge -c 160639 FIXES: YARN-2167. LeveldbIterator should get closed in NMLeveldbStateStoreService#loadLocalizationState() within finally block. Contributed by Junping Du
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603040 13f79535-47bb-0310-9956-ffa450edef68
2014-06-17 02:14:29 +00:00
Junping Du 771e157b66 Merge r1603036 from trunk: YARN-1339. Recover DeletionService state upon nodemanager restart. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603037 13f79535-47bb-0310-9956-ffa450edef68
2014-06-17 01:10:49 +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
Karthik Kambatla ce88f5d63a YARN-2159. Better logging in SchedulerNode#allocateContainer. (Ray Chiang via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603011 13f79535-47bb-0310-9956-ffa450edef68
2014-06-16 22:18:40 +00:00
Vinod Kumar Vavilapalli a7b760eae8 YARN-1702. Added kill app functionality to RM web services. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1602298 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602300 13f79535-47bb-0310-9956-ffa450edef68
2014-06-12 21:33:03 +00:00
Karthik Kambatla c43ab7f08e YARN-2155. FairScheduler: Incorrect threshold check for preemption. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602297 13f79535-47bb-0310-9956-ffa450edef68
2014-06-12 21:26:39 +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
Jian He 279c5a3752 Merge r1601980 from trunk. YARN-2125. Changed ProportionalCapacityPreemptionPolicy to log CSV in debug level. Contributed by Wangda Tan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601981 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 18:32:48 +00:00
Jian He e4f775755c Merge r1601964 from trunk. YARN-2124. Fixed NPE in ProportionalCapacityPreemptionPolicy. Contributed by Wangda Tan
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601965 13f79535-47bb-0310-9956-ffa450edef68
2014-06-11 17:31:35 +00:00
Bikas Saha dc5ee5ff7c Merge 1601762 from trunk to branch-2 for YARN-2091. Add more values to ContainerExitStatus and pass it from NM to RM and then to app masters (Tsuyoshi OZAWA via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601763 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 20:13:23 +00:00
Karthik Kambatla d4d1ccc992 YARN-1424. RMAppAttemptImpl should return the DummyApplicationResourceUsageReport for all invalid accesses. (Ray Chiang via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601745 13f79535-47bb-0310-9956-ffa450edef68
2014-06-10 19:06:32 +00:00
Jian He e6a03e2fc0 Merge r1601491 from trunk. YARN-2030. Augmented RMStateStore with state machine. Contributed by Binglin Chang
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601492 13f79535-47bb-0310-9956-ffa450edef68
2014-06-09 19:46:48 +00:00
Vinod Kumar Vavilapalli 319e422733 YARN-1368. Added core functionality of recovering container state into schedulers after ResourceManager Restart so as to preserve running work in the cluster. Contributed by Jian He.
svn merge --ignore-ancestry -c 1601303 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601304 13f79535-47bb-0310-9956-ffa450edef68
2014-06-09 03:10:06 +00:00
Karthik Kambatla d5379b29a2 YARN-2132. ZKRMStateStore.ZKAction#runWithRetries doesn't log the exception it encounters. (Vamsee Yarlagadda via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601066 13f79535-47bb-0310-9956-ffa450edef68
2014-06-07 06:13:22 +00:00
Karthik Kambatla cd031015cd YARN-2128. FairScheduler: Incorrect calculation of amResource usage. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601051 13f79535-47bb-0310-9956-ffa450edef68
2014-06-07 01:23:23 +00:00
Karthik Kambatla 233ca3e2a5 YARN-2122. In AllocationFileLoaderService, the reloadThread should be created in init() and started in start(). (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601046 13f79535-47bb-0310-9956-ffa450edef68
2014-06-07 00:51:50 +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
Zhijie Shen 683d4bdbd9 YARN-2117. Fixed the issue that secret file reader is potentially not closed in TimelineAuthenticationFilterInitializer. Contributed by Chen He.
svn merge --ignore-ancestry -c 1600994 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600995 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 20:10:14 +00:00
Zhijie Shen 32a71b6f34 YARN-2118. Fixed the type mismatch in Map#containsKey check of TimelineWebServices#injectOwnerInfo. Contributed by Ted Yu.
svn merge --ignore-ancestry -c 1600967 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600969 13f79535-47bb-0310-9956-ffa450edef68
2014-06-06 17:49:48 +00:00
Junping Du 3438bf531d Merge r1600644 from trunk: YARN-1977. Add tests on getApplicationRequest with filtering start time range. (Contributed by Junping Du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600648 13f79535-47bb-0310-9956-ffa450edef68
2014-06-05 13:24:22 +00:00
Karthik Kambatla fa57c0f5b8 YARN-2061. Revisit logging levels in ZKRMStateStore. (Ray Chiang via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600514 13f79535-47bb-0310-9956-ffa450edef68
2014-06-04 21:40:37 +00:00
Karthik Kambatla 33439defa1 YARN-2119. DEFAULT_PROXY_ADDRESS should use DEFAULT_PROXY_PORT. (Anubhav Dhoot via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600487 13f79535-47bb-0310-9956-ffa450edef68
2014-06-04 20:18:49 +00:00
Sanford Ryza f9c5c308e4 YARN-1913. With Fair Scheduler, cluster can logjam when all resources are consumed by AMs (Wei Yan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599401 13f79535-47bb-0310-9956-ffa450edef68
2014-06-03 00:58:09 +00:00