4bdb4a9b16
YARN-1761. Modified RMAdmin CLI to check whether HA is enabled or not before it executes any of the HA admin related commands. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1574661 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574662 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 21:08:20 +00:00
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
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
b5e010ca0d
YARN-1768. Fixed error message being too verbose when killing a non-existent application. Contributed by Tsuyoshi Ozawa
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574403 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 09:45:28 +00:00
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
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
f2d48add16
YARN-1730. Implemented simple write-locking in the LevelDB based timeline-store. Contributed by Billie Rinaldi.
...
svn merge --ignore-ancestry -c 1574145 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574146 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 17:34:01 +00:00
289be46e09
YARN-1729. Made TimelineWebServices deserialize the string primary- and secondary-filters param into the JSON-compatible object. Contributed by Billie Rinaldi.
...
svn merge --ignore-ancestry -c 1573825 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573826 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 00:23:23 +00:00
ecb6019688
YARN-1748. Excluded core-site.xml from hadoop-yarn-server-tests package's jar and thus avoid breaking downstream tests. Contributed by Sravya Tirukkovalur.
...
svn merge --ignore-ancestry -c 1573795 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573796 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 23:09:31 +00:00
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
5ea4206137
YARN-1704. Modified LICENSE and NOTICE files to reflect newly used levelDB related libraries. Contributed by Billie Rinaldi.
...
svn merge --ignore-ancestry -c 1573702 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573704 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 19:53:53 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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 1570914https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570915 13f79535-47bb-0310-9956-ffa450edef68
2014-02-22 20:47:24 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
840833e86a
Move YARN-1692 in CHANGES.txt
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567791 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 23:13:08 +00:00
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
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
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
4e3aff0e25
Fix YARN-1697 in CHANGES.txt
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567554 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 08:06:42 +00:00
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
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
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
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
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
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
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
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
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
3de6a0219e
Preparing to release hadoop-2.3.0
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567112 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 13:27:18 +00:00
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
7ce60ec1fa
YARN-1698. Fixed default TimelineStore in code to match what is documented in yarn-default.xml. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1566937 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1566938 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 01:05:44 +00:00
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
f181cf0a3b
YARN-1637. Implemented a client library for Java users to post timeline entities and events. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1566752 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1566753 13f79535-47bb-0310-9956-ffa450edef68
2014-02-10 21:33:41 +00:00
c9b6c3c36c
YARN-1635. Implemented a Leveldb based ApplicationTimelineStore. Contributed by Billie Rinaldi.
...
svn merge --ignore-ancestry -c 1565868 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565869 13f79535-47bb-0310-9956-ffa450edef68
2014-02-08 02:18:06 +00:00
49389403d6
YARN-1672. YarnConfiguration is missing a default for yarn.nodemanager.log.retain-seconds (Naren Koneru via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565867 13f79535-47bb-0310-9956-ffa450edef68
2014-02-08 01:56:10 +00:00
0b17921109
YARN-1493,YARN-1490,YARN-1041, YARN-1166,YARN-1566,YARN-1689,YARN-1661 are reverted from branch-2.3. Updating YARN's CHANGES.txt.
...
svn merge --ignore-ancestry -c 1565805 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565806 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 20:40:58 +00:00
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
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
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
e05f49778b
YARN-1661. Fixed DS ApplicationMaster to write the correct exit log. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1565394 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565397 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 18:59:21 +00:00
ed2a0ec7f6
YARN-1628. Fixed the test failure in TestContainerManagerSecurity. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1565094 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565096 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 07:23:35 +00:00
a30e1889a6
YARN-1636. Augmented Application-history server's web-services to also expose new APIs for retrieving and storing timeline information. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1564829 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564830 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 17:03:01 +00:00
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
cc582a1e45
YARN-1634. Added a testable in-memory implementation of ApplicationTimelineStore. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1564583 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564585 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 00:32:40 +00:00
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
d4fbe5c747
YARN-1684. Fixed history server heap size in yarn script. Contributed by Billie Rinaldi.
...
svn merge --ignore-ancestry -c 1564193 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564195 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 04:47:23 +00:00
bb7e96ed31
YARN-1285. Changed the default value of yarn.acl.enable in yarn-default.xml to be consistent with what exists (false) in the code and documentation. Contributed by Kenji Kikushima.
...
svn merge --ignore-ancestry -c 1564190 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564191 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 04:23:35 +00:00
d349a29b7e
YARN-1673. Fix option parsing in YARN's application CLI after it is broken by YARN-967. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1564188 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564189 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 04:08:51 +00:00
91474250c3
Fixing YARN CHANGES.txt merge issue in the last commit.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564131 13f79535-47bb-0310-9956-ffa450edef68
2014-02-03 23:38:24 +00:00
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
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
fb892d8f84
YARN-1659. Defined the ApplicationTimelineStore store as an abstraction for implementing different storage impls for storing timeline information. Contributed by Billie Rinaldi.
...
svn merge --ignore-ancestry -c 1564037 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564038 13f79535-47bb-0310-9956-ffa450edef68
2014-02-03 20:07:55 +00:00
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
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
ef4cbe7c15
HADOOP-10085. CompositeService should allow adding services while being inited. (Steve Loughran via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563696 13f79535-47bb-0310-9956-ffa450edef68
2014-02-02 19:52:40 +00:00
a420b40e00
YARN-1633. Defined user-facing entity, entity-info and event objects related to Application Timeline feature. Contributed by Zhijie Shen.
...
svn merge -c 1563356 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563357 13f79535-47bb-0310-9956-ffa450edef68
2014-02-01 00:10:26 +00:00
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
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
bf1487b457
Updating branch-2's YARN CHANGES.txt after YARN-321 merge.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562951 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 20:40:25 +00:00
53e18e58ee
Updating branch-2's YARN's CHANGES.txt to reflect the recent rebase of unreleased 2.3 to more latest branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562935 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 19:57:22 +00:00
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
bdb642032c
svn merge -c 1562482 FIXES: YARN-1600. RM does not startup when security is enabled without spnego configured. Contributed by Haohui Mai
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562483 13f79535-47bb-0310-9956-ffa450edef68
2014-01-29 15:35:25 +00:00
a01eba048b
YARN-1630. Introduce timeout for async polling operations in YarnClientImpl (Aditya Acharya via Sandy Ryza)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562290 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 22:30:45 +00:00
55b56f3bcf
YARN-321. Changed hadoop-yarn-server-applicationhistoryservice/pom.xml to point to 2.4.0 so as to be able to compile the branch post YARN-321 merge.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562228 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 21:03:34 +00:00
060411928c
YARN-1613. Fixed the typo with the configuration name YARN_HISTORY_SERVICE_ENABLED. Contributed by Akira Ajisaka.
...
svn merge --ignore-ancestry -c 1561461 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562226 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:51:58 +00:00
65a9a46f2c
YARN-1625. Fixed RAT warnings after YARN-321 merge. Contributed by Shinichi Yamashita.
...
svn merge --ignore-ancestry -c 1561458 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562225 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:50:39 +00:00
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
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
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
ff83e97655
YARN-1596. Fixed Javadoc warnings on branch YARN-321. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1557957 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562215 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:14:54 +00:00
b097cd83d6
YARN-1594. Updated pom.xml of applicationhistoryservice sub-project according to YARN-888. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1557953 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562214 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:13:26 +00:00
8c514697cf
Fixing YARN CHANGES.txt issues with the previous commit.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562212 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:11:48 +00:00
b5f7745140
YARN-321. Relocating CHANGES.txt for the entries corresponding to YARN-321 branch for minimizing conflicts.
...
svn merge --ignore-ancestry -c 1557889 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562211 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:08:05 +00:00
b6eb90370a
YARN-1555. Fixed test failures in applicationhistoryservice.* (Vinod Kumar Vavilapalli via mayank)
...
svn merge --ignore-ancestry -c 1556753 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562207 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:03:42 +00:00
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
1b20412d06
YARN-1534. Fixed failure of test TestAHSWebApp. Contributed by Shinichi Yamashita.
...
svn merge --ignore-ancestry -c 1556751 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562205 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:02:34 +00:00
c31729d1d4
YARN-1023. Added Webservices REST APIs support for Application History. Contributed Zhijie Shen.
...
svn merge --ignore-ancestry -c 1556749 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562203 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:01:12 +00:00
b7a3d0ae93
YARN-967. Added the client and CLI interfaces for obtaining ApplicationHistory data. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1556747 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562202 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 20:00:38 +00:00
2de75edd46
YARN-954. Added the previously missed .keep file.
...
svn merge --ignore-ancestry -c 1556746 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562201 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:59:57 +00:00
20664c0460
YARN-954. Implemented web UI for the ApplicationHistoryServer and wired it into the HistoryStorage. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1556745 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562200 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:59:17 +00:00
8b6b88f0fa
YARN-1242. Changed yarn scripts to be able to start ApplicationHistoryServer as an individual process. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1556744 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562199 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:58:40 +00:00
3d227e9544
YARN-955. Implemented ApplicationHistoryProtocol handler. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1556743 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562198 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:58:07 +00:00
7440b97256
YARN-1266. Added files that were forgotten in the last commit.
...
svn merge --ignore-ancestry -c 1556740 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562197 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:57:33 +00:00
cee917ace9
YARN-1266. Implemented PB service and client wrappers for ApplicationHistoryProtocol. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1556739 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562193 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:57:00 +00:00
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
0d2e62ae04
YARN-987. Added ApplicationHistoryManager responsible for exposing reports to all clients. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1556736 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562189 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:53:54 +00:00
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
e8a09094f5
YARN-979. Added more APIs for getting information about ApplicationAttempts and Containers from ApplicationHistoryProtocol. Contributed by Mayank Bansal and Zhijie Shen.
...
svn merge --ignore-ancestry -c 1556731 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562187 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:52:48 +00:00
cb52671a9b
YARN-978. Updated patch for adding ApplicationAttemptReport and Protobuf implementation. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1556729 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562186 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:52:14 +00:00
7dc256706e
YARN-1123. Added a new ContainerReport and its Protobuf implementation. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1556728 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562185 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:51:39 +00:00
a47d981c6e
YARN-975. Added a file-system implementation for HistoryStorage. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1556727 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562184 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:51:02 +00:00
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
e4d6b2f485
YARN-1007. Enhance History Reader interface for Containers. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1556723 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562180 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:49:41 +00:00
ddd48ba1cb
YARN-956. Missed new files in the previous commit.
...
svn merge --ignore-ancestry -c 1556722 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562179 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:49:12 +00:00
5f61991d0d
YARN-956. Added a testable in-memory HistoryStorage. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1556721 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562178 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:48:43 +00:00
538334541f
YARN-978. Created ApplicationAttemptReport. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1556720 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562177 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:47:55 +00:00
dc513f1f87
YARN-925. Defined a Reader Interface for HistoryStorage. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1556719 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562176 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:45:58 +00:00
5682c9c945
YARN-934. Defined a Writer Interface for HistoryStorage. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1556711 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562175 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:45:24 +00:00
2135ca8623
YARN-984. Renamed the incorrectly named applicationhistoryservice.records.pb.impl package to be applicationhistoryservice.records.impl.pb. Contributed by Devaraj K.
...
svn merge --ignore-ancestry -c 1556693 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562162 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:18:17 +00:00
7e2dbda737
YARN-947. Implementing the data objects to be used by the History reader and writer interfaces. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1556692 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562159 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:10:23 +00:00
752daade51
YARN-962. Fixed bug in application-history proto file and renamed it be just a client proto file. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1556690 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562157 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:08:12 +00:00
2f75fd953d
YARN-935. Correcting pom.xml to build applicationhistoryserver module successfully. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1556686 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562156 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:06:47 +00:00
fe75149953
YARN-930. Bootstrapping ApplicationHistoryService module. Contributed by Vinod Kumar Vavilapalli.
...
svn merge --ignore-ancestry -c 1556683 ../YARN-321
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562154 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 19:02:50 +00:00
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
d225ce1ce2
YARN-1642. RMDTRenewer#getRMClient should use ClientRMProxy (kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561992 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 08:30:19 +00:00
afc40e8a66
HADOOP-10255. Merge 1561959 and 1561961 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561966 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 07:47:37 +00:00
d1d74049aa
HDFS-5297. Merging r1561849 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561854 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 21:19:16 +00:00
4fe4190b1d
svn merge -c 1561110 FIXES: YARN-1575. Public localizer crashes with "Localized unkown resource". Contributed by Jason Lowe
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561112 13f79535-47bb-0310-9956-ffa450edef68
2014-01-24 18:59:54 +00:00
f3136cd6b9
HADOOP-10167. Mark hadoop-common source as UTF-8 in Maven pom files / refactoring. Contributed by Mikhail Antonov.
...
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560832 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 22:31:27 +00:00
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
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
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
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
033d60a28f
svn merge -c 1560148 FIXES: MAPREDUCE-5693. Restore MRv1 behavior for log flush. Contributed by Gera Shegalov
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560149 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 19:27:57 +00:00
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
0fa22b8120
svn merge -c 1558948 FIXES: MAPREDUCE-5672. Provide optional RollingFileAppender for container log4j (syslog). Contributed by Gera Shegalov
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558957 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 23:13:17 +00:00
5040a1e171
YARN-1606. Fix the default value of yarn.resourcemanager.zk-timeout-ms in yarn-default.xml (kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558884 13f79535-47bb-0310-9956-ffa450edef68
2014-01-16 18:55:25 +00:00
Vinod Kumar Vavilapalli
Jian He
Karthik Kambatla
Ravi Prakash
Zhijie Shen
Junping Du
Sanford Ryza
Jonathan Turner Eagles
Arun Murthy
Jason Darrell Lowe
Suresh Srinivas
Arpit Agarwal
Konstantin Boudnik