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
Vinod Kumar Vavilapalli
04474afc81
MAPREDUCE-5770. Fixed MapReduce ApplicationMaster to correctly redirect to the YARN's web-app proxy with the correct scheme prefix. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1572711 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572712 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 19:24:49 +00:00
Karthik Kambatla
593ef7b228
YARN-1429. *nix: Allow a way for users to augment classpath of YARN daemons. (Jarek Jarcec Cecho via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572406 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 02:19:13 +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
Vinod Kumar Vavilapalli
ae456f408a
YARN-1686. Fixed NodeManager to properly handle any errors during re-registration after a RESYNC and thus avoid hanging. Contributed by Rohith Sharma.
...
svn merge --ignore-ancestry -c 1571474 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571475 13f79535-47bb-0310-9956-ffa450edef68
2014-02-24 22:42:00 +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
e23022e096
YARN-1742. Fixed javadoc of configuration parameter DEFAULT_NM_MIN_HEALTHY_DISKS_FRACTION. Contributed by Akira Ajisaka.
...
svn merge --ignore-ancestry -c 1570956 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570957 13f79535-47bb-0310-9956-ffa450edef68
2014-02-23 02:33:15 +00:00
Vinod Kumar Vavilapalli
ece585643c
YARN-1749. Updated application-history related configs to reflect the latest reality and to be consistently named. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1570948 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570949 13f79535-47bb-0310-9956-ffa450edef68
2014-02-23 02:05:28 +00:00
Vinod Kumar Vavilapalli
507ddad47f
YARN-1687. Renamed user-facing records for the timeline-service to be simply named after 'timeline' instead of 'apptimeline'. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1570922 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570924 13f79535-47bb-0310-9956-ffa450edef68
2014-02-22 20:55:42 +00:00
Vinod Kumar Vavilapalli
bd58e30fd6
YARN-1732. Changed types of related-entities and primary-filters in the timeline-service to be sets instead of maps. Contributed by Billie Rinaldi.
...
svn merge --ignore-ancestry -c 1570914
../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570915 13f79535-47bb-0310-9956-ffa450edef68
2014-02-22 20:47:24 +00:00
Karthik Kambatla
34f06451f9
YARN-1470. Add audience annotations to MiniYARNCluster. (Anubhav Dhoot via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570709 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 21:21:48 +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
Sanford Ryza
a5d2398377
YARN-1171. Add default queue properties to Fair Scheduler documentation (Naren Koneru via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569924 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 21:30:30 +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
Zhijie Shen
c244093fe2
YARN-1578. Fixed reading incomplete application attempt and container data in FileSystemApplicationHistoryStore. Contributed by Shinichi Yamashita.
...
svn merge --ignore-ancestry -c 1567816 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567817 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 00:11:04 +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
8307ca36e3
YARN-1531. True up yarn command documentation (Akira Ajisaka via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567776 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 22:31:54 +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
Zhijie Shen
d09c5d4369
YARN-1719. Fixed the root path related Jersey warnings produced in ATSWebServices. Contributed by Billie Rinaldi.
...
svn merge --ignore-ancestry -c 1567498 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567502 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 02:17:11 +00:00
Sanford Ryza
cf75df69f2
YARN-1497. Fix comment and remove accidental println
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567491 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 01:46:27 +00:00
Sanford Ryza
4032e147e8
YARN-1497. Command line additions for moving apps between queues (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567485 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 01:22:02 +00:00
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
Sanford Ryza
5bc592d88d
YARN-1697. NodeManager reports negative running containers (Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567381 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 20:50:22 +00:00
Zhijie Shen
ae6a8f28a6
YARN-1706. Created an utility method to dump timeline records to JSON strings. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1566982 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1566983 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 04:41:45 +00:00