Commit Graph

5929 Commits

Author SHA1 Message Date
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
Chris Nauroth c11a2df1e4 HDFS-6008. Merging change r1571881 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571883 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 00:33:20 +00:00
Chris Nauroth 4f08024f65 HDFS-6006. Merging change r1571813 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571815 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 20:27:43 +00:00
Jing Zhao 70707e613a HDFS-5939. Merge change r1571781 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571782 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 18:39:50 +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
Arpit Agarwal 596a196c1c HDFS-5922. Merging r1571542 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571543 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 02:18:06 +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 a6529b363c MAPREDUCE-5761. Added a simple log message to denote when encrypted shuffle is on in the shuffle-handler. Contributed by Jian He.
svn merge --ignore-ancestry -c 1571514 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571515 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 01:24:50 +00:00
Michael Stack 5f3f90a640 HDFS-5776 Support 'hedged' reads in DFSClient (Liang Xie via stack)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571479 13f79535-47bb-0310-9956-ffa450edef68
2014-02-24 22:53:07 +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
Aaron Myers bd10814f31 HADOOP-10070. RPC client doesn't use per-connection conf to determine server's expected Kerberos principal name. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570777 13f79535-47bb-0310-9956-ffa450edef68
2014-02-22 01:12:13 +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
Arpit Agarwal 82095e0811 HADOOP-10278. Merging r1570703 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570704 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 20:54:53 +00:00
Jing Zhao fc5238cd1f HDFS-5935. Merge change r1570663 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570664 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 18:57:41 +00:00
Jonathan Turner Eagles 555d4b513f MAPREDUCE-5688. TestStagingCleanup fails intermittently with JDK7 (Mit Desai via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570635 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 16:53:15 +00:00
Jonathan Turner Eagles 9ffb6429a4 MAPREDUCE-5671. NaN can be created by client and assign to Progress (Chen He via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570623 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 16:32:52 +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
Chris Nauroth 0b217b4952 HDFS-5981. Merging change r1570468 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570470 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 06:46:50 +00:00
Jing Zhao bb8da67817 HADOOP-10355. Merge change r1570460 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570464 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 06:17:59 +00:00
Andrew Wang 3be91de5fc HDFS-5988. Bad fsimage always generated after upgrade. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570431 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 02:53:44 +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
Jing Zhao 9bc374a0bf HDFS-5982. Merge change r1570395 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570398 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 00:17:04 +00:00
Brandon Li 368def7c60 Merging change r1570366 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570372 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 22:32:49 +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
Chris Nauroth 631a915b94 HADOOP-10328. Merging change r1570304 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570305 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 19:04:04 +00:00
Jing Zhao 7ba83fb31b HADOOP-10348. Deprecate hadoop.ssl.configuration in branch-2, and remove it in trunk. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570297 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 18:41:06 +00:00
Kihwal Lee 266a2aadf6 svn merge -c 1570252 meging from trunk to branch-2 to fix:HDFS-5962. Mtime and atime are not persisted for symbolic links.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570255 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 16:16:32 +00:00
Andrew Wang 7feb5bc8aa HDFS-5979. Typo and logger fix for fsimage PB code. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570071 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 03:27:14 +00:00
Arpit Agarwal 10e98ce6bb HDFS-5742. Merging r1570067 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570068 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 03:21:26 +00:00
Arpit Agarwal 01730690f3 HDFS-5483. Merging r1570040 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570041 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 01:44:36 +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
Arpit Agarwal bc56aae9dc HDFS-5868. Merging r1569978 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569982 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 23:42:03 +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
Arpit Agarwal df72553cba HDFS-5318. Merging r1569951 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569959 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 23:08:29 +00:00
Colin McCabe 287536ef9d HDFS-5973. add DomainSocket#shutdown method. (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569952 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 23:01:49 +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
Kihwal Lee 6edf8860ef svn merge -c 1569789 merging from trunk to branch-2 to fix:HDFS-5961. OIV cannot load fsimages containing a symbolic link.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569790 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 15:30:34 +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
Colin McCabe 3aa93a1702 Update change description for HDFS-5953
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569580 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 01:06:05 +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
Jing Zhao d6ed3df506 HDFS-5893. Merge change r1569477 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569478 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 19:08:43 +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