Commit Graph

2029 Commits

Author SHA1 Message Date
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
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
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
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
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
Kihwal Lee 5c26966bb7 svn merge -c 1569391 merging from trunk to branch-2 to fix:HDFS-5803. TestBalancer.testBalancer0 fails.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569393 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 15:42:04 +00:00
Kihwal Lee 9da50ec5e6 svn merge -c 1569368. merging from trunk to branch-2 to fix:HDFS-5780. TestRBWBlockInvalidation times out intemittently.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569369 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 14:55:19 +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
Suresh Srinivas 2ad9a8d8ff HDFS-5959. Merge r1569156 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569162 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 01:54:48 +00:00
Chris Nauroth 3151800acd HDFS-5942. Merging change r1569124 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569133 13f79535-47bb-0310-9956-ffa450edef68
2014-02-17 22:42:07 +00:00
Arpit Agarwal 18d0cc96bb HDFS-5698. Update CHANGES.txt in branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568584 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 01:32:48 +00:00
Arpit Agarwal f0e7b22059 HDFS-5759. Merging r1568578 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568581 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 01:27:12 +00:00
Andrew Wang 54d43e5b41 HDFS-5953. TestBlockReaderFactory fails in trunk. (Akira Ajisaka via wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568569 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 00:52:59 +00:00
Arpit Agarwal d795cbd791 HDFS-5847. Merging r1567812 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568562 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 00:27:25 +00:00
Brandon Li fdbee9d53a HDFS-5716. Merging change r1568547 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568553 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 00:17:58 +00:00
Arpit Agarwal 9829487fff HDFS-5915. Merging r1566824 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568552 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 00:16:27 +00:00
Arpit Agarwal 25c508e425 HDFS-5698. Merge r1566359 from trunk for merging the 'Use protobuf to serialize / deserialize FSImage' feature
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568548 13f79535-47bb-0310-9956-ffa450edef68
2014-02-15 00:08:04 +00:00
Brandon Li bdb9562634 HDFS-5949. Merging change r1568536 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568537 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 22:17:34 +00:00
Arpit Agarwal d0f8a63073 HDFS-5948. Merging r1568532 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568533 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 22:00:13 +00:00
Andrew Wang be69bfc2f4 HDFS-3128. Unit tests should not use a test root in /tmp. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568527 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 21:29:36 +00:00
Jing Zhao 696859201f HDFS-5775. Merge change r1558599 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568451 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 18:47:59 +00:00
Jing Zhao 8f9e6d8fa0 HDFS-5768. Merge change r1558598 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568447 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 18:43:39 +00:00
Suresh Srinivas 73aa908be6 HDFS-5943. Merge 1568412 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568427 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 18:17:26 +00:00
Jing Zhao ced619c93e HDFS-5715 and HDFS-5726. Merge change r1556353 and r1556433 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568217 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 08:23:45 +00:00
Jing Zhao bac1ab80f0 HDFS-5632. Merge change r1550917 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568210 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 07:47:06 +00:00
Jing Zhao 7fb827fb1d HDFS-5647. Merge change r1548796 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568207 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 07:38:34 +00:00
Jing Zhao 99a661e449 HDFS-5554. Merge change r1548796 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568206 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 07:35:44 +00:00
Jing Zhao 418e152347 HDFS-5537. Merge change r1546184 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568204 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 07:18:58 +00:00
Jing Zhao ccdeeb39e1 HDFS-5286. Merge change r1545768 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568203 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 07:13:02 +00:00
Jing Zhao e1fd74bb98 HDFS-5285. Flatten INodeFile hierarchy: Add UnderContruction Feature. Merge change r1544389 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568201 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 06:59:06 +00:00
Jing Zhao f744409914 HDFS-5531. Merge change r1544018 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568186 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 01:40:08 +00:00
Brandon Li dbe7e29f0a HDFS-5901. Merging change r1568168 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568169 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 23:57:19 +00:00
Brandon Li ce1f918a32 HDFS-5934. Merging change r1568165 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568167 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 23:49:14 +00:00
Brandon Li abe64a18e4 HDFS-5913. Merging change r1568076 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568119 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 23:16:33 +00:00
Chris Nauroth 27c9d8faa7 HDFS-5941. Merging change r1568019 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568021 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 19:55:47 +00:00
Kihwal Lee a6b9cd9862 svn merge -c 1567946 merging from trunk to branch-2 to fix:HDFS-5904. TestFileStatus fails intermittently.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567947 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 15:07:34 +00:00
Colin McCabe 6bd4581910 HDFS-5940. Minor cleanups to ShortCircuitReplica, FsDatasetCache, and DomainSocketWatcher (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567838 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 03:14:00 +00:00
Brandon Li 3b1dcfd7a6 HDFS-5891. Merging change r1567810 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567813 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 00:01:55 +00:00
Colin McCabe 3e9e801868 HDFS-5938. Make BlockReaderFactory#BlockReaderPeer a static class to avoid a findbugs warning (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567768 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 22:02:23 +00:00
Colin McCabe ccdf21bfe2 HDFS-5810. Unify mmap cache and short-circuit file descriptor cache (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567728 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 19:24:46 +00:00
Suresh Srinivas a6360ccbef HDFS-5879. Merge 1567704 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567705 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 18:05:15 +00:00
Konstantin Shvachko 924be82437 HDFS-4858. HDFS DataNode to NameNode RPC should timeout. Contributed by Henry Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567537 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 07:06:44 +00:00
Colin McCabe e70faba559 HADOOP-10338. Cannot get the FileStatus of the root inode from the new Globber (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567500 13f79535-47bb-0310-9956-ffa450edef68
2014-02-12 02:16:21 +00:00
Suresh Srinivas 989f41078f HDFS-5929. Merge 1567411 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1567413 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 22:06:18 +00:00
Arun Murthy 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
Aaron Myers 8ba6bca83c HDFS-5921. Cannot browse file system via NN web UI if any directory has the sticky bit set. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1566919 13f79535-47bb-0310-9956-ffa450edef68
2014-02-11 00:47:31 +00:00
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
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
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
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
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
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
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
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
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
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
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
Jing Zhao e5ab642997 HDFS-5804. Merge change r1563323 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563332 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 23:13:20 +00:00
Colin McCabe 4a943f194c HDFS-5859. DataNode#checkBlockToken should check block tokens even if security is not enabled (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563330 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 23:09:19 +00:00
Arpit Agarwal 8ed6a8a5b2 HDFS-5153. Merging r1563254 from trunk to branch-2. (Arpit Agarwal)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563261 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 21:30:07 +00:00
Suresh Srinivas f8660819c4 HDFS-5856. Merge 1563064 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563065 13f79535-47bb-0310-9956-ffa450edef68
2014-01-31 05:38:42 +00:00
Todd Lipcon dff75d1e4b HDFS-5790. LeaseManager.findPath is very slow when many leases need recovery. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562969 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 21:21:02 +00:00
Jing Zhao 4553487c52 HDFS-5843. Merge change r1562927 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562929 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 19:22:29 +00:00
Arpit Agarwal c01108a17c HDFS-5492. Merging r1562683 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562684 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 03:28:23 +00:00
Andrew Wang 7c8fc5881c Update CHANGES.txt to move HDFS-5842 to 2.3.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562655 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 00:31:25 +00:00
Andrew Wang 3cd8495683 HDFS-5841. Update HDFS caching documentation with new changes. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562650 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 00:18:05 +00:00
Andrew Wang ec9c6aaac8 HDFS-5845. SecondaryNameNode dies when checkpointing with cache pools.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562645 13f79535-47bb-0310-9956-ffa450edef68
2014-01-30 00:00:03 +00:00
Andrew Wang 3e0bbcb688 Update HDFS and Common CHANGES.txt post branch-2.3 reswizzle.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562628 13f79535-47bb-0310-9956-ffa450edef68
2014-01-29 23:08:45 +00:00
Jing Zhao 698ed255fd HDFS-5842. Merge change r1562603 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562608 13f79535-47bb-0310-9956-ffa450edef68
2014-01-29 22:13:53 +00:00
Arpit Agarwal cbe5d1c6ad HDFS-5844. Merging -r1562357 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562358 13f79535-47bb-0310-9956-ffa450edef68
2014-01-29 04:59:26 +00:00
Suresh Srinivas 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
Arpit Agarwal 17acadd167 HDFS-5833. Merging r1561938 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561939 13f79535-47bb-0310-9956-ffa450edef68
2014-01-28 05:12:36 +00:00
Colin McCabe 858308553f HDFS-5830. WebHdfsFileSystem.getFileBlockLocations throws IllegalArgumentException when accessing another cluster. (Yongjun Zhang via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561887 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 22:25:26 +00:00
Arpit Agarwal 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
Arpit Agarwal 0d61ef5acb Merging r1561819 from trunk to branch-2 to fix CHANGES.txt for HADOOP-10086 and HADOOP-9982
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561826 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 20:04:52 +00:00
Arpit Agarwal bca2735ffa HADOOP-9982. Merge r1561813 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561815 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 19:53:26 +00:00
Jing Zhao e03c3cbfd9 HDFS-5781. Merge change r1561788 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561796 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 19:05:04 +00:00
Arpit Agarwal 8b1c7bafab HDFS-5825. Merging r1561792 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561793 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 19:02:40 +00:00
Arpit Agarwal be32b2d1ad HADOOP-10086. Merging r1561776 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561777 13f79535-47bb-0310-9956-ffa450edef68
2014-01-27 18:36:07 +00:00
Todd Lipcon 6266273c61 HDFS-5721. sharedEditsImage in Namenode#initializeSharedEdits() should be closed before method returns. Contributed by Ted Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561389 13f79535-47bb-0310-9956-ffa450edef68
2014-01-25 20:21:58 +00:00
Todd Lipcon 7c7a4463fd HDFS-5719. FSImage#doRollback() should close prevState before return. Contributed by Ted Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561388 13f79535-47bb-0310-9956-ffa450edef68
2014-01-25 20:19:28 +00:00
Uma Maheswara Rao G e67105e4ce Merge HDFS-5343. When cat command is issued on snapshot files, getting unexpected result. Contributed by Sathish.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561326 13f79535-47bb-0310-9956-ffa450edef68
2014-01-25 15:52:01 +00:00
Kihwal Lee c32beafe02 svn merge -c 1561223 merging from trunk to branch-2 to fix:HDFS-5728. Block recovery will fail if the metafile does not have crc for all chunks of the block. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1561224 13f79535-47bb-0310-9956-ffa450edef68
2014-01-24 22:57:56 +00:00
Kihwal Lee 95e3ef2ad4 svn merge -c 1560750 merging from trunk to branch-2 to fix:HDFS-5788. listLocatedStatus response can be very large. Contributed by Nathan Roberts.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560778 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 18:13:17 +00:00
Daryn Sharp 7bbd687d4d svn merge -c 1560761 FIXES: HDFS-5241. Provide alternate queuing audit logger to reduce logging contention (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560763 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 17:18:31 +00:00
Uma Maheswara Rao G 96a9a59822 Merge HDFS-5789. Some of snapshot APIs missing checkOperation double check in fsn. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560732 13f79535-47bb-0310-9956-ffa450edef68
2014-01-23 16:39:18 +00:00
Andrew Wang f7014c473c HDFS-5806. Balancer should set soTimeout to avoid indefinite hangs. Contributed by Nathan Roberts.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560549 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 22:35:13 +00:00
Andrew Wang c4194399d3 Merge HDFS-4949 changes from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560522 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 21:43:00 +00:00
Alejandro Abdelnur cab665753a HDFS-5703. Add support for HTTPS and swebhdfs to HttpFS. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560505 13f79535-47bb-0310-9956-ffa450edef68
2014-01-22 20:39:53 +00:00
Arpit Agarwal 01444ee9e1 HDFS-5434. Merging r1560217 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560218 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 23:20:55 +00:00
Brandon Li dd5de5a756 HDFS-5748. Merging change r1560215 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1560216 13f79535-47bb-0310-9956-ffa450edef68
2014-01-21 22:59:29 +00:00
Tsz-wo Sze f1756982de svn merge -c 1559701 from trunk for HDFS-5800. Fix a typo in DFSClient.renewLease().
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1559702 13f79535-47bb-0310-9956-ffa450edef68
2014-01-20 14:08:58 +00:00
Colin McCabe c5083c041e HDFS-5784. reserve space in the edit log header and fsImage header for feature flag section (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1559295 13f79535-47bb-0310-9956-ffa450edef68
2014-01-18 00:18:49 +00:00
Jing Zhao 5736c7ad1b Merge change r1558255 (HDFS-5704) and r1558675 (HDFS-5777) to branch-2: Change OP_UPDATE_BLOCKS with a new OP_ADD_BLOCK,and update the LayoutVersion
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1559224 13f79535-47bb-0310-9956-ffa450edef68
2014-01-17 19:07:08 +00:00
Colin McCabe 40c1d3a6d6 HDFS-5766. In DFSInputStream, do not add datanode to deadNodes after InvalidEncryptionKeyException in fetchBlockByteRange (Liang Xie via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558535 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 19:23:21 +00:00
Colin McCabe f5961ec9df HDFS-5762. BlockReaderLocal does not return -1 on EOF when doing zero-length reads (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558528 13f79535-47bb-0310-9956-ffa450edef68
2014-01-15 19:19:12 +00:00
Konstantin Boudnik 511f5136f8 HDFS-5677. Merge 1558217 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558220 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 22:02:32 +00:00
Konstantin Boudnik c9e403f652 Adding 2.0.6-alpha release to the CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1558216 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 21:52:06 +00:00
Jing Zhao 56e4457d22 HDFS-5579. Merge change r1557904 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557907 13f79535-47bb-0310-9956-ffa450edef68
2014-01-14 02:23:42 +00:00
Jing Zhao 716074bc80 HDFS-5710. Merge change r1557803 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557805 13f79535-47bb-0310-9956-ffa450edef68
2014-01-13 18:40:37 +00:00
Arpit Agarwal a96ff86044 HDFS-5747. Merging r1557289 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557291 13f79535-47bb-0310-9956-ffa450edef68
2014-01-11 00:14:19 +00:00
Andrew Wang 5ecbc62eee HDFS-5756. hadoopRzOptionsSetByteBufferPool does not accept NULL argument, contrary to docs. Contributed by Colin Patrick McCabe.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1557245 13f79535-47bb-0310-9956-ffa450edef68
2014-01-10 20:11:49 +00:00
Kihwal Lee 98e8b1155f HDFS-5449. WebHdfs compatibility broken between 2.2 and 1.x / 23.x. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556928 13f79535-47bb-0310-9956-ffa450edef68
2014-01-09 19:28:42 +00:00
Brandon Li 531605ef28 HDFS-5649. Merging change 1556405 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556409 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 23:56:02 +00:00
Arpit Agarwal 4c4ceedd38 HDFS-2832. Update editsStored and editsStored.xml for tests.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556340 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 20:15:50 +00:00
Arpit Agarwal 70ee0a35fb HDFS-5667. Merge r1555929 and r1555956 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556087 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 00:38:35 +00:00
Arpit Agarwal 1ec54d9532 HDFS-5406. Update CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556085 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 00:31:04 +00:00
Arpit Agarwal a7417a0af9 HDFS-5406. Merge r1551093 and r1551110 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556084 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 00:29:44 +00:00
Arpit Agarwal fe95f9a81f HDFS-5454. Merge r1551296 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556083 13f79535-47bb-0310-9956-ffa450edef68
2014-01-07 00:26:06 +00:00
Arpit Agarwal 4f044fc5ff HDFS-2832. Merge r1550363 from trunk for merging HDFS Heterogeneous Storage feature phase 1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1556076 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 23:58:33 +00:00
Colin McCabe 5745523e98 HDFS-5220 Expose group resolution time as metric (jxiang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1555986 13f79535-47bb-0310-9956-ffa450edef68
2014-01-06 19:30:13 +00:00
Jing Zhao 1d6d0b823f HDFS-5695. Merge change r1555164 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1555166 13f79535-47bb-0310-9956-ffa450edef68
2014-01-03 17:47:26 +00:00
Uma Maheswara Rao G 1df8cb9ce0 Merge. HDFS-5671. Fix socket leak in DFSInputStream#getBlockReader. Contributed by JamesLi
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554556 13f79535-47bb-0310-9956-ffa450edef68
2013-12-31 16:26:48 +00:00
Colin McCabe aa78eefe38 HDFS-5582. hdfs getconf -excludeFile or -includeFile always failed (satish via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554297 13f79535-47bb-0310-9956-ffa450edef68
2013-12-30 19:36:26 +00:00
Konstantin Shvachko fda1b24acf HDFS-5675. Add Mkdirs operation to NNThroughputBenchmark. Contributed by Plamen Jeliazkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1554074 13f79535-47bb-0310-9956-ffa450edef68
2013-12-29 21:28:27 +00:00
Jing Zhao 60f8b513f1 HDFS-5690. Merge change r1553167 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1553168 13f79535-47bb-0310-9956-ffa450edef68
2013-12-23 18:28:09 +00:00
Suresh Srinivas 82ce19829d HDFS-5691. Merge 1552802 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552803 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 20:09:21 +00:00
Kihwal Lee 9c0060ead8 svn merge -c 1552711 merging from trunk to branch-2 to fix HDFS-5681. renewLease should not hold fsn write lock.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552713 13f79535-47bb-0310-9956-ffa450edef68
2013-12-20 16:07:02 +00:00
Junping Du 35dda73fba Merge 1552256 from trunk: HDFS-5540. Fix intermittent failure in TestBlocksWithNotEnoughRacks. (Binglin Chang via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552278 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 10:10:24 +00:00
Michael Stack 3d22b5fd40 HDFS-5663 make the retry time and interval value configurable in openInfo()
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552236 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 06:14:13 +00:00
Michael Stack 4f5cac8601 HDFS-5663 make the retry time and interval value configurable in openInfo()
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552235 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 06:05:43 +00:00
Jing Zhao 8dbe8d2165 HDFS-5661. Merge change r1552177 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552180 13f79535-47bb-0310-9956-ffa450edef68
2013-12-19 00:31:25 +00:00
Colin McCabe 2ebc126b9e HDFS-5676. fix inconsistent synchronization of CachingStrategy (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552164 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 23:30:08 +00:00
Brandon Li 48a9215359 HDFS-5662. Merging change r1552131 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552135 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 22:36:21 +00:00
Colin McCabe d6f80a1ce8 HDFS-5634. Allow BlockReaderLocal to switch between checksumming and not (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1552119 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 21:55:38 +00:00
Tsz-wo Sze 165c6cb1d3 svn merge -c 1551812 from trunk for HDFS-5674. Editlog code cleanup: remove @SuppressWarnings("deprecation") in FSEditLogOp; change FSEditLogOpCodes.fromByte(..) to be more efficient; and change Some fields in FSEditLog to final.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551813 13f79535-47bb-0310-9956-ffa450edef68
2013-12-18 02:50:01 +00:00
Jing Zhao 7a3ac36ede HDFS-5629. Merge change r1549692 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551723 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 21:31:12 +00:00
Jing Zhao 246e9cb136 HDFS-5312. Merge change r1548629 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551721 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 21:25:05 +00:00
Jing Zhao b19b529f38 HDFS-5536. Merge change r1547925 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551715 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 21:18:38 +00:00
Brandon Li c143486c17 HDFS-5657. Merging change r1551691 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551705 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 21:01:33 +00:00
Jing Zhao 88d09130e8 HDFS-5545. Merge change r1546151 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551703 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 20:59:27 +00:00
Jing Zhao 1b00e40a30 HDFS-5538. Merge change r1545491 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551692 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 20:45:27 +00:00
Andrew Wang e8b27cc5a2 HDFS-5350. Name Node should report fsimage transfer time as a metric. Contributed by Jimmy Xiang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551427 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 00:48:04 +00:00
Colin McCabe bbc30c2607 HDFS-5666. Fix inconsistent synchronization in BPOfferService (jxiang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551302 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 18:35:53 +00:00
Uma Maheswara Rao G 659cb9d9f7 HDFS-5592. statechangeLog of completeFile should be logged only in case of success. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1551147 13f79535-47bb-0310-9956-ffa450edef68
2013-12-16 09:56:07 +00:00
Junping Du 888593c1dc Merge 1550620 from trunk: HDFS-5652. Refactor invalid block token exception handling in DFSInputStream. (Liang Xie via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550623 13f79535-47bb-0310-9956-ffa450edef68
2013-12-13 03:01:05 +00:00
Junping Du 059b0dffd5 Merge 1550335 from trunk: HDFS-5637. Try to refeatchToken while local read InvalidToken occurred. (Liang Xie via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550339 13f79535-47bb-0310-9956-ffa450edef68
2013-12-12 03:25:06 +00:00
Colin McCabe 36488a641a HDFS-4201. NPE in BPServiceActor#sendHeartBeat (jxiang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550268 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 21:30:07 +00:00
Jonathan Turner Eagles 52125d151d HDFS-5023. TestSnapshotPathINodes.testAllowSnapshot is failing with jdk7 (Mit Desai via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550266 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 21:24:41 +00:00
Junping Du 29848761ea Merge 1550074 from trunk: HDFS-5580. Fix infinite loop in Balancer.waitForMoveCompletion. (Binglin Chang via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550078 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 09:13:45 +00:00
Colin McCabe c9ad1bb3aa HADOOP-10020. disable symlinks temporarily (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550034 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 02:44:35 +00:00
Jing Zhao 4f7ae17602 Move HDFS-5283 to section branch-2.3.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550033 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 02:34:23 +00:00
Aaron Myers 8cc6fd847f Move entry for HDFS-5074 to correct section.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550026 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 02:01:20 +00:00
Aaron Myers 75e97fc4bf HDFS-5074. Allow starting up from an fsimage checkpoint in the middle of a segment. Contributed by Todd Lipcon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550021 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 01:49:29 +00:00
Jing Zhao 39a506d5a0 Merge change r1550011 from trunk: Move HDFS-5257,HDFS-5427,HDFS-5443,HDFS-5476,HDFS-5425,HDFS-5474,HDFS-5504,HDFS-5428 into branch-2.3 section.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1550012 13f79535-47bb-0310-9956-ffa450edef68
2013-12-11 01:10:42 +00:00
Andrew Wang 507ce20d4f Move HDFS-4983 to 2.3 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1549749 13f79535-47bb-0310-9956-ffa450edef68
2013-12-10 02:37:50 +00:00
Jing Zhao 6026982bcb HDFS-5353. Merge change r1548987 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548988 13f79535-47bb-0310-9956-ffa450edef68
2013-12-08 03:56:21 +00:00
Jing Zhao 1c1645d17f HDFS-4983. Merge change r1548968 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548972 13f79535-47bb-0310-9956-ffa450edef68
2013-12-07 21:23:24 +00:00
Jing Zhao 22b1584b87 HDFS-5590. Merge change r1548368 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548372 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 02:12:55 +00:00
Jing Zhao 6855f10a33 HDFS-5633. Merge change r1548359 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548361 13f79535-47bb-0310-9956-ffa450edef68
2013-12-06 01:33:18 +00:00
Daryn Sharp c90426e4d7 svn merge -c 1548161 FIXES: HDFS-5514. FSNamesystem's fsLock should allow custom implementation (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548168 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 15:35:48 +00:00
Brandon Li 9f2f36cadb HDFS-5587. Merging change r1548028 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1548029 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 07:24:06 +00:00
Andrew Wang 6bb3b89bc9 Revert HDFS-4983
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547971 13f79535-47bb-0310-9956-ffa450edef68
2013-12-05 00:06:20 +00:00
Andrew Wang 54d167406d HDFS-4983. Numeric usernames do not work with WebHDFS FS. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547940 13f79535-47bb-0310-9956-ffa450edef68
2013-12-04 22:34:52 +00:00
Colin McCabe faf8b3ff53 HDFS-4997. libhdfs does not return correct error code in most cases (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547639 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 23:16:55 +00:00
Kihwal Lee a5c36c322b svn merge -c 1547393 merging from trunk to branch-2 to fix: HDFS-5558. LeaseManager monitor thread can crash if the last block is complete but another block is not.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547395 13f79535-47bb-0310-9956-ffa450edef68
2013-12-03 14:14:53 +00:00
Kihwal Lee 2ea9cd4896 svn merge -c 1547173 merging from trunk to branch-2 to fix: HDFS-5557. Write pipeline recovery for the last packet in the block may cause rejection of valid replicas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547179 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 20:27:37 +00:00
Arun Murthy 439a690ad1 Setting version to 2.4.0-SNAPSHOT in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547165 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 19:40:42 +00:00
Arun Murthy f5dc7b0c6b Renamed releases. 2.2.1 -> 2.3.0 & 2.3.0 -> 2.4.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547140 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 18:43:55 +00:00
Colin McCabe b128742363 move HDFS-5581 to 2.3
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547093 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 16:40:27 +00:00
Colin McCabe d3f200bad0 HDFS-5581. NameNodeFsck should use only one instance of BlockPlacementPolicy (vinay via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1547090 13f79535-47bb-0310-9956-ffa450edef68
2013-12-02 16:36:13 +00:00
Brandon Li db432fe76e HDFS-5563. Merging change r1546233 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1546235 13f79535-47bb-0310-9956-ffa450edef68
2013-11-27 23:47:09 +00:00
Brandon Li c28ba9bc5d HDFS-5577. Merging change r1546210 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1546217 13f79535-47bb-0310-9956-ffa450edef68
2013-11-27 22:35:14 +00:00
Uma Maheswara Rao G 25119a39c0 Merge HDFS-5568. Support includeSnapshots option with Fsck command. Contributed by Vinay
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545991 13f79535-47bb-0310-9956-ffa450edef68
2013-11-27 11:01:02 +00:00
Jing Zhao e65e4c8afa HDFS-5561. Merge change r1545791 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545793 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 19:33:26 +00:00
Brandon Li 5aa5bad303 HDFS-5548. Merging change r1545756 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545759 13f79535-47bb-0310-9956-ffa450edef68
2013-11-26 18:19:34 +00:00
Jing Zhao 543db74645 HDFS-5533. Merge change r1545357 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545358 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 18:08:57 +00:00
Kihwal Lee 204a17c736 svn merge -c 1545322 merging from trunk to branch-2 to fix HDFS-5266. Datanode cannot roll back to previous layout version.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1545324 13f79535-47bb-0310-9956-ffa450edef68
2013-11-25 15:36:39 +00:00
Jing Zhao 65c9af5538 HDFS-5552. Merge change r1544627 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544636 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 18:50:53 +00:00
Jing Zhao 08b96cc2a3 HDFS-5525. Merge change r1543895 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544635 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 18:49:07 +00:00
Jing Zhao addb9f1e22 HDFS-5444. Merge change r1541753 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544634 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 18:45:31 +00:00
Uma Maheswara Rao G 78af36bb07 Merge HDFS-5544. Adding Test case For Checking dfs.checksum.type as NULL value. Contributed by Sathish.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544598 13f79535-47bb-0310-9956-ffa450edef68
2013-11-22 16:14:37 +00:00
Brandon Li db3ed5df52 HDFS-5407. Merging change r1544362 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544378 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 23:59:22 +00:00
Brandon Li 90d5ecf92e HDFS-5288. Merging change r1544352 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544359 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 22:55:12 +00:00
Jing Zhao 2bba4969d1 HDFS-5532. Merge change r1544047 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1544048 13f79535-47bb-0310-9956-ffa450edef68
2013-11-21 07:20:18 +00:00
Jing Zhao 7e10509fe4 HDFS-3987. Merge change r1543962 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543967 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 22:00:32 +00:00
Uma Maheswara Rao G 6e1234cbf4 Merge HDFS-5014. Process register commands with out holding BPOfferService lock. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543862 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 16:29:08 +00:00
Uma Maheswara Rao G b0bd967090 Merge HDFS-4516. Client crash after block allocation and NN switch before lease recovery for the same file can cause readers to fail forever. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543839 13f79535-47bb-0310-9956-ffa450edef68
2013-11-20 15:04:05 +00:00
Jonathan Turner Eagles dd889fc773 HDFS-1386. TestJMXGet fails in jdk7 (jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543613 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 22:47:42 +00:00
Jing Zhao 918cf98cac HDFS-5428. Merge change r1543329 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543332 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 07:39:46 +00:00
Arpit Agarwal 0e9d89a70f HDFS-5073. Merging r1543303 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543304 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 04:11:33 +00:00
Jing Zhao 540d8b6c07 HDFS-5393. Merge change r1543248 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543249 13f79535-47bb-0310-9956-ffa450edef68
2013-11-19 00:39:44 +00:00
Uma Maheswara Rao G c155a5b368 HDFS-5372. In FSNamesystem, hasReadLock() returns false if the current thread holds the write lock (Contributed by Vinay)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1543029 13f79535-47bb-0310-9956-ffa450edef68
2013-11-18 13:56:39 +00:00
Brandon Li 5807cdad5a HDFS-5519. Merging change r1542437 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542653 13f79535-47bb-0310-9956-ffa450edef68
2013-11-17 05:52:42 +00:00
Jing Zhao 53f2a1efe5 HDFS-5502. Merge change r1542438 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542439 13f79535-47bb-0310-9956-ffa450edef68
2013-11-16 01:06:27 +00:00
Jing Zhao 6f0a0e0acd HDFS-5489. Merge change r1542158 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542159 13f79535-47bb-0310-9956-ffa450edef68
2013-11-15 02:18:33 +00:00
Kihwal Lee 28727e60ba svn merge -c 1542054 merging from trunk to branch-2 to fix HDFS-5438. Flaws in block report processing can cause data loss.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542057 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 20:14:42 +00:00
Jing Zhao 809261808e HDFS-5506. Merge change r1542011 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1542015 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 18:52:55 +00:00
Kihwal Lee f62fbc7f17 svn merge -c 1541971 merging from trunk to branch-2 to fix HDFS-4995 Make getContentSummary less expensive.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541975 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 16:55:31 +00:00
Jing Zhao 0fbfa3874a HDFS-5487. Merge change r1541776 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541778 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 01:17:22 +00:00
Jing Zhao bb24cf7c4f HDFS-5504. Merge change r1541773 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541775 13f79535-47bb-0310-9956-ffa450edef68
2013-11-14 01:11:14 +00:00
Jing Zhao f3cc7832b7 Merge change 1541718 from trunk: Move HDFS-5325 and HDFS-5488 from BUG-FIX to IMPROVEMENT in CHANGES.txt.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541719 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 21:11:20 +00:00
Jing Zhao 8d673df9cb HDFS-5474. Merge change r1541685 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541709 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 21:00:52 +00:00
Steve Loughran 026ead7d45 HDFS-5075 httpfs-config.sh calls out incorrect env script name
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541687 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 20:08:08 +00:00
Jing Zhao bba2cfab96 HDFS-5440. Merge change 1541665 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541671 13f79535-47bb-0310-9956-ffa450edef68
2013-11-13 19:34:08 +00:00
Jing Zhao f1aa8a866c HDFS-5425. Merge change r1541261 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1541271 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 22:15:04 +00:00
Andrew Wang 90fbbb8138 HDFS-5495. Remove further JUnit3 usages from HDFS. Contributed by Jarek Jarcec Cecho.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540916 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 02:05:10 +00:00
Jing Zhao fb08c97e7e HDFS-5488. Merge change r1540894 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540897 13f79535-47bb-0310-9956-ffa450edef68
2013-11-12 00:27:12 +00:00
Andrew Wang b458fc7d9c HDFS-5467. Remove tab characters in hdfs-default.xml. Contributed by Shinichi Yamashita.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540815 13f79535-47bb-0310-9956-ffa450edef68
2013-11-11 19:24:44 +00:00
Brandon Li 65fd32800d HDFS-5469. Merging change r1540443 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540444 13f79535-47bb-0310-9956-ffa450edef68
2013-11-10 04:25:57 +00:00
Jing Zhao 6df4fc4e92 HDFS-5325. Merge change r1540235 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540237 13f79535-47bb-0310-9956-ffa450edef68
2013-11-09 01:25:11 +00:00
Jing Zhao 76a7119930 HDFS-5371. Merge change r1540197 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540200 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 21:43:15 +00:00
Jing Zhao 37e18a4c0b HDFS-5476. Merge change r1540142 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1540144 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 18:22:35 +00:00
Brandon Li 5f82524fe3 HDFS-5364. Merging change r1539834 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539891 13f79535-47bb-0310-9956-ffa450edef68
2013-11-08 01:03:10 +00:00
Jing Zhao cbe493200b HDFS-5443. Merge change r1539754 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539758 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 18:45:15 +00:00
Brandon Li f87469c7aa HDFS-5252. Merging change r1539740 form trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539742 13f79535-47bb-0310-9956-ffa450edef68
2013-11-07 18:10:33 +00:00
Andrew Wang b58d5bad64 HDFS-5458. Datanode failed volume threshold ignored if exception is thrown in getDataDirsFromURIs. Contributed by Mike Mellenthin.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1539092 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 18:27:06 +00:00
Jing Zhao 213bf915fd HDFS-5427. Merge change r1538875 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538876 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 06:45:31 +00:00
Chris Nauroth 259a78120b HDFS-5456. Merging change r1538872 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538873 13f79535-47bb-0310-9956-ffa450edef68
2013-11-05 06:06:54 +00:00
Colin McCabe 5324b77a60 HADOOP-9478. Fix race conditions during the initialization of Configuration related to deprecatedKeyMap (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538252 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 18:51:14 +00:00
Uma Maheswara Rao G 7d86f49109 Merge HDFS-5344. Make LsSnapshottableDir as Tool interface implementation. Contributed by Sathish.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538158 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 09:07:59 +00:00
Andrew Wang 98575f07cc Move HDFS-5035 to 2.2.1 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538122 13f79535-47bb-0310-9956-ffa450edef68
2013-11-02 01:07:36 +00:00
Andrew Wang 7c9efe4095 HDFS-5037. Active NN should trigger its own edit log rolls. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1538061 13f79535-47bb-0310-9956-ffa450edef68
2013-11-01 20:58:23 +00:00
Chris Nauroth 8992fecc1d HDFS-4633. Merging change r1461846 and r1537345 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537347 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 23:50:22 +00:00
Chris Nauroth 52af62711f HDFS-5065. Merging change r1537319 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537320 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 21:53:23 +00:00
Chris Nauroth 3c9728b41e HDFS-5432. Merging change r1537230 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537232 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 18:40:36 +00:00
Andrew Wang ed3161c331 HDFS-5433. When reloading fsimage during checkpointing, we should clear existing snapshottable directories. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537194 13f79535-47bb-0310-9956-ffa450edef68
2013-10-30 17:29:14 +00:00
Arpit Agarwal 57bdb564c7 HDFS-5436. Merging change r1536921 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536922 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 22:50:24 +00:00
Colin McCabe 11b73ddbcc move HDFS-4657 to branch-2.2.1
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536886 13f79535-47bb-0310-9956-ffa450edef68
2013-10-29 21:01:51 +00:00
Chris Nauroth 011733b686 HDFS-5413. Merging change r1536448 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1536450 13f79535-47bb-0310-9956-ffa450edef68
2013-10-28 17:58:14 +00:00
Jing Zhao 9c78f870d8 HDFS-5257. Merge change r1535811 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535813 13f79535-47bb-0310-9956-ffa450edef68
2013-10-25 18:46:57 +00:00
Brandon Li c86c303a62 HDFS-5171. Merging change r1535586 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535588 13f79535-47bb-0310-9956-ffa450edef68
2013-10-24 23:52:16 +00:00
Kihwal Lee 82d08eb6d4 svn merge -c 1535188 merging from trunk to branch-2 to fix HDFS-5341.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535190 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 21:31:23 +00:00
Jing Zhao 9a3e05cc6c HDFS-5363. Merge change r1535169 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535183 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 21:04:58 +00:00
Aaron Myers 3e65694f2b HDFS-5403. WebHdfs client cannot communicate with older WebHdfs servers post HDFS-5306. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1535057 13f79535-47bb-0310-9956-ffa450edef68
2013-10-23 15:20:35 +00:00
Colin McCabe f6aa656ff3 HDFS-5400. DFS_CLIENT_MMAP_CACHE_THREAD_RUNS_PER_TIMEOUT constant is set to the wrong value (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534656 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 15:13:12 +00:00
Tsz-wo Sze a5d967a4dc svn merge -c 1534426 from trunk for HDFS-4885. Improve the verifyBlockPlacement() API in BlockPlacementPolicy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534427 13f79535-47bb-0310-9956-ffa450edef68
2013-10-22 00:21:24 +00:00
Brandon Li fcc912838d HDFS-5347. Merging change r1534377 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534379 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 21:20:35 +00:00
Jing Zhao 7a45ef2300 HDFS-5382. Merge change r1534368 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1534374 13f79535-47bb-0310-9956-ffa450edef68
2013-10-21 21:10:57 +00:00
Uma Maheswara Rao G a2c2913f54 Merge HDFS-5331 make SnapshotDiff.java to a o.a.h.util.Tool interface implementation. Contributed by Vinay.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533918 13f79535-47bb-0310-9956-ffa450edef68
2013-10-20 15:34:08 +00:00
Chris Nauroth 240156ad51 HDFS-5365. Merging change r1533574 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533575 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 18:15:19 +00:00
Jonathan Turner Eagles 875fe36d9e HDFS-4511. Cover package org.apache.hadoop.hdfs.tools with unit test (Andrey Klochkov via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533545 13f79535-47bb-0310-9956-ffa450edef68
2013-10-18 16:40:09 +00:00
Chris Nauroth 9fa1fca1da HDFS-5365. Merging change r1533283 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533285 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 23:07:15 +00:00
Suresh Srinivas 341272da8b HDFS-5375. Merge 1533258 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533259 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 20:48:39 +00:00
Chris Nauroth 4723e3e00f HDFS-5336. Merging change r1533183 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533184 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 18:10:09 +00:00
Jing Zhao 10db2ed897 HDFS-5379. Merge change r1533181 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533182 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 18:00:03 +00:00
Chris Nauroth 7325bf4a28 HDFS-5375. Merging change r1533165 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1533166 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 17:16:05 +00:00
Jing Zhao b2fcad6d36 HDFS-5334. Merge change r1532949 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532950 13f79535-47bb-0310-9956-ffa450edef68
2013-10-17 01:36:17 +00:00
Andrew Wang 5776b0b324 HDFS-5360. Improvement of usage message of renameSnapshot and deleteSnapshot. Contributed by Shinichi Yamashita.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532938 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 23:16:13 +00:00
Tsz-wo Sze 0b18a51c33 svn merge -c 1532932 from trunk for HDFS-4376. Fix race conditions in Balancer.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532933 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 23:06:46 +00:00
Jonathan Turner Eagles 186581fef2 HADOOP-9078. enhance unit-test coverage of class org.apache.hadoop.fs.FileContext (Ivan A. Veselovsky via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532929 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 22:47:16 +00:00
Kihwal Lee 0c4da3693a svn merge -c 1532915 Merging from trunk to branch-2 to fix HDFS-5346.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532916 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 21:15:47 +00:00
Suresh Srinivas bc18c6f842 HADOOP-10005. Merge 1532907 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532908 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 21:05:23 +00:00
Suresh Srinivas 17b20d742d HDFS-5370. Merge 1532899 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532902 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 20:47:31 +00:00
Tsz-wo Sze 71b1436bcc svn merge -c 1532860 from trunk for adding TestOpenFilesWithSnapshot.java for HDFS-5283.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532861 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 18:47:42 +00:00
Tsz-wo Sze b2e641e31f svn merge -c 1532857 from trunk for HDFS-5283. Under construction blocks only inside snapshots should not be counted in safemode threshhold.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532858 13f79535-47bb-0310-9956-ffa450edef68
2013-10-16 18:39:24 +00:00
Jing Zhao 9590b4b93d HDFS-5130. Merge change r1532580 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532581 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 22:50:44 +00:00
Brandon Li 218b1cc69c HDFS-5330. Merging change r1532539 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532543 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 21:30:18 +00:00
Tsz-wo Sze ce9da0e32c svn merge -c 1532468 from trunk for HDFS-5338. Add a conf to disable hostname check in datanode registration.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532473 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 18:25:20 +00:00
Jing Zhao e724cd97fe HDFS-5352. Merge change r1532158 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532159 13f79535-47bb-0310-9956-ffa450edef68
2013-10-15 01:19:06 +00:00
Jing Zhao 34beb4eb79 HDFS-5342. Merge change r1532090 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1532092 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 21:02:04 +00:00
Chris Nauroth 4e4e958213 HADOOP-10040. Merging change r1531977 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531978 13f79535-47bb-0310-9956-ffa450edef68
2013-10-14 17:06:42 +00:00
Brandon Li d890e365c8 HDFS-5329. Merging change 1531617 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531618 13f79535-47bb-0310-9956-ffa450edef68
2013-10-13 05:33:12 +00:00
Luke Lu b96dfe531c Fix typo (HDFS-5276 -> HDFS-5267) in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531503 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 04:58:32 +00:00
Chris Nauroth 4f3386420c HADOOP-10040. Merging change r1531491 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531492 13f79535-47bb-0310-9956-ffa450edef68
2013-10-12 03:16:45 +00:00
Jing Zhao c89a36106e HDFS-5322. Merge change r1531436 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531440 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 21:53:29 +00:00
Luke Lu 7d83886767 HDFS-5276. Remove volatile from LightWeightHashSet. (Junping Du via llu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531224 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 08:27:32 +00:00
Suresh Srinivas 2a60a8c3c4 HDFS-5335. Merge 1531152 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1531153 13f79535-47bb-0310-9956-ffa450edef68
2013-10-11 00:03:28 +00:00
Brandon Li 1c128966f3 HDFS-5337. Merging change r1530835 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530836 13f79535-47bb-0310-9956-ffa450edef68
2013-10-10 01:04:38 +00:00
Colin McCabe 3bc8333232 HDFS-5323. Remove some deadcode in BlockManager (Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530831 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 23:17:02 +00:00
Kihwal Lee 39d1443e3f svn merge -c 1530669 merging from trunk to branch-2 to fix HDFS-4510.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530672 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 15:12:29 +00:00
Daryn Sharp 2031005eeb HADOOP-9470. eliminate duplicate FQN tests in different Hadoop modules (Ivan A. Veselovsky via daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530671 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 15:10:43 +00:00
Brandon Li e79cdd2d9c HDFS-5281. Merging change r1530461 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530468 13f79535-47bb-0310-9956-ffa450edef68
2013-10-09 00:10:48 +00:00
Brandon Li 991faf598f HDFS-5316. Merging change 1530150 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530153 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 04:42:06 +00:00
Arun Murthy c3dff760d9 Moving recent bug-fixes to hadoop-2.2.1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530129 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 02:05:03 +00:00
Brandon Li ad8948e8e0 HDFS-5317. Merging change r1530114 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530117 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 00:27:39 +00:00
Jing Zhao cd4411ce1c HDFS-5291. Merge change r1530112 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530113 13f79535-47bb-0310-9956-ffa450edef68
2013-10-08 00:03:26 +00:00
Brandon Li 2451b38e8e HDFS-5307. Merging change r1530027 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1530033 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 19:15:29 +00:00
Arun Murthy c0da67e579 HDFS-4817. Moving changelog to Release 2.2.0 section to reflect the backport.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529753 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 05:32:41 +00:00
Arun Murthy 3b514585f1 Preparing for hadoop-2.2.0 release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529752 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 05:32:18 +00:00
Brandon Li 254e87700f HDFS-5259. Merging change r1529730 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529735 13f79535-47bb-0310-9956-ffa450edef68
2013-10-07 03:39:43 +00:00
Jing Zhao a59090bbdc HDFS-5299. Merge change r1529660 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529661 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 18:42:08 +00:00
Jing Zhao 3f0c90f6b5 HADOOP-10017. Merge change r1529571 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529572 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 06:24:32 +00:00
Brandon Li 3bb402c70f HDFS-5306. Merging change r1529562 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529563 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 04:21:59 +00:00
Jing Zhao 0de66e4a77 HDFS-5308. Merge change r1529512 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529516 13f79535-47bb-0310-9956-ffa450edef68
2013-10-05 20:46:52 +00:00
Jing Zhao f6a21000d4 HDFS-5300. Merge change r1529294 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1529305 13f79535-47bb-0310-9956-ffa450edef68
2013-10-04 21:14:56 +00:00
Aaron Myers 032fbb549e HDFS-5289. Race condition in TestRetryCacheWithHA#testCreateSymlink causes spurious test failure. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528694 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 00:42:20 +00:00
Chris Nauroth a5d9aaad12 HDFS-5279. Merging change r1528308 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528310 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 05:37:21 +00:00
Suresh Srinivas 09d2301b63 HADOOP-10012. Merge 1528301 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528302 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 04:11:26 +00:00
Arpit Agarwal 13bfd0971e HDFS-5255. Merging r1528279 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528282 13f79535-47bb-0310-9956-ffa450edef68
2013-10-02 00:09:08 +00:00
Kihwal Lee dc2d77bde2 HDFS-4512. Cover package org.apache.hadoop.hdfs.server.common with tests. Contributed by Vadim Bondarev.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1528098 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 14:05:16 +00:00
Kihwal Lee 4e4dd0f15c svn merge -c 1527807. merging from trunk to branch-2 to fix HDFS-4517.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527808 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 22:33:01 +00:00
Brandon Li 320c7519ed HDFS-5230. Merging change r1527726 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527741 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 19:37:33 +00:00
Brandon Li e26ac59ca0 HDFS-5256. Merging change r1527452 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527453 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 06:13:27 +00:00
Chris Nauroth f040bd0739 HDFS-5260. Merging change r1527113 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527115 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 22:56:54 +00:00
Jing Zhao 030c3c99e8 HDFS-5265. Merge change r1527093 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527096 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 21:53:33 +00:00
Brandon Li c4df7fb70e HDFS-5268. Merging change r1527087 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527092 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 21:37:47 +00:00
Kihwal Lee d680392e39 Fixing up CHANGES.txt for HDFS-5031.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1527086 13f79535-47bb-0310-9956-ffa450edef68
2013-09-27 21:20:46 +00:00
Chris Nauroth 16794494d3 HDFS-5186. Merging change r1526615 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526617 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 17:34:29 +00:00
Chris Nauroth ee97d95c33 HDFS-5258. Merging change r1526610 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526611 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 17:24:26 +00:00
Colin McCabe fa2a3c94f2 HADOOP-9998. Provide methods to clear only part of the DNSToSwitchMapping. (Junping Du via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526568 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 15:24:40 +00:00
Brandon Li 61a00d87d5 HDFS-5246. Merging change r1526316 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526319 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 22:16:34 +00:00
Colin McCabe 138fd7581f HADOOP-9981. globStatus should minimize its listStatus and getFileStatus calls. (Contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526300 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 20:58:37 +00:00
Siddharth Seth e23d5672a7 merge YARN-1229 from trunk. Define constraints on Auxiliary Service names. Change ShuffleHandler service name from mapreduce.shuffle to mapreduce_shuffle. Contributed by Xuan Gong.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1526066 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 00:37:14 +00:00
Tsz-wo Sze 51ae59ec51 svn merge -c 1525828 from trunk for HDFS-5228. The RemoteIterator returned by DistributedFileSystem.listFiles may throw NullPointerException.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525829 13f79535-47bb-0310-9956-ffa450edef68
2013-09-24 10:17:46 +00:00
Suresh Srinivas 3227545fe7 HDFS-5251. Merge 1525787 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525792 13f79535-47bb-0310-9956-ffa450edef68
2013-09-24 05:38:42 +00:00
Brandon Li 360a4e5f03 HDFS-5249. Merging change r1525770 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525771 13f79535-47bb-0310-9956-ffa450edef68
2013-09-24 04:19:22 +00:00
Jing Zhao b35d226b62 HDFS-4971. Merge change r1525681 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525688 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 20:26:20 +00:00
Arpit Agarwal 4af31993a2 HDFS-5139. Merge r1525665 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525667 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 18:19:48 +00:00
Arpit Agarwal 8f354d141e HDFS-5139. Merge r1525659 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525661 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 18:03:27 +00:00
Daryn Sharp fa0ecb7567 merge -c 1525626 FIXES: HDFS-5240. Separate formatting from logging in the audit logger API (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525627 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 15:34:05 +00:00
Daryn Sharp 15f857c59c merge -c 1525624 FIXES: HDFS-5239. Allow FSNamesystem lock fairness to be configurable (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525625 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 15:29:40 +00:00
Jing Zhao c084582988 HDFS-5231. Merge change r1525133 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525134 13f79535-47bb-0310-9956-ffa450edef68
2013-09-20 20:35:45 +00:00
Brandon Li b7f0156ad8 HDFS-5234. Merging change r1525104 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1525109 13f79535-47bb-0310-9956-ffa450edef68
2013-09-20 19:11:33 +00:00
Colin McCabe 7ce1a859a8 HADOOP-9929. Insufficient permission for a path reported as file not found. (Contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524610 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 02:03:42 +00:00
Jing Zhao 27cc6911ea Merge change r1524581 from trunk: move HDFS-5122 from Release 2.1.1-beta to Release 2.3.0 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524583 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 21:34:42 +00:00
Jing Zhao 3babe7c124 HDFS-5122. Merge change r1524562 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524566 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 20:59:36 +00:00
Arpit Agarwal 57f5be4885 HDFS-5031. Merge change r1524553 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524556 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 20:21:48 +00:00
Jing Zhao 23d5e348c8 HDFS-5219. Merge change r1524498 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524499 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 17:32:20 +00:00
Jing Zhao 8855a3e0ee HDFS-5212. Merge change r1524298 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524302 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 06:26:57 +00:00
Jing Zhao 0ce8f0b3c2 HDFS-5199. Merge change r1523140 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1524300 13f79535-47bb-0310-9956-ffa450edef68
2013-09-18 06:19:36 +00:00
Arun Murthy 3836473c73 Preparing for hadoop-2.1.1-beta release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523892 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 05:23:39 +00:00
Tsz-wo Sze d03b60c61a svn merge -c 1523875 from trunk for HDFS-5207. In BlockPlacementPolicy.chooseTarget(..), change the writer and the excludedNodes parameter types respectively to Node and Set.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523877 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 02:51:45 +00:00
Alejandro Abdelnur 89df2ae5c9 HADOOP-9961. versions of a few transitive dependencies diverged between hadoop subprojects. (rvs via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523597 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 11:31:17 +00:00
Tsz-wo Sze 9c98bb8175 svn merge -c 1523400 from trunk for HDFS-5188. In BlockPlacementPolicy, reduce the number of chooseTarget(..) methods; replace HashMap with Map in parameter declarations and cleanup some related code.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523401 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 04:25:50 +00:00
Jing Zhao 988d4c123e HDFS-4096. Merge change r1523091 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1523092 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 20:44:58 +00:00
Jing Zhao a344423199 HDFS-5192. Merge change r1522775 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522777 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 04:35:52 +00:00
Brandon Li 95b902fb1e HDFS-5067. Merging change r1522774 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522776 13f79535-47bb-0310-9956-ffa450edef68
2013-09-13 04:31:51 +00:00
Andrew Wang bd257baef5 Move HDFS-4680 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522048 13f79535-47bb-0310-9956-ffa450edef68
2013-09-11 21:17:08 +00:00
Andrew Wang 1d4d1d8f70 HDFS-4680. Audit logging of delegation tokens for MR tracing. (Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1522015 13f79535-47bb-0310-9956-ffa450edef68
2013-09-11 20:04:50 +00:00
Jing Zhao b3076b00ce HDFS-5085. Merge change r1521601 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1521607 13f79535-47bb-0310-9956-ffa450edef68
2013-09-10 19:39:36 +00:00
Andrew Wang 5609b5e654 HDFS-5170. BlockPlacementPolicyDefault uses the wrong classname when alerting to enable debug logging. (Andrew Wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520962 13f79535-47bb-0310-9956-ffa450edef68
2013-09-09 04:56:16 +00:00
Andrew Wang 7cb29ba170 Revert HADOOP-9877 because of issues reported at HADOOP-9912
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520712 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 22:53:26 +00:00
Colin McCabe 36ed17388e HDFS-4879. Add BlockedArrayList collection to avoid CMS full GCs (Contributed by Todd Lipcon)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520669 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 19:09:41 +00:00
Jing Zhao b1d90490c8 Merge change r1520650 from trunk: move HDFS-5118 to 2.1.1-beta section.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520652 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 18:17:53 +00:00
Jing Zhao f059931fed HDFS-5118. Merge change r1520637 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520639 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 17:24:44 +00:00
Colin McCabe 461587e36a HDFS-5164. DeleteSnapshot should check if OperationCategory.WRITE is possible before taking write lock (contributed by Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520494 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 05:27:59 +00:00
Chris Nauroth 4c66560499 HDFS-4491. Merging change r1520479 and r1520482 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520485 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 03:28:00 +00:00
Aaron Myers c79ca11fed HDFS-5159. Secondary NameNode fails to checkpoint if error occurs downloading edits on first checkpoint. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1520366 13f79535-47bb-0310-9956-ffa450edef68
2013-09-05 16:31:50 +00:00
Kihwal Lee 3558b9274e svn merge -c 1519681 merging from trunk to branch-2 to fix HDFS-5150.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519682 13f79535-47bb-0310-9956-ffa450edef68
2013-09-03 13:51:20 +00:00
Brandon Li fa39efe421 Merging change r1519222 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1519229 13f79535-47bb-0310-9956-ffa450edef68
2013-08-31 21:24:47 +00:00
Suresh Srinivas 2982a8ee13 Fix CHANGES.txt to remove repeated sections for 2.3.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518908 13f79535-47bb-0310-9956-ffa450edef68
2013-08-30 08:11:42 +00:00
Jing Zhao 9a55c1dc66 HDFS-5140. Merge change r1518899 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518902 13f79535-47bb-0310-9956-ffa450edef68
2013-08-30 07:40:43 +00:00
Suresh Srinivas ce623c2ce8 HDFS-5144. Merge r1518895 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518896 13f79535-47bb-0310-9956-ffa450edef68
2013-08-30 07:20:50 +00:00
Konstantin Shvachko cd978548cf HDFS-5077. NPE in FSNamesystem.commitBlockSynchronization(). Contributed by Plamen Jeliazkov.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518852 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 23:08:47 +00:00
Brandon Li bd1c2de914 HDFS-5078. Merging change r1518292 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1518813 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 20:33:25 +00:00
Kihwal Lee 6c8ce84d0b Adding the new test file for HDFS-3245 that was accidentally dropped
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517995 13f79535-47bb-0310-9956-ffa450edef68
2013-08-27 21:15:41 +00:00
Kihwal Lee fe800d3b88 svn merge -c 1517989 merging from trunk to branch-2 to fix HDFS-5132.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517990 13f79535-47bb-0310-9956-ffa450edef68
2013-08-27 21:06:12 +00:00
Kihwal Lee 5b01125048 HDFS-5128. Allow multiple net interfaces to be used with HA namenode RPC server. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517982 13f79535-47bb-0310-9956-ffa450edef68
2013-08-27 20:56:15 +00:00
Kihwal Lee 7246828377 HDFS-3245. Add metrics and web UI for cluster version summary. Contributed by Ravi Prakash.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517942 13f79535-47bb-0310-9956-ffa450edef68
2013-08-27 19:25:29 +00:00
Brandon Li 80ead68bfc HDFS-4947. Merging change r1517040 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1517049 13f79535-47bb-0310-9956-ffa450edef68
2013-08-23 21:26:23 +00:00