Commit Graph

6204 Commits

Author SHA1 Message Date
Brandon Li 37c21834d9 HDFS-5886. Merging change r1566468 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1566471 13f79535-47bb-0310-9956-ffa450edef68
2014-02-09 23:32:14 +00:00
Konstantin Shvachko 4b5b591d93 HDFS-4370. Fix typo Blanacer in DataNode. Contributed by Chu Tong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1566425 13f79535-47bb-0310-9956-ffa450edef68
2014-02-09 21:08:06 +00:00
Konstantin Shvachko 66f2cf8fd1 HDFS-5837. dfs.namenode.replication.considerLoad should consider decommissioned nodes. Contributed by Tao Luo.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1566413 13f79535-47bb-0310-9956-ffa450edef68
2014-02-09 20:49:59 +00:00
Zhijie Shen 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
Karthik Kambatla 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
Colin McCabe 67dc421f84 HDFS-5882. TestAuditLogs is flaky (jxiang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565848 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 23:31:57 +00:00
Andrew Wang 47b2288595 HDFS-5900. Cannot set cache pool limit of unlimited via CacheAdmin. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565843 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 23:00:13 +00:00
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Arpit Agarwal 6729189cc2 HADOOP-10330. Merging r1565507 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565508 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 01:14:11 +00:00
Kihwal Lee 14b92d8c8c svn merge -c 1565505 merging from trunk to branch-2 to fix:HDFS-5807. TestBalancerWithNodeGroup.testBalancerWithNodeGroup fails intermittently.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565506 13f79535-47bb-0310-9956-ffa450edef68
2014-02-07 00:46:17 +00:00
Zhijie Shen 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
Karthik Kambatla d082b122f9 MAPREDUCE-5744. Job hangs because RMContainerAllocator.preemptReduce() violates the comparator contract (Gera Shegalov via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565479 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 23:31:04 +00:00
Arpit Agarwal 33641c649a HADOOP-10273. Update CHANGES.txt to reflect new target version is 2.3 (merged r1565453 from trunk to branch-2)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565454 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 21:57:22 +00:00
Chris Nauroth f6d5cce58a HDFS-5895. Merging change r1565440 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565442 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 21:20:59 +00:00
Colin McCabe a0d87e3f0c HDFS-4911. Reduce PeerCache timeout to be commensurate with dfs.datanode.socket.reuse.keepalive (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565438 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 21:12:11 +00:00
Vinod Kumar Vavilapalli 89fbc0ce18 MAPREDUCE-5743. Fixed CHANGES.txt to give credit to Ted too.
svn merge --ignore-ancestry -c 1565401 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565402 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 19:08:09 +00:00
Zhijie Shen 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
Chris Nauroth cf173a332b HADOOP-10327. Merging change r1565389 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565390 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 18:42:14 +00:00
Karthik Kambatla fa43d8fb45 MAPREDUCE-5699. Allow setting tags on MR jobs (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565385 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 18:30:43 +00:00
Kihwal Lee f56ff3b5ed svn merge -c 1565310 merging from trunk to branch-2 to fix: HDFS-5881. Fix skip() of the short-circuit local reader(legacy).
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565313 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 15:48:21 +00:00
Zhijie Shen 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
Zhijie Shen 5afaafdb7f MAPREDUCE-5743. Fixed the test failure in TestRMContainerAllocator. Contributed by Vinod Kumar Vavilapalli.
svn merge --ignore-ancestry -c 1565087 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1565088 13f79535-47bb-0310-9956-ffa450edef68
2014-02-06 06:39:29 +00:00
Jing Zhao e7e5df5b0b HDFS-5873. Merge change r1564973 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564977 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 22:53:41 +00:00
Jing Zhao 1a6bd511f2 HDFS-5876. Merge change r1564897 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564904 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 19:51:17 +00:00
Andrew Wang c1d6d047b7 Addendum patch for HDFS-5709, add missing license header.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564886 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 19:18:37 +00:00
Vinod Kumar Vavilapalli 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
Aaron Myers 852f941b3c HDFS-5709. Improve NameNode upgrade with existing reserved paths and path components. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564647 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 07:14:11 +00:00
Arpit Agarwal eb9010719e HADOOP-10273. Merging r1564638 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564639 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 05:44:45 +00:00
Zhijie Shen 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
Todd Lipcon 71ef957380 Correct CHANGES.txt entry for HDFS-5399 (contributed by Jing, not Haohui)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564631 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 04:20:40 +00:00
Todd Lipcon c1503515da HDFS-5399. Revisit SafeModeException and corresponding retry policies. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564628 13f79535-47bb-0310-9956-ffa450edef68
2014-02-05 04:18:21 +00:00
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Brandon Li fb247bbc32 HDFS-5791. Merging change r1564198 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564201 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 05:14:22 +00:00
Zhijie Shen 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Brandon Li e775dc3485 HDFS-5767. Merging change r1564141 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1564143 13f79535-47bb-0310-9956-ffa450edef68
2014-02-04 00:31:16 +00:00
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Vinod Kumar Vavilapalli 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
Karthik Kambatla 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
Junping Du ad680d119c Merge 1563640 from trunk: HDFS-5828. BlockPlacementPolicyWithNodeGroup can place multiple replicas on the same node group when dfs.namenode.avoid.write.stale.datanode is true. (Buddy via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563643 13f79535-47bb-0310-9956-ffa450edef68
2014-02-02 15:50:43 +00:00
Colin McCabe 4fa696384d HDFS-5746. Add ShortCircuitSharedMemorySegment (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563363 13f79535-47bb-0310-9956-ffa450edef68
2014-02-01 02:31:14 +00:00
Vinod Kumar Vavilapalli 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