Commit Graph

1999 Commits

Author SHA1 Message Date
Vinayakumar B 641cbc0feb Merge r1588258 from trunk, HDFS-6153. Document "fileId" and "childrenNum" fields in the FileStatus Json schema
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588262 13f79535-47bb-0310-9956-ffa450edef68
2014-04-17 14:07:42 +00:00
Chris Nauroth 5d90eaa20d HADOOP-10499. Merging change r1588098 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588099 13f79535-47bb-0310-9956-ffa450edef68
2014-04-16 23:16:36 +00:00
Colin McCabe d28e711956 HDFS-4909. Avoid protocol buffer RPC namespace clashes (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588093 13f79535-47bb-0310-9956-ffa450edef68
2014-04-16 23:01:16 +00:00
Kihwal Lee 4a13429dce svn merge -c 1587962 from trunk to branch-2 to fix:HDFS-6219. Proxy superuser configuration should use true client IP for address checks. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587964 13f79535-47bb-0310-9956-ffa450edef68
2014-04-16 16:26:07 +00:00
Daryn Sharp 46738ee92b svn merge -c 1587954 FIXES: HDFS-6214. Webhdfs has poor throughput for files >2GB (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587955 13f79535-47bb-0310-9956-ffa450edef68
2014-04-16 16:06:28 +00:00
Chris Nauroth c3c195e9e8 HDFS-5409. Merging change r1587759 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587760 13f79535-47bb-0310-9956-ffa450edef68
2014-04-16 00:12:53 +00:00
Haohui Mai d7583e206d HDFS-6194. Merge r1587660 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587665 13f79535-47bb-0310-9956-ffa450edef68
2014-04-15 18:15:36 +00:00
Chris Nauroth 7c89cbfcd2 HDFS-6243. Merging change r1587410 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587416 13f79535-47bb-0310-9956-ffa450edef68
2014-04-15 04:59:49 +00:00
Chris Nauroth f3039d3640 HDFS-6238. Merging change r1587148 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587150 13f79535-47bb-0310-9956-ffa450edef68
2014-04-14 04:50:14 +00:00
Chris Nauroth 750664ebc1 HDFS-6237. Merging change r1587146 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587147 13f79535-47bb-0310-9956-ffa450edef68
2014-04-14 04:42:23 +00:00
Chris Nauroth 3672935a18 HDFS-6236. Merging change r1586902 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586903 13f79535-47bb-0310-9956-ffa450edef68
2014-04-12 21:46:13 +00:00
Colin McCabe 35a5a32f17 HDFS-6232. OfflineEditsViewer throws a NPE on edits containing ACL modifications (ajisakaa via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586791 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 22:43:15 +00:00
Jing Zhao 4d83618ec6 HDFS-6229. Merge r1586714 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586715 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 16:45:06 +00:00
Chris Nauroth 77beb3573c HDFS-6235. Merging change r1586692 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586696 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 15:49:37 +00:00
Chris Nauroth f44451bd58 HDFS-6234. Merging change r1586682 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586686 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 15:34:34 +00:00
Chris Nauroth cb9c1d3c7b HDFS-6231. Merging change r1586551 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586553 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 03:58:40 +00:00
Andrew Wang 3ed7d84136 Undo accidental FSNamesystem change introduced in HDFS-6224 commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586516 13f79535-47bb-0310-9956-ffa450edef68
2014-04-11 00:23:25 +00:00
Andrew Wang b4989ed791 HDFS-6224. Add a unit test to TestAuditLogger for file permissions passed to logAuditEvent. Contributed by Charles Lamb.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586494 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 22:36:36 +00:00
Uma Maheswara Rao G 2dea526b23 Merge HDFS-5669. Storage#tryLock() should check for null before logging successfull message. Contributed by Vinayakumar B
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586393 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 18:13:40 +00:00
Haohui Mai 55758cbd81 HDFS-6225. Merge r1586181 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586182 13f79535-47bb-0310-9956-ffa450edef68
2014-04-10 00:22:19 +00:00
Chris Nauroth 129bf91c5e HDFS-6208. Merging change r1586154 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586160 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 21:58:01 +00:00
Haohui Mai 29bdcc24d6 HDFS-6170. Merge r1586152 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586153 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 21:33:28 +00:00
Tsz-wo Sze 02163d1441 svn merge -c 1586079 from trunk for HDFS-6209. TestValidateConfigurationSettings should use random ports.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586080 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 18:50:39 +00:00
Tsz-wo Sze 56d87fb514 svn merge -c 1586039 from trunk for HDFS-6204. Fix TestRBWBlockInvalidation: change the last sleep to a loop.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586040 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 17:02:12 +00:00
Tsz-wo Sze f23be52c30 svn merge -c 1586034 from trunk for HDFS-6206. Fix NullPointerException in DFSUtil.substituteForWildcardAddress.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586037 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 16:55:48 +00:00
Jonathan Turner Eagles 2c54fd41ef HDFS-6215. Wrong error message for upgrade. (Kihwal Lee via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586013 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 16:25:35 +00:00
Arpit Agarwal 0761ef1951 HDFS-6160: Merging 1586007 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586008 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 16:14:35 +00:00
Steve Loughran 770aef5053 HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585933 13f79535-47bb-0310-9956-ffa450edef68
2014-04-09 11:11:31 +00:00
Haohui Mai 09c38c24e0 HDFS-6169. Merge r1585802 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585804 13f79535-47bb-0310-9956-ffa450edef68
2014-04-08 18:15:52 +00:00
Haohui Mai 02beaa7b18 HDFS-6143. Merge r1585639 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585641 13f79535-47bb-0310-9956-ffa450edef68
2014-04-08 01:45:21 +00:00
Chris Nauroth 4b31af597b HDFS-6198. Merging change r1585627 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585628 13f79535-47bb-0310-9956-ffa450edef68
2014-04-08 00:06:59 +00:00
Haohui Mai 1b2a9412f8 HDFS-6180. Merge r1585625 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585626 13f79535-47bb-0310-9956-ffa450edef68
2014-04-07 23:58:24 +00:00
Chris Nauroth 58d9479140 HDFS-6197. Merging change r1585586 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585591 13f79535-47bb-0310-9956-ffa450edef68
2014-04-07 21:26:42 +00:00
Brandon Li 45e26bae05 HDFS-6181. Merging change r1585563 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585581 13f79535-47bb-0310-9956-ffa450edef68
2014-04-07 20:40:01 +00:00
Kihwal Lee fef85fad1a svn merge -c 1585544 Merging from trunk to branch-2 to fix:HDFS-6191. Disable quota checks when replaying edit log. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585545 13f79535-47bb-0310-9956-ffa450edef68
2014-04-07 18:27:03 +00:00
Kihwal Lee a558f63105 svn merge -c 1584900 Merging from trunk to branch-2 to fix:HDFS-6159. TestBalancerWithNodeGroup.testBalancerWithNodeGroup fails if there is block missing after balancer success.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584901 13f79535-47bb-0310-9956-ffa450edef68
2014-04-04 20:40:19 +00:00
Tsz-wo Sze 0741fef232 svn merge -c 1584763 from trunk for HDFS-6189. Multiple HDFS tests fail on Windows attempting to use a test root path containing a colon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584764 13f79535-47bb-0310-9956-ffa450edef68
2014-04-04 15:51:49 +00:00
Haohui Mai d60928c928 HDFS-6190. Merge r1584376 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584377 13f79535-47bb-0310-9956-ffa450edef68
2014-04-03 20:20:27 +00:00
Tsz-wo Sze 660a0a0470 svn merge -c 1583878 from trunk for HDFS-6167. Relocate the non-public API classes in the hdfs.client package.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584143 13f79535-47bb-0310-9956-ffa450edef68
2014-04-02 19:42:07 +00:00
Andrew Wang 76b097c187 HDFS-5591. Checkpointing should use monotonic time when calculating period. Contributed by Charles Lamb.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583927 13f79535-47bb-0310-9956-ffa450edef68
2014-04-02 08:36:13 +00:00
Haohui Mai 0cd6f12410 HDFS-6173. Merge r1583384 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583385 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 18:07:08 +00:00
Arun Murthy e9e21c07cf HDFS-5285. svn rm hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java & hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/INodeFileUnderConstructionWithSnapshot.java.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583258 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 08:22:29 +00:00
Arun Murthy 21a1744039 Preparing for hadoop-2.4.0 release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583246 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 07:39:04 +00:00
Arun Murthy c64cc2ff5e Merge -c 1583241 from trunk to branch-2 to fix HDFS-4564. Ensure webhdfs returns correct HTTP response codes for denied operations. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583242 13f79535-47bb-0310-9956-ffa450edef68
2014-03-31 07:26:56 +00:00
Tsz-wo Sze 94550b1ff2 svn merge -c 1583018 from trunk for HDFS-6166. Change Balancer socket read timeout to 20 minutes and add 10 seconds delay after error.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583019 13f79535-47bb-0310-9956-ffa450edef68
2014-03-29 16:24:24 +00:00
Tsz-wo Sze a6c405b99f svn merge -c 1582856 from trunk for HDFS-6168. Remove a deprecated constructor and the deprecated methods reportChecksumFailure, getDelegationToken(Text), renewDelegationToken and cancelDelegationToken from DistributedFileSystem.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582857 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 18:36:20 +00:00
Haohui Mai ea1b523902 HDFS-6156. Merge r1582847 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582849 13f79535-47bb-0310-9956-ffa450edef68
2014-03-28 18:11:57 +00:00
Haohui Mai b7d68ff957 HDFS-6164. Merge r1582533 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582534 13f79535-47bb-0310-9956-ffa450edef68
2014-03-27 23:12:39 +00:00
Haohui Mai 67fd877105 HDFS-5978. Merge r1582433 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582434 13f79535-47bb-0310-9956-ffa450edef68
2014-03-27 18:17:21 +00:00
Jing Zhao 47ecc90e56 HDFS-6163. Merge change r1582421 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582422 13f79535-47bb-0310-9956-ffa450edef68
2014-03-27 17:38:09 +00:00
Suresh Srinivas 88dc6c1ed3 HDFS-6162. Merge r1582181 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582182 13f79535-47bb-0310-9956-ffa450edef68
2014-03-27 04:27:50 +00:00
Haohui Mai b78ad887ed HDFS-6158. Merge r1582164 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582165 13f79535-47bb-0310-9956-ffa450edef68
2014-03-27 03:00:01 +00:00
Haohui Mai a8c81bb8b6 HDFS-6157. Merge r1582098 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582100 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 22:36:11 +00:00
Suresh Srinivas bf266aa554 Merge r1582073 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582074 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 21:34:10 +00:00
Suresh Srinivas 53bebe2329 Merge r1582068 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582069 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 21:29:57 +00:00
Jing Zhao c87fbeb7a8 HDFS-5672. Merge r1581994 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581996 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 18:38:14 +00:00
Tsz-wo Sze e034eb46d8 svn merge -c 1581936 from trunk for HDFS-6115. Call flush() for every append on block scan verification log.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581937 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 17:03:57 +00:00
Suresh Srinivas 847ef81ec6 Merge r1581914 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581915 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 16:34:46 +00:00
Haohui Mai ba2506ae69 HDFS-6130. Merge r1581713 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581723 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 08:00:14 +00:00
Arpit Agarwal 38d0fb9238 HDFS-5910: Merging r1581688 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581690 13f79535-47bb-0310-9956-ffa450edef68
2014-03-26 04:14:27 +00:00
Haohui Mai d3b471155b HDFS-5196. Merge r1581427 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581429 13f79535-47bb-0310-9956-ffa450edef68
2014-03-25 17:55:48 +00:00
Jing Zhao 8b39fc9076 HDFS-5840. Merge r1581260 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581261 13f79535-47bb-0310-9956-ffa450edef68
2014-03-25 06:50:14 +00:00
Suresh Srinivas 590df94253 HDFS-6125. Merge 1581242 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581243 13f79535-47bb-0310-9956-ffa450edef68
2014-03-25 05:56:53 +00:00
Arpit Agarwal 5303f4a66d HDFS-6124. Merging r1581124 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581137 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 23:45:55 +00:00
Chris Nauroth 02b4b702d3 HDFS-5846. Merging change r1581091 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581092 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 22:22:33 +00:00
Jing Zhao 069e6b389e HDFS-6135. Merge r1581070 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581071 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 21:26:24 +00:00
Jing Zhao b964c4424f Backport HDFS-5138 from trunk: Support HDFS upgrade in HA. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581067 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 21:08:50 +00:00
Brandon Li da2d86bd04 HDFS-6050. Merging change r1581055 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581059 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 20:57:51 +00:00
Kihwal Lee 927f2a8330 svn merge -c 1580886 merging from trunk to branch-2 to fix:HDFS-3087. Decomissioning on NN restart can complete without blocks being replicated. Contributed by Rushabh S Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580888 13f79535-47bb-0310-9956-ffa450edef68
2014-03-24 15:40:47 +00:00
Chris Nauroth 6006427e9f HDFS-6140. Merging change r1580173 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580174 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 05:39:49 +00:00
Arpit Agarwal 8891c7d08b HDFS-6120. Merging r1580047 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580048 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 20:57:44 +00:00
Tsz-wo Sze 86277cde7d svn merge -c 1580013 from trunk for HDFS-6138. Add a user guide for how to use viewfs with federation.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580014 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 18:48:34 +00:00
Jing Zhao 2bf6f06235 HDFS-6038. Merge r1579813 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579814 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 23:08:32 +00:00
Jing Zhao 6aa3081681 HDFS-6131. Move HDFSHighAvailabilityWithNFS.apt.vm and HDFSHighAvailabilityWithQJM.apt.vm from Yarn to HDFS. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579736 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 21:03:42 +00:00
Andrew Wang 43c923e930 HDFS-6089. Standby NN while transitioning to active throws a connection refused error when the prior active NN process is suspended. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579694 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 17:44:29 +00:00
Tsz-wo Sze f94a9c0bd0 svn merge -c 1579670 from trunk for HDFS-6129. When a replica is not found for deletion, do not throw an exception.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579671 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 15:51:28 +00:00
Haohui Mai d955e84f39 HDFS-6127. Merge r1579546 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579548 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 07:01:35 +00:00
Haohui Mai b65d53331e HDFS-6105. Merge r1579468 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579474 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 23:58:24 +00:00
Tsz-wo Sze 75a37d14bb svn merge -c 1579396 from trunk for HDFS-6123. Do not log stack trace for ReplicaAlreadyExistsException and SocketTimeoutException.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579397 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 21:05:52 +00:00
Jing Zhao 6ba1656628 HDFS-6100. Merge r1579301 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579303 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 17:33:51 +00:00
Chris Nauroth 76f4a32aec HDFS-6099. Merging change r1579122 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579128 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 03:55:53 +00:00
Suresh Srinivas 65fd55768d Merge r1579104 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579106 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 01:10:50 +00:00
Aaron Myers 495cc5e128 HDFS-6112. NFS Gateway docs are incorrect for allowed hosts configuration. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579099 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 00:31:43 +00:00
Tsz-wo Sze b18aaa79f5 Merge 1579004 and 1579005 from trunk for HDFS-6068. Disallow snapshot names that are also invalid directory names.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579007 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 18:36:57 +00:00
Colin McCabe c05e10b50a HDFS-6007. Update documentation about short-circuit local reads (iwasakims via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578995 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 18:14:53 +00:00
Jing Zhao d611f42c37 Merge r1578669 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578676 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 00:10:22 +00:00
Chris Nauroth 6db6c6744f HDFS-5516. Merging change r1578549 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578552 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 20:30:20 +00:00
Colin McCabe 453c36b191 HDFS-6107. When a block cannot be cached due to limited space on the DataNode, it becomes uncacheable (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578515 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 19:00:53 +00:00
Arpit Agarwal 4ea49506cf HDFS-6094. Merging r1578478 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578480 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 17:38:31 +00:00
Colin McCabe a42d5c79ab HDFS-6106. Reduce default for dfs.namenode.path.based.cache.refresh.interval.ms (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577799 13f79535-47bb-0310-9956-ffa450edef68
2014-03-15 07:52:46 +00:00
Andrew Wang 72cf96300b HDFS-6102. Lower the default maximum items per directory to fix PB fsimage loading. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577429 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 04:53:13 +00:00
Haohui Mai bd2cb0117e HDFS-6084. Merge r1577401 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577402 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 01:00:35 +00:00
Colin McCabe 5d65afe2db HDFS-6097. Zero-copy reads are incorrectly disabled on file offsets above 2GB (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577355 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 22:38:39 +00:00
Brandon Li 2cf495a464 HDFS-6080. Merging change r1577319 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577320 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 21:07:14 +00:00
Suresh Srinivas a19b5531ca HDFS-5244. Merge 1577254 from trunk:
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577255 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 17:24:33 +00:00
Arpit Agarwal 502a0da830 HDFS-6096. Merging r1576999 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577000 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 23:25:28 +00:00
Arpit Agarwal 9127f3c1dc HDFS-5705. Merging r1555190 and r1576989 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576991 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 23:16:04 +00:00
Andrew Wang 49f08eebcc HDFS-6079. Timeout for getFileBlockStorageLocations does not work. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576980 13f79535-47bb-0310-9956-ffa450edef68
2014-03-12 22:56:35 +00:00
Colin McCabe 567654e6ee HDFS-6086. Fix a case where zero-copy or no-checksum reads were not allowed even when the block was cached. (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576534 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 22:42:30 +00:00
Haohui Mai 237a2054b4 Merge r1576513 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576515 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 21:48:26 +00:00
Chris Nauroth a6e3cbc7f3 HDFS-5638. Merging change r1576405 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576410 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 16:21:45 +00:00
Colin McCabe 1be546ff2b HDFS-6085. Improve CacheReplicationMonitor log messages a bit (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576195 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 06:25:27 +00:00
Andrew Wang 0f7d99268c HDFS-3405. Checkpointing should use HTTP POST or PUT instead of GET-GET to send merged fsimages. Contributed by Vinayakumar B.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576157 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 00:44:56 +00:00
Andrew Wang 0697a50337 Revert bad HDFS-3405 merge from trunk to retry
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576155 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 00:40:46 +00:00
Andrew Wang 1356761f0f HDFS-3405. Checkpointing should use HTTP POST or PUT instead of GET-GET to send merged fsimages. Contributed by Vinayakumar B.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576154 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 00:34:16 +00:00
Tsz-wo Sze 5d2252b6dc svn merge -c 1575452 from trunk for HDFS-6076. DataNode with SimulatedDataSet should not create DatanodeRegistration with namenode layout version and namenode node type.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576151 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 00:22:43 +00:00
Tsz-wo Sze a42d3356db svn merge -c 1575021 from trunk for HDFS-6060. NameNode should not check DataNode layout version
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576149 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 00:12:57 +00:00
Tsz-wo Sze 134a29f226 svn merge -c 1574259 from trunk for HDFS-5535.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576128 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 23:37:46 +00:00
Chris Nauroth 946db612ed HDFS-6055. Merging change r1576095 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576098 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 21:47:45 +00:00
Jing Zhao 9fcbd9413f HDFS-6077. Merge change r1576076 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576077 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 20:50:40 +00:00
Andrew Wang 3826799270 HDFS-6070. Cleanup use of ReadStatistics in DFSInputStream.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576048 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 19:05:10 +00:00
Haohui Mai c3c267af8f Merge r1576035 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576036 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 18:18:52 +00:00
Colin McCabe bc927a10cf HDFS-6071. BlockReaderLocal does not return -1 on EOF when doing a zero-length read on a short file. (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575799 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 02:48:11 +00:00
Arpit Agarwal 03f20f77e1 HDFS-6078. Merging r1575559 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575561 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 16:40:27 +00:00
Andrew Wang fd3e554ff0 HDFS-5064. Standby checkpoints should not block concurrent readers. Contributed by Aaron Twining Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575449 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 23:39:14 +00:00
Chris Nauroth e4ef7774b5 HDFS-5986. Merging change r1575384 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575385 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 19:45:24 +00:00
Chris Nauroth d9e52c379c HDFS-6069. Merging change r1575184 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575192 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 06:14:24 +00:00
Chris Nauroth d7ef2df14f HDFS-6063. Merging change r1575171 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575172 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 05:53:24 +00:00
Colin McCabe fca36dcb4e HDFS-6065. HDFS zero-copy reads should return null on EOF when doing ZCR (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575110 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 01:19:05 +00:00
Colin McCabe a9acce33a7 HDFS-6067. TestPread.testMaxOutHedgedReadPool is flaky (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575101 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 23:48:44 +00:00
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