Commit Graph

1058 Commits

Author SHA1 Message Date
Junping Du 62497eb64f Merge r1593804 from trunk: YARN-2011. Fix typo and warning in TestLeafQueue (Contributed by Chen He)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593805 13f79535-47bb-0310-9956-ffa450edef68
2014-05-11 15:16:32 +00:00
Karthik Kambatla 884ff10d48 YARN-1987. Wrapper for leveldb DBIterator to aid in handling database exceptions. (Jason Lowe via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593758 13f79535-47bb-0310-9956-ffa450edef68
2014-05-11 06:20:00 +00:00
Vinod Kumar Vavilapalli a098b692f4 YARN-1962. Changed Timeline Service client configuration to be off by default given the non-readiness of the feature yet. Contributed by Mohammad Kamrul Islam.
svn merge --ignore-ancestry -c 1593750 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593751 13f79535-47bb-0310-9956-ffa450edef68
2014-05-11 00:15:48 +00:00
Vinod Kumar Vavilapalli 914c871296 YARN-1982. Renamed the daemon name to be TimelineServer instead of History Server and deprecated the old usage. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1593748 ../../trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593749 13f79535-47bb-0310-9956-ffa450edef68
2014-05-11 00:05:31 +00:00
Junping Du 4b27c6882a Merge r1593660 from trunk: YARN-766. TestNodeManagerShutdown in branch-2 should use Shell to form the output path and a format issue in trunk. (Contributed by Siddharth Seth)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593661 13f79535-47bb-0310-9956-ffa450edef68
2014-05-10 03:47:43 +00:00
Sanford Ryza 29a124d09d YARN-2036. Document yarn.resourcemanager.hostname in ClusterSetup (Ray Chiang via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593632 13f79535-47bb-0310-9956-ffa450edef68
2014-05-09 22:19:14 +00:00
Zhijie Shen cf42886750 YARN-1701. Improved default paths of the timeline store and the generic history store. Contributed by Tsuyoshi Ozawa.
svn merge --ignore-ancestry -c 1593481 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593484 13f79535-47bb-0310-9956-ffa450edef68
2014-05-09 04:26:36 +00:00
Sanford Ryza 4518a0db27 YARN-1864. Fair Scheduler Dynamic Hierarchical User Queues (Ashwin Shankar via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593192 13f79535-47bb-0310-9956-ffa450edef68
2014-05-08 07:23:19 +00:00
Arpit Agarwal c03108299b YARN-2018: Merging r1592783 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592784 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 15:47:01 +00:00
Junping Du ffb4fc03c2 Merge r1592197 from trunk: YARN-1201. TestAMAuthorization fails with local hostname cannot be resolved. (Wangda Tan via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592198 13f79535-47bb-0310-9956-ffa450edef68
2014-05-03 13:06:32 +00:00
Vinod Kumar Vavilapalli 0a914b61e0 YARN-1696. Added documentation for ResourceManager fail-over. Contributed by Karthik Kambatla, Masatake Iwasaki, Tsuyoshi OZAWA.
svn merge --ignore-ancestry -c 1591416 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591417 13f79535-47bb-0310-9956-ffa450edef68
2014-04-30 18:01:05 +00:00
Vinod Kumar Vavilapalli 4c1f66d7fa YARN-1929. Fixed a deadlock in ResourceManager that occurs when failover happens right at the time of shutdown. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1591071 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591072 13f79535-47bb-0310-9956-ffa450edef68
2014-04-29 19:50:17 +00:00
Jason Darrell Lowe 413d84fabb svn merge -c 1591030 FIXES: YARN-738. TestClientRMTokens is failing irregularly while running all yarn tests. Contributed by Ming Ma
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591031 13f79535-47bb-0310-9956-ffa450edef68
2014-04-29 17:49:09 +00:00
Sanford Ryza 44d9ee78e9 YARN-483. Improve documentation on log aggregation in yarn-default.xml (Akira Ajisaka via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590151 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 21:14:25 +00:00
Jing Zhao fa6c972283 HADOOP-10535. Merge r1589905 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589906 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 23:05:25 +00:00
Jason Darrell Lowe fa9fea80e2 svn merge -c 1589859 FIXES: YARN-1975. Used resources shows escaped html in CapacityScheduler and FairScheduler page. Contributed by Mit Desai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589860 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 20:06:44 +00:00
Chris Nauroth de1f0bf3e4 YARN-1970. Merging change r1589001 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589004 13f79535-47bb-0310-9956-ffa450edef68
2014-04-21 23:39:16 +00:00
Ivan Mitic 2fb649a668 YARN-1865 Merging change r1588693 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588696 13f79535-47bb-0310-9956-ffa450edef68
2014-04-19 19:00:42 +00:00
Jason Darrell Lowe 1b0ed842d0 svn merge -c 1588572 FIXES: YARN-1932. Javascript injection on the job status page. Contributed by Mit Desai
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588573 13f79535-47bb-0310-9956-ffa450edef68
2014-04-18 21:46:14 +00:00
Jason Darrell Lowe ccec38b801 svn merge -c 1588546 FIXES: YARN-1940. deleteAsUser() terminates early without deleting more files on error. Contributed by Rushabh S Shah
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588549 13f79535-47bb-0310-9956-ffa450edef68
2014-04-18 19:36:18 +00:00
Vinod Kumar Vavilapalli 1aad26034b YARN-1281. Fixed TestZKRMStateStoreZKClientConnections to not fail intermittently due to ZK-client timeouts. Contributed by Tsuyoshi Ozawa.
svn merge --ignore-ancestry -c 1588369 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588371 13f79535-47bb-0310-9956-ffa450edef68
2014-04-17 20:58:23 +00:00
Junping Du e39ce638b6 Merge r1588365 from trunk: YARN-1947. TestRMDelegationTokens#testRMDTMasterKeyStateOnRollingMasterKey is failing intermittently. (Jian He via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588367 13f79535-47bb-0310-9956-ffa450edef68
2014-04-17 20:30:30 +00:00
Junping Du 8c23c3295a Merge r1588343 from trunk: YARN-1750. TestNodeStatusUpdater#testNMRegistration is incorrect in test case. (Wangda Tan via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588347 13f79535-47bb-0310-9956-ffa450edef68
2014-04-17 19:13:17 +00:00
Junping Du d0db2c2b78 Merge r1588324 from trunk: YARN-1870. FileInputStream is not closed in ProcfsBasedProcessTree#constructProcessSMAPInfo. (Fengdong Yu via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588328 13f79535-47bb-0310-9956-ffa450edef68
2014-04-17 18:09:32 +00:00
Thomas Graves bbabbe5ccb Merge 1588281 to branch-2. YARN-1931. Private API change in YARN-1824 in 2.4 broke compatibility with previous releases (Sandy Ryza via tgraves)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588283 13f79535-47bb-0310-9956-ffa450edef68
2014-04-17 15:25:27 +00:00
Jian He 838602d23a Merge r1587776 from trunk. YARN-1934. Fixed a potential NPE in ZKRMStateStore caused by handling Disconnected event from ZK. Contributed by Karthik Kambatla
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587778 13f79535-47bb-0310-9956-ffa450edef68
2014-04-16 02:03:54 +00:00
Zhijie Shen 7c7d00d779 YARN-1892. Improved some logs in the scheduler. Contributed by Jian He.
svn merge --ignore-ancestry -c 1587717 ../../trunk/


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


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


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587105 13f79535-47bb-0310-9956-ffa450edef68
2014-04-13 21:52:09 +00:00
Sanford Ryza 755e8c684c YARN-1923. Make Fair Scheduler resource ratio calculations terminate faster (Anubhav Dhoot via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586795 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 23:23:33 +00:00
Vinod Kumar Vavilapalli 0f6040a27b YARN-1833. Relocating CHANGES.txt entry in trunk and branch-2 to the right location.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586769 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 20:28:27 +00:00
Vinod Kumar Vavilapalli dcabf5ceeb YARN-1907. Merged into branch-2.4 also.
svn merge --ignore-ancestry -c 1585992 ../../trunk/ onto branch-2.4.
Fixed CHANGES.txt entries too.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586767 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 20:23:09 +00:00
Vinod Kumar Vavilapalli 757a2e8249 YARN-1883. Merged into branch-2.4 also.
svn merge --ignore-ancestry -c 1582862 ../../trunk/ onto branch-2.4.
Fixed CHANGES.txt entries too.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586766 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 20:16:10 +00:00
Jonathan Turner Eagles fbc9db6954 HADOOP-8826. Docs still refer to 0.20.205 as stable line (Mit Desai via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586687 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 15:38:06 +00:00
Vinod Kumar Vavilapalli 799774859d YARN-1926. Changed DistributedShell to use appIDs as unique identifiers for HDFS paths and thus avoid test failures on Windows. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1586562 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586564 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 04:07:11 +00:00
Zhijie Shen befba101f3 YARN-1924. Made ZKRMStateStore updateApplication(Attempt)StateInternal work when Application(Attempt) state hasn't been stored before. Contributed by Jian He.
svn merge --ignore-ancestry -c 1586547 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586548 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 03:38:27 +00:00
Jian He 9df6ddd282 Merge r1586522 from trunk. YARN-1903. Set exit code and diagnostics when container is killed at NEW/LOCALIZING state. Contributed by Zhijie Shen
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586523 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 01:28:22 +00:00
Vinod Kumar Vavilapalli 51a39fdbb9 YARN-1914. Fixed resource-download on NodeManagers to skip permission verification of public cache files in Windows+local file-system environment. Contribued by Varun Vasudev.
svn merge --ignore-ancestry -c 1586434 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586435 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 19:28:56 +00:00
Zhijie Shen 874b4979d0 YARN-1920. Fixed TestFileSystemApplicationHistoryStore failure on windows. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1586414 ../../trunk/


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


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586193 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 01:37:22 +00:00
Kihwal Lee f10bf59e6e svn merge -c 1585992 merging from trunk to branch-2 to fix:YARN-1907. TestRMApplicationHistoryWriter#testRMWritingMassiveHistory intermittently fails. Contributed by Mit Desai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585993 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 15:35:13 +00:00
Steve Loughran 770aef5053 HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585933 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 11:11:31 +00:00
Karthik Kambatla fa3c632fb2 YARN-1784. TestContainerAllocation assumes CapacityScheduler. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585895 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 05:55:11 +00:00
Vinod Kumar Vavilapalli ade0ff5b06 YARN-1908. Fixed DistributedShell to not fail in secure clusters. Contributed by Vinod Kumar Vavilapalli and Jian He.
svn merge --ignore-ancestry -c 1585849 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585850 13f79535-47bb-0310-9956-ffa450edef68
2014-04-08 22:12:17 +00:00
Karthik Kambatla a2cdf208dd YARN-1757. NM Recovery. Auxiliary service support. (Jason Lowe via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585784 13f79535-47bb-0310-9956-ffa450edef68
2014-04-08 17:17:59 +00:00
Chris Nauroth 48ad73577b YARN-1905. Merging change r1585376 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585378 13f79535-47bb-0310-9956-ffa450edef68
2014-04-07 03:08:54 +00:00
Arun Murthy 243bb224a2 Merge -c 1584954 from trunk to branch-2 to fix YARN-1898. Addendum patch to ensure /jmx and /metrics are re-directed to Active RM.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584955 13f79535-47bb-0310-9956-ffa450edef68
2014-04-05 02:52:35 +00:00
Jian He 85c733feee Merge r1584862 from trunk. YARN-1837. Fixed TestMoveApplication#testMoveRejectedByScheduler failure. Contributed by Hong Zhiguo
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584863 13f79535-47bb-0310-9956-ffa450edef68
2014-04-04 18:43:59 +00:00
Zhijie Shen d5f1c9a044 YARN-1898. Made Standby RM links conf, stacks, logLevel, metrics, jmx, logs and static not be redirected to Active RM. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1583833 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583835 13f79535-47bb-0310-9956-ffa450edef68
2014-04-02 00:05:15 +00:00
Sanford Ryza 06d62b1982 YARN-1889. In Fair Scheduler, avoid creating objects on each call to AppSchedulable comparator (Hong Zhiguo via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583494 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 23:53:58 +00:00