Commit Graph

753 Commits

Author SHA1 Message Date
Jing Zhao 88d09130e8 HDFS-5545. Merge change r1546151 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551703 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 20:59:27 +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 f7f79f93ab YARN-1145. Fixed a potential file-handle leak in the web interface for displaying aggregated logs. Contributed by Rohith Sharma.
svn merge --ignore-ancestry -c 1551326 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551327 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 19:28:20 +00:00
Vinod Kumar Vavilapalli 38274ce9e0 YARN-1505. Fixed Webapplication proxy server to not hardcode its bind address. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1551314 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551315 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 19:10:17 +00:00
Zhijie Shen 17a4c75855 YARN-1435. Modified Distributed Shell to accept either the command or the custom script. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1550867 ../../trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550869 13f79535-47bb-0310-9956-ffa450edef68
2013-12-14 02:05:52 +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
Jonathan Turner Eagles dd09c71894 YARN-1491. Upgrade JUnit3 TestCase to JUnit 4 (Chen He via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550208 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 18:09:55 +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
Jonathan Turner Eagles b43308af0b MAPREDUCE-5052. Job History UI and web services confusing job start time and job submit time (Chen He via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1549903 13f79535-47bb-0310-9956-ffa450edef68
2013-12-10 17:28:45 +00:00
Sanford Ryza 53dc832641 YARN-1448. AM-RM protocol changes to support container resizing (Wangda Tan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1549629 13f79535-47bb-0310-9956-ffa450edef68
2013-12-09 17:48:00 +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
Vinod Kumar Vavilapalli fb14656ec7 YARN-1450. Fixed test failure in TestUnmanagedAMLauncher by removing its dependency on distributed-shell. Contributed by Binglin Chang.
svn merge --ignore-ancestry -c 1548619 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548622 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 17:54:46 +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
Arun Murthy 2c217482e8 Merge -c 1548336 from trunk to branch-2 to fix YARN-1438. Ensure container diagnostics includes exception from container launch. Contributed by Steve Loughran.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548337 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 00:26:03 +00:00
Karthik Kambatla 2ed6ee6fe0 YARN-1181. Augment MiniYARNCluster to support HA mode (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548333 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 00:10:03 +00:00
Sanford Ryza 7505baf49f YARN-1447. Common PB type definitions for container resizing. (Wangda Tan via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548321 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 22:27:53 +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
Sanford Ryza cf465c26a8 YARN-1332. In TestAMRMClient, replace assertTrue with assertEquals where possible (Sebastian Wong via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547642 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 23:23:49 +00:00
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
Arun Murthy f5dc7b0c6b Renamed releases. 2.2.1 -> 2.3.0 & 2.3.0 -> 2.4.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547140 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 18:43:55 +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 c2ff57f804 YARN-1314. Fixed DistributedShell to not fail with multiple arguments for a shell command separated by spaces. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1545486 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545487 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 01:10:51 +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
Vinod Kumar Vavilapalli c282e06097 YARN-1320. Fixed Distributed Shell application to respect custom log4j properties file. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1544364 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544365 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 23:17:48 +00:00
Vinod Kumar Vavilapalli 83e907c32c YARN-1303. Reverted the wrong patch committed earlier and committing the correct patch now. In one go.
svn merge --ignore-ancestry -c 1544029 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544030 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 04:11:22 +00:00
Vinod Kumar Vavilapalli 8f5ec0f5f8 YARN-1303. Fixed DistributedShell to not fail with multiple commands separated by a semi-colon as shell-command. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1544023 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544024 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 03:47:27 +00:00
Bikas Saha eb97badbcd Merge r1543973 from trunk to branch-2 for YARN-1053. Diagnostic message from ContainerExitEvent is ignored in ContainerImpl (Omkar Vinit Joshi via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543974 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 22:29:16 +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 20c176fe27 Move YARN-1407 under 2.2.1 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543682 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 00:52:39 +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