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

2329 Commits

Author SHA1 Message Date
Arpit Agarwal 3031e29a90 HDFS-6899. Undo merge of r1619971 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619972 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-23 06:22:15 +00:00
Arpit Agarwal 36e3de0577 HDFS-6899: Merging r1619970 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619971 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-23 06:01:38 +00:00
Chris Nauroth b2d86ebf78 HDFS-4852. Merging change r1619967 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619968 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-23 05:30:59 +00:00
Arpit Agarwal d9e55176b8 HDFS-6829: Merging r1619882 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619883 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-22 18:15:13 +00:00
Brandon Li d887700240 HDFS-6890. Merging change r1619500 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619501 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 18:03:55 +00:00
Arpit Agarwal f7e3b6e761 HDFS-6758: Merging r1619275 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619276 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 01:14:14 +00:00
Arpit Agarwal 3e9b4f1950 HDFS-6878: Merging r1619271 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619272 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 00:42:42 +00:00
Chris Nauroth fd50cd9150 HDFS-6858. Merging change r1619256 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619258 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 22:49:38 +00:00
Karthik Kambatla 8b8fe3a425 Set the release date for 2.5.0 in CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619238 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 21:33:42 +00:00
Jing Zhao f87e8dc4b8 HDFS-6870. Merge r1619192 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619193 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 18:14:43 +00:00
Vinayakumar B 12e216ad29 Merged revision(s) 1617799 from hadoop/common/trunk: 
HDFS-6247. Avoid timeouts for replaceBlock() call by sending intermediate responses to Balancer (vinayakumarb)
........

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619084 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 12:14:42 +00:00
Brandon Li 388d6cffe5 HDFS-6868. Merging change r1619001 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619002 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-19 22:33:23 +00:00
Brandon Li d926fd12cf HDFS-6569. Merging change r1618742 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618747 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 21:26:45 +00:00
Arpit Agarwal ab1c7bee12 HDFS-6188: Merging r1618727 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618728 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 20:50:27 +00:00
Andrew Wang 9b38a6ab23 HDFS-6825. Edit log corruption due to delayed block removal. Contributed by Yongjun Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618689 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 18:10:50 +00:00
Arpit Agarwal e4b1a7696c HDFS-6783: Merging r1618635 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618636 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 15:35:21 +00:00
Aaron Myers 3bf1c3bdf6 HDFS-6850. Move NFS out of order write unit tests into TestWrites class. Contributed by Zhe Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618092 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-15 02:35:25 +00:00
Uma Maheswara Rao G 593ebbfdd7 Merge. Updated contributors name in CHANGES.txt for HDFS-6783 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617881 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 05:00:05 +00:00
Uma Maheswara Rao G 193d2ad731 Merge. HDFS-6783. Fix HDFS CacheReplicationMonitor rescan logic. Contributed by Yi Liu and Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617873 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 04:21:11 +00:00
Alejandro Abdelnur de53a50ece HDFS-6849. Replace HttpFS custom proxyuser handling with common implementation. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617833 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 20:29:54 +00:00
Vinayakumar B ece88b6d57 Reverted 
Merged revision(s) 1617794 from hadoop/common/trunk:


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617797 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 18:40:28 +00:00
Vinayakumar B c3efba38b0 Merged revision(s) 1617784 from hadoop/common/trunk: 
HDFS-6847. Avoid timeouts for replaceBlock() call by sending intermediate responses to Balancer (Contributed by Vinayakumar B.)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617785 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 18:07:57 +00:00
Haohui Mai e9bd4578d6 HDFS-6567. Merge r1617779 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617780 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 17:47:28 +00:00
Allen Wittenauer 100ae93d42 HADOOP-8944. Shell command fs -count should include human readable option (Jonathan Allen via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617776 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 17:32:18 +00:00
Arpit Agarwal f1f1ff8f82 HDFS-6836: Merging r1617603 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617604 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-12 21:50:09 +00:00
Arpit Agarwal 004068c391 HDFS-6830: Merging r1617598 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617599 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-12 21:43:06 +00:00
Brandon Li afa125ccfd HDFS-6582. Merging change r1617366 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617369 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-11 21:38:33 +00:00
Haohui Mai bee0c9b615 HDFS-6838. Merge r1617361 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617363 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-11 21:30:17 +00:00
Jing Zhao f805ac93a9 HDFS-6837. Merge r1617337 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617338 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-11 18:02:57 +00:00
Jing Zhao 0960e67787 HDFS-6828. Merge r1616889 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616890 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 21:35:44 +00:00
Ravi Prakash c89c2e597b HDFS-6823. dfs.web.authentication.kerberos.principal shows up in logs for insecure HDFS 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616847 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 18:26:41 +00:00
Chris Nauroth 97dd53a608 HDFS-573. Merging change r1616814 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616817 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 16:29:07 +00:00
Arpit Agarwal 8d73cbb8d8 HDFS-6772: Merging r1616680 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616681 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 05:42:00 +00:00
Alejandro Abdelnur 481ac00c65 HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 2. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616674 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 05:01:12 +00:00
Alejandro Abdelnur d17a4da545 HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 1. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616673 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 05:00:28 +00:00
Haohui Mai 061a26631f HDFS-6722. Merge r1616669 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616670 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 04:29:32 +00:00
Aaron Myers 1fe7b04863 HDFS-6740. Make FSDataset support adding data volumes dynamically. Contributed by Lei Xu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616624 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 23:01:36 +00:00
Aaron Myers 84d57bbfa8 HDFS-6728. Dynamically add new volumes to DataStorage, formatted if necessary. Contributed by Lei Xu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616620 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 22:53:00 +00:00
Arpit Agarwal 79d6802d5f HDFS-6781. Add file missed in previous commit. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616577 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 19:46:38 +00:00
Arpit Agarwal 3f54884b46 HDFS-6781. Separate HDFS commands from CommandsManual.apt.vm. (Contributed by Akira Ajisaka) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616576 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 19:46:14 +00:00
Tsz-wo Sze 67557212c7 svn merge -c 1616426 from trunk for HDFS-6812. Remove addBlock and replaceBlock from DatanodeDescriptor. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616427 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 07:33:01 +00:00
Tsz-wo Sze 645ca2d8f5 svn merge -c 1616422 from trunk for HDFS-6809. Move Balancer's inner classes MovedBlocks and Matcher as to standalone classes and separates KeyManager from NameNodeConnector. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616423 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 07:23:06 +00:00
Jing Zhao 5c7571fa3f HDFS-6791. Merge change r1616306 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616311 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-06 19:15:04 +00:00
Allen Wittenauer cc5a7495b7 HDFS-6517. Remove hadoop-metrics2.properties from hdfs project (Akira AJISAKA via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616265 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-06 16:13:36 +00:00
Brandon Li 5e3640eb4f HDFS-6790. Merging change r1616058 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616072 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-06 01:13:36 +00:00
Karthik Kambatla 5f81675aea Edit CHANGES.txt files to move HADOOP-10759 and HDFS-6717 from 2.5.0 to 2.6.0 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616037 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 22:49:34 +00:00
Alejandro Abdelnur 891d93bbcf HADOOP-10791. AuthenticationFilter should support externalizing the secret for signing and provide rotation support. (rkanter via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616006 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 21:25:22 +00:00
Brandon Li c1452c4722 Merging change r1615801 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615802 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-04 21:33:10 +00:00
Brandon Li 225febccc1 HDFS-6451. Merging change r1615702 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615708 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-04 17:44:45 +00:00
Uma Maheswara Rao G 4ac92fdbd5 Merge from trunk. HDFS-6787. Remove duplicate code in FSDirectory#unprotectedConcat. Contributed by Yi Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615623 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-04 15:45:56 +00:00
Vinayakumar B 8e8d4717e9 Merged revision(s) 1615504 from hadoop/common/trunk: 
HDFS-5185. DN fails to startup if one of the data dir is full. Contributed by Vinayakumar B.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615505 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-04 08:44:39 +00:00
Vinayakumar B fed094d0af Merged revision(s) 1615491 from hadoop/common/trunk: 
HDFS-5723. Append failed FINALIZED replica should not be accepted as valid when that block is underconstruction. Contributed by Vinayakumar B.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615492 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-04 06:46:01 +00:00
Chris Nauroth 2852c4866e HDFS-6810: fix compilation error in TestReplicationPolicy.java. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615387 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-03 05:13:44 +00:00
Arpit Agarwal 89cf64edf3 HDFS-6810: Merging r1615381 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615382 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-03 02:08:57 +00:00
Andrew Wang 743837b259 HDFS-6793. Missing changes in HftpFileSystem when Reintroduce dfs.http.port / dfs.https.port in branch-2. Contributed by Juan Yu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615243 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 21:54:18 +00:00
Andrew Wang 5f115917b3 HDFS-6788. Improve synchronization in BPOfferService with read write lock. Contributed by Yongjun Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615242 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 21:50:45 +00:00
Andrew Wang 2777f777e9 Revert HDFS-6788, bad merge. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615239 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 21:45:38 +00:00
Andrew Wang 511234c828 HDFS-6788. Improve synchronization in BPOfferService with read write lock. Contributed by Yongjun Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615191 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 18:56:25 +00:00
Andrew Wang e86559fde3 HDFS-6802. Some tests in TestDFSClientFailover are missing @Test annotation. Contributed by Akira Ajisaka. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615184 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 17:58:37 +00:00
Arpit Agarwal 1b4f028385 HDFS-6794: Merging r1615169 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615175 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 17:35:14 +00:00
Tsz-wo Sze 91794728d5 svn merge -c 1615107 from trunk for HDFS-6796. Improve the argument check during balancer command line parsing. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615108 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 14:15:57 +00:00
Arpit Agarwal a38e398a22 HDFS-6798: Merging r1615044 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615045 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 07:12:59 +00:00
Arpit Agarwal 5be502add3 HDFS-6797: Merging r1615017 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615018 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 01:15:04 +00:00
Tsz-wo Sze 4dfef67ed0 svn merge -c 1615015 from trunk for HDFS-6685. Balancer should preserve storage type of replicas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615016 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 01:12:24 +00:00
Arpit Agarwal 93cfcaa9aa HDFS-6441: Merging r1614812 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614815 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-31 06:52:56 +00:00
Arpit Agarwal 80b7f0f424 HDFS-3482. Merging r1358812 from trunk to branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614814 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-31 06:44:48 +00:00
Arpit Agarwal f71c0e67fa HDFS-6768: Merging r1614732 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614733 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 18:38:07 +00:00
Chris Nauroth 9df555d193 HDFS-6570. Merging change r1614723 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614726 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 17:54:35 +00:00
Steve Loughran 432e5eef56 HDFS-4629. Using com.sun.org.apache.xml.internal.serialize.* in XmlEditsVisitor.java is JVM vendor specific. Breaks IBM JAVA. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614664 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 14:06:05 +00:00
Andrew Wang 1bd3b2bf9a HDFS-6778. The extended attributes javadoc should simply refer to the user docs. Contributed by Charles Lamb. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614548 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 05:58:23 +00:00
Andrew Wang 562e6cbe6d HDFS-6665. Add tests for XAttrs in combination with viewfs. Contributed by Stephen Chu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614546 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 05:53:51 +00:00
Tsz-wo Sze 8155f7c6eb svn merge -c 1614215 from trunk for HDFS-6739. Add getDatanodeStorageReport to ClientProtocol. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614217 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-28 23:46:03 +00:00
Brandon Li 81796d4741 HDFS-6717. Merging change r1614125 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614129 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-28 18:57:52 +00:00
Chris Nauroth f1d0db87cd HDFS-6749. Merging change r1613561 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613562 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-26 04:21:16 +00:00
Colin McCabe c039bccb92 HDFS-6750. The DataNode should use its shared memory segment to mark short-circuit replicas that have been unlinked as stale (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613539 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-26 00:02:01 +00:00
Colin McCabe 70a179d29f HDFS-6755. There is an unnecessary sleep in the code path where DFSOutputStream#close gives up its attempt to contact the namenode (mitdesai21 via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613523 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-25 22:13:03 +00:00
Andrew Wang 716f15cfcd Fix up HDFS CHANGES.txt for 2.5.0 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613495 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-25 19:03:15 +00:00
Vinayakumar B 8213e89477 Merged revision(s) 1613486 from hadoop/common/trunk: 
HDFS-6752. Avoid Address bind errors in TestDatanodeConfig#testMemlockLimit (vinayakumarb)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613487 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-25 18:20:53 +00:00
Vinayakumar B 100694c34e Merged revision(s) 1613355 from hadoop/common/trunk: 
HDFS-5919. FileJournalManager doesn't purge empty and corrupt inprogress edits files (vinayakumarb)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613356 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-25 07:04:01 +00:00
Andrew Wang 9b98cd9c18 HDFS-6696. Name node cannot start if the path of a file under construction contains .snapshot. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613330 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-24 23:44:14 +00:00
Jing Zhao 51c861d3cc HDFS-6715. Merge r1613237 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613239 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-24 18:30:22 +00:00
Haohui Mai fce2c0fe75 HDFS-6723. Merge r1613220 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613222 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-24 18:04:44 +00:00
Todd Lipcon 8f8a933ca9 HADOOP-10882. Move DirectBufferPool into common util. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613005 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-24 06:21:52 +00:00
Brandon Li 4a8ac21841 HDFS-6455. Merging change r1612947 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612949 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-23 21:37:55 +00:00
Colin McCabe ecc0a2879e HDFS-6114. Block Scan log rolling will never happen if blocks written continuously leading to huge size of dncp_block_verification.log.curr (vinayakumarb via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612944 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-23 21:00:07 +00:00
Uma Maheswara Rao G 288247d08c Merge from trunk. HDFS-6422. getfattr in CLI doesn't throw exception or return non-0 return code when xattr doesn't exist. (Charles Lamb via umamahesh) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612923 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-23 19:06:41 +00:00
Brandon Li 64f9ab07d3 HDFS-6731. Merging change r1612715 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612718 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 22:33:14 +00:00
Brandon Li a36a3bd3be HDFS-6703. Merging change r1612702 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612705 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 21:00:17 +00:00
Arpit Agarwal 32e9ab8341 HDFS-6712: Merging r1612695 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612696 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 20:33:07 +00:00
Andrew Wang c4537871dc HDFS-6701. Make seed optional in NetworkTopology#sortByDistance. Contributed by Ashwin Shankar. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612627 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 17:50:08 +00:00
Jing Zhao 976af1d50a HDFS-6704. Merge r1612613 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612615 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 17:12:26 +00:00
Tsz-wo Sze d0b9bf11ab svn merge -c 1612493 from trunk for HDFS-6702. Change DFSClient to pass the StorageType from the namenode to datanodes and change datanode to write block replicas using the specified storage type. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612494 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 07:43:58 +00:00
Tsz-wo Sze 33d82259aa svn merge -c 1612427 from trunk for HDFS-6680. BlockPlacementPolicyDefault does not choose favored nodes correctly. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1612430 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-21 23:23:52 +00:00
Aaron Myers b4d07574ba Move CHANGES.txt info for HDFS-6632 from 2.6 to 2.5 section. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611808 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 21:10:43 +00:00
Haohui Mai 08aae68182 HDFS-6632. Reintroduce dfs.http.port / dfs.https.port in branch-2. Contributed by Yongjun Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611794 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 20:35:02 +00:00
Alejandro Abdelnur b8a6d81d68 HADOOP-10817. ProxyUsers configuration should support configurable prefixes. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611781 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 19:43:38 +00:00
Tsz-wo Sze 965da8312e svn merge -c 1611750 from trunk for HDFS-6616. Add exclude-datanodes feature to WebHDFS redirection so that it will not redirect retries to the same datanode. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611751 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 18:21:18 +00:00
Daryn Sharp 69b2c7f603 svn merge -c 1611737 FIXES: HDFS-6599. 2.4 addBlock is 10 to 20 times slower compared to 0.23 (daryn) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611738 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 18:01:59 +00:00
Tsz-wo Sze 9462e9e0e9 svn merge -c 1611731 from trunk for HDFS-6700. BlockPlacementPolicy shoud choose storage but not datanode for deletion. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611734 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 17:51:39 +00:00
Colin McCabe 325a7d5d94 fix eol style on TestBootstrapStandbyWithBKJM 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611727 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 17:23:44 +00:00
Chris Nauroth fcca9666a8 HDFS-6597. Merging change r1611723 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611724 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 17:17:15 +00:00
Vinayakumar B a61f91286f Merged revision(s) 1611562 from hadoop/common/trunk: 
HDFS-4120. Add a new "-skipSharedEditsCheck" option for BootstrapStandby ( Contributed by Liang Xie and Rakesh R )


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611563 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 08:49:40 +00:00
Vinayakumar B 234f792f3e reverted 
HDFS-4120. Add a new "-skipSharedEditsCheck" option for BootstrapStandby ( Contributed by Rakesh R )
........


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611561 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 08:47:01 +00:00
Vinayakumar B d21d50bb82 Merged revision(s) 1611556 from hadoop/common/trunk: 
HDFS-4120. Add a new "-skipSharedEditsCheck" option for BootstrapStandby ( Contributed by Rakesh R )


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611557 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 08:34:29 +00:00
Vinayakumar B a33ec0a90f Merged revision(s) 1611538 from hadoop/common/trunk: 
HDFS-6655. Add 'header banner' to 'explorer.html' also in Namenode UI ( Contributed by Vinayakumar B )


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611539 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 04:27:54 +00:00
Jing Zhao c02ea4b655 HDFS-6667. Merge change r1611508 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611510 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-17 23:16:48 +00:00
Vinayakumar B 642e5c137d Merged revision(s) 1611441 from hadoop/common/trunk: 
HDFS-6693. TestDFSAdminWithHA fails on windows ( Contributed by Vinayakumar B )


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611442 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-17 19:19:00 +00:00
Jing Zhao 27e2008484 HDFS-6478. Merge r1611410 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611412 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-17 17:39:54 +00:00
Andrew Wang af13d4e18c HDFS-6690. Deduplicate xattr names in memory. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611227 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-17 00:44:50 +00:00
Brandon Li d405271060 HDFS-6689. Merging change r1611135 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611152 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-16 19:46:19 +00:00
Chris Nauroth 5727a25f35 HDFS-5624. Merging change r1611068 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1611075 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-16 16:31:09 +00:00
Brandon Li 313e9f4a9b HDFS-6456. Merging change r1610840 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610843 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-15 20:37:55 +00:00
Colin McCabe 586ab6e0e3 HDFS-5809. BlockPoolSliceScanner and high speed hdfs appending make datanode to drop into infinite loop (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610791 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-15 18:17:35 +00:00
Chris Nauroth f7cb4c6e03 HDFS-6678. Merging change r1610549 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610551 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-14 22:58:35 +00:00
Brandon Li ca6e01d472 HDFS-6378. Merging change r1610543 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610545 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-14 21:54:48 +00:00
Chris Nauroth ea8da4b8c0 HDFS-2856. Merging change r1610474 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1610479 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-14 18:28:02 +00:00
Chris Nauroth aaf757a0e0 HDFS-3851. Merging change r1609858 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609859 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-11 22:24:17 +00:00
Chris Nauroth 357fbc1dd2 HDFS-3851. Merging change r1377372 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609857 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-11 22:21:30 +00:00
Chris Nauroth 9ced74bdc8 HADOOP-8158. Merging change r1609854 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609855 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-11 22:11:30 +00:00
Chris Nauroth fcd5f43d50 HADOOP-8185. Merging change r1389010 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609853 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-11 22:07:43 +00:00
Chris Nauroth 0b215699e6 HDFS-2976. Merging change r1609849 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609850 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-11 22:00:19 +00:00
Chris Nauroth 6916cdabba HDFS-2976. Merging change r1298495, r1298507 and r1298508 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609848 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-11 21:55:48 +00:00
Vinayakumar B e4f494a767 Merged revision(s) 1609629 from hadoop/common/trunk: 
HDFS-6630. Unable to fetch the block information by Browsing the file system on Namenode UI through IE9 ( Contributed by Haohui Mai)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609631 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-11 05:16:44 +00:00
Chris Nauroth 9e5c339023 HDFS-5202. Merging change r1609618 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609619 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-11 03:09:48 +00:00
Jing Zhao 2581a1cd1b HDFS-6640. Merge change r1609603 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609605 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-11 01:29:49 +00:00
Kihwal Lee f1cfc9b4cf svn merge -c 1609543 merging from trunk to branch-2 to fix:HDFS-6647. Edit log corruption when pipeline recovery occurs for deleted file present in snapshot. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609544 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-10 18:19:40 +00:00
Chris Nauroth 4b7196d2ce HDFS-6631. Merging change r1609534 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609536 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-10 18:07:03 +00:00
Tsz-wo Sze 52a07f1a39 svn merge -c 1609401 from trunk for HDFS-6643. Refactor INodeWithAdditionalFields.PermissionStatusFormat and INodeFile.HeaderFormat. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609402 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-10 06:17:55 +00:00
Jing Zhao f1e29d5800 HDFS-6645. Merge change r1609388 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609393 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-10 05:14:08 +00:00
Colin McCabe 05f49b8e37 HDFS-6622. Rename and AddBlock may race and produce invalid edits (kihwal via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609386 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-10 04:07:14 +00:00
Colin McCabe 2e7261d75a HDFS-6618. FSNamesystem#delete drops the FSN lock between removing INodes from the tree and deleting them from the inode map (kihwal via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609381 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-10 03:54:20 +00:00
Vinayakumar B 86443513b3 Merged revision(s) 1609020 from hadoop/common/trunk: 
HDFS-6646. [ HDFS Rolling Upgrade - Shell ] shutdownDatanode and getDatanodeInfo usage is missed ( Contributed by Brahma Reddy Battula)



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609021 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-09 06:07:07 +00:00
Chris Nauroth 18a54c1e16 HDFS-6627. Merging change r1608940 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608948 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-08 20:31:14 +00:00
Chris Nauroth 7c49fb7582 HDFS-6638. Merging change r1608905 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608911 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-08 19:29:00 +00:00
Chris Nauroth 822790d5af HDFS-6614. Merging change r1608846 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608847 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-08 16:48:01 +00:00
Uma Maheswara Rao G 5b832979e1 Mreged from trunk. HDFS-5411. Update Bookkeeper dependency to 4.2.3. Contributed by Rakesh R. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608784 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-08 13:53:42 +00:00
Uma Maheswara Rao G 50c7825d10 Merged from trunk. HDFS-4221. Remove the format limitation point from BKJM documentation as HDFS-3810 closed. Contributed by Rakesh R. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608777 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-08 13:33:05 +00:00
Uma Maheswara Rao G 5e22de1cf7 Merged from trunk. HDFS-4286. Changes from BOOKKEEPER-203 broken capability of including bookkeeper-server jar in hidden package of BKJM. Contributed by Rakesh R. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608769 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-08 13:19:31 +00:00
Chris Nauroth 1a0950b745 HDFS-6617. Merging change r1608522 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608523 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-07 17:38:56 +00:00
Andrew Wang e6e5417134 HDFS-6511. BlockManager#computeInvalidateWork() could do nothing. Contributed by Juan Yu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607736 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-03 20:11:18 +00:00
Andrew Wang 3470a34c22 HDFS-6493. Change dfs.namenode.startup.delay.block.deletion to second instead of millisecond. Contributed by Juan Yu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607733 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-03 20:02:46 +00:00
Andrew Wang 7cb89369bb HDFS-6613. Improve logging in caching classes. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607698 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-03 17:14:18 +00:00
Uma Maheswara Rao G 547b19d1a3 Merge from trunk. HDFS-6620. Snapshot docs should specify about preserve options with cp command. Contributed by Stephen Chu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607686 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-03 16:12:23 +00:00
Steve Loughran d6fd16c8dc HADOOP-9361: Strictly define FileSystem APIs - HDFS portion 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607623 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-03 12:54:15 +00:00
Karthik Kambatla 9133e3142c Preparing for 2.6.0 development. Updated versions. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607541 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-03 06:11:57 +00:00
Karthik Kambatla 8380254440 Preparing for release 2.6.0 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607539 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-03 05:56:01 +00:00
Andrew Wang 4eb15fa356 HDFS-6610. TestShortCircuitLocalRead tests sometimes timeout on slow machines. Contributed by Charles Lamb. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607497 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-02 23:02:47 +00:00
Colin McCabe a9cf4e7a98 HDFS-6604. The short-circuit cache doesn't correctly time out replicas that haven't been used in a while (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607459 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-02 19:46:29 +00:00
Chris Nauroth c661b13e2e HDFS-6614. Merging change r1607447 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607448 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-02 19:01:22 +00:00
Andrew Wang c35fc5815d HDFS-6612. MiniDFSNNTopology#simpleFederatedTopology(int) always hardcode nameservice ID. Contributed by Juan Yu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607443 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-02 18:37:32 +00:00