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

2110 Commits

Author SHA1 Message Date
Haohui Mai d49ff92928 HDFS-6279. Merge r1589618 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589619 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-24 07:20:46 +00:00
Haohui Mai 4ef2598d5d HDFS-6278. Merge r1589613 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589616 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-24 07:17:17 +00:00
Suresh Srinivas 32e76decb5 HDFS-6276. Merge r1589586 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589588 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-24 05:08:14 +00:00
Kihwal Lee 8bcb8dba51 svn merge -c 1589528 merging from trunk to branch-2 to fix:HDFS-6217. Webhdfs PUT operations may not work via a http proxy. Contributed by Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589529 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-23 22:08:19 +00:00
Suresh Srinivas 488a4086ae HDFS-6275. Merge r1589510 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589511 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-23 20:21:59 +00:00
Suresh Srinivas a27fda9c85 HDFS-6274. Merge r1589506 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589507 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-23 20:16:16 +00:00
Andrew Wang db667639eb HDFS-5213. TestDataNodeConfig failing on Jenkins runs due to DN web port in use. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589477 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-23 18:09:34 +00:00
Jing Zhao a6e2b23b9d HDFS-6178. Merge r1589002 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589003 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-21 23:37:58 +00:00
Chris Nauroth f3a6e7023b HDFS-6265. Merging change r1588995 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588998 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-21 22:55:42 +00:00
Arpit Agarwal ba0c72d010 HDFS-6245: Merging r1588842 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588843 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-21 00:16:20 +00:00
Haohui Mai 8d12e9bf81 HDFS-6256. Merge r1588524 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588526 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-18 17:37:26 +00:00
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
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