Commit Graph

1731 Commits

Author SHA1 Message Date
Arpit Agarwal 10e98ce6bb HDFS-5742. Merging r1570067 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570068 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 03:21:26 +00:00
Arpit Agarwal 01730690f3 HDFS-5483. Merging r1570040 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570041 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 01:44:36 +00:00
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