Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,266 Commits 326 Branches 371 Tags 1.5 GiB
Commit Graph

1929 Commits

Author SHA1 Message Date
Haohui Mai aaedcd5c5d Merge r1575086 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575088 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 22:56:53 +00:00
Colin McCabe 68eab8c5b9 HDFS-6059. TestBlockReaderLocal fails if native library not available (ajisakaa via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575000 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 18:53:12 +00:00
Haohui Mai 59b3646382 Merge r1574997 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574999 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 18:52:38 +00:00
Colin McCabe a9f2c50805 HDFS-6061. Allow dfs.datanode.shared.file.descriptor.path to contain multiple entries and fall back when needed (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574798 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 08:26:26 +00:00
Haohui Mai 39b70d4e1f Merge r1574792 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574794 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 08:16:12 +00:00
Colin McCabe 6f2dd3a25a HDFS-6057. DomainSocketWatcher.watcherThread should be marked as a daemon thread (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574789 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-06 08:01:41 +00:00
Haohui Mai 94ac5ba669 Merge r1574716 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574717 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-05 23:12:22 +00:00
Aaron Myers a872bdcb60 HDFS-5898. Allow NFS gateway to login/relogin from its kerberos keytab. Contributed by Abin Shahab. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574696 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-05 22:30:45 +00:00
Haohui Mai b19da33481 Merge r1574683 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574685 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-05 21:53:04 +00:00
Brandon Li 5e096ccac7 HDFS-6044. Merging change r1574622 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574624 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-05 19:05:44 +00:00
Brandon Li b7c98f4912 HDFS-6043. Merging change r1574616 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574620 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-05 18:53:59 +00:00
Jing Zhao d5da583bda HDFS-5167. Merge change r1574603 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574608 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-05 18:24:09 +00:00
Haohui Mai ef56b13d05 Merge r1574270 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574271 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-05 00:30:12 +00:00
Colin McCabe ba862fc744 HDFS-6051. HDFS cannot run on Windows since short-circuit memory segment changes (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574256 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-04 23:41:28 +00:00
Michael Stack 9c18ac13c0 HDFS-6047 TestPread NPE inside in DFSInputStream hedgedFetchBlockByteRange (stack) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574206 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-04 21:11:52 +00:00
Jing Zhao 45f24de631 HDFS-6053. Fix TestDecommissioningStatus and TestDecommission in branch-2. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574178 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-04 19:29:04 +00:00
Colin McCabe 91d8ee4be7 HDFS-6046. add dfs.client.mmap.enabled (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573888 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-04 06:51:40 +00:00
Colin McCabe c1db6bf511 HDFS-6040. fix DFSClient issue without libhadoop.so and some other ShortCircuitShm cleanups (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573885 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-04 06:35:57 +00:00
Chris Nauroth b44dfd6725 HDFS-6039. Merging change r1573879 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573881 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-04 06:15:56 +00:00
Haohui Mai 3a4469df97 Merge r1573694 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573696 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-03 19:42:22 +00:00
Colin McCabe 1754ca0b90 HDFS-5950. The DFSClient and DataNode should use shared memory segments to communicate short-circuit information (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573435 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-03 04:05:58 +00:00
Haohui Mai eff8ac4537 HDFS-5956. Merge change r1573078 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573081 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 21:10:23 +00:00
Arpit Agarwal d333ea34aa HDFS-5821. Merging r1573076 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573077 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 21:06:17 +00:00
Arpit Agarwal e0f27f3755 HADOOP-10285. Merging r1573052 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573063 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 20:35:44 +00:00
Aaron Myers 08735d92ed HDFS-6033. PBImageXmlWriter incorrectly handles processing cache directives. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573054 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 19:48:57 +00:00
Jing Zhao b10d601a54 Backport HDFS-4200 from trunk: Reduce the size of synchronized sections in PacketResponder. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573044 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 19:38:31 +00:00
Colin McCabe 66c4e5090c HDFS-6030. Remove an unused constructor in INode.java (yzhang via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573034 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 18:52:46 +00:00
Jing Zhao d744a6d8fe HDFS-5339. Merge change r1573026 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573027 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-28 18:40:59 +00:00
Chris Nauroth 5551993c29 HDFS-6028. Merging change r1572753 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572758 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 22:16:52 +00:00
Chris Nauroth 0eb2d3355a HADOOP-10353. Merging change r1572679 and r1572680 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572682 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 19:03:58 +00:00
Tsz-wo Sze e54f4dcb5e svn merge -c 1572488 from trunk for HDFS-6025. Update findbugsExcludeFile.xml. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572489 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 10:00:08 +00:00
Chris Nauroth 90398cc601 HDFS-4685. Update CHANGES.txt in branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572315 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 22:39:45 +00:00
Chris Nauroth 2244459186 HDFS-4685. Merge HDFS ACLs to branch-2. Merging changes r1569870, r1570466, r1570655, r1571573, r1571745, r1572142, r1572189 and r1572190 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572308 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 22:32:27 +00:00
Andrew Wang 39922a7b4c HDFS-3969. Small bug fixes and improvements for disk locations API. Contributed by Todd Lipcon and Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572287 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 21:57:10 +00:00
Jing Zhao abdb0ef402 HDFS-6018. Merge change r1572183 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572184 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 18:23:42 +00:00
Chris Nauroth af95bdd1ca HDFS-5936. Merging change r1572150 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572156 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 16:40:56 +00:00
Chris Nauroth c11a2df1e4 HDFS-6008. Merging change r1571881 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571883 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 00:33:20 +00:00
Chris Nauroth 4f08024f65 HDFS-6006. Merging change r1571813 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571815 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 20:27:43 +00:00
Jing Zhao 70707e613a HDFS-5939. Merge change r1571781 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571782 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 18:39:50 +00:00
Arpit Agarwal 596a196c1c HDFS-5922. Merging r1571542 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571543 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-25 02:18:06 +00:00
Michael Stack 5f3f90a640 HDFS-5776 Support 'hedged' reads in DFSClient (Liang Xie via stack) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571479 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-24 22:53:07 +00:00
Jing Zhao fc5238cd1f HDFS-5935. Merge change r1570663 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570664 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-21 18:57:41 +00:00
Chris Nauroth 0b217b4952 HDFS-5981. Merging change r1570468 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570470 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-21 06:46:50 +00:00
Andrew Wang 3be91de5fc HDFS-5988. Bad fsimage always generated after upgrade. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570431 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-21 02:53:44 +00:00
Jing Zhao 9bc374a0bf HDFS-5982. Merge change r1570395 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570398 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-21 00:17:04 +00:00
Brandon Li 368def7c60 Merging change r1570366 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570372 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 22:32:49 +00:00
Kihwal Lee 266a2aadf6 svn merge -c 1570252 meging from trunk to branch-2 to fix:HDFS-5962. Mtime and atime are not persisted for symbolic links. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570255 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 16:16:32 +00:00
Andrew Wang 7feb5bc8aa HDFS-5979. Typo and logger fix for fsimage PB code. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570071 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 03:27:14 +00:00
Arpit Agarwal 10e98ce6bb HDFS-5742. Merging r1570067 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570068 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 03:21:26 +00:00
Arpit Agarwal 01730690f3 HDFS-5483. Merging r1570040 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570041 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 01:44:36 +00:00
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