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

2206 Commits

Author SHA1 Message Date
Alejandro Abdelnur 5c37f02e27 Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs following merge to branch-2 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-mapreduce-project/CHANGES.txt

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-08-28 15:05:07 -07:00
Colin Patrick Mccabe 66ba7b2e7c HADOOP-10957. The globber will sometimes erroneously return a permission denied exception when there is a non-terminal wildcard. 
(cherry picked from commit 7a16731191)
 2014-08-27 19:52:23 -07:00
Colin Patrick Mccabe f1ee8cec61 HDFS-6879. Adding tracing to Hadoop RPC. Contributed by Masatake Iwasaki. 
(cherry picked from commit 6962510f72)
 2014-08-27 14:17:29 -07:00
Colin Patrick Mccabe 4afd04a09f fix extra line added to CHANGES.txt in HDFS-6902 cherry-pick 2014-08-27 13:51:54 -07:00
Colin Patrick Mccabe 01b2c9b15f HDFS-6902. FileWriter should be closed in finally block in BlockReceiver#receiveBlock() (Tsuyoshi OZAWA via Colin Patrick McCabe) 
(cherry picked from commit b6b95ff667)
 2014-08-27 13:51:10 -07:00
Colin Patrick Mccabe fdc15db2e1 HDFS-4486. Add log category for long-running DFSClient notices. Contributed by Zhe Zhang. 
(cherry picked from commit 225569ece2)
 2014-08-27 13:45:10 -07:00
Colin Patrick Mccabe ddb9d565c8 HDFS-6773. MiniDFSCluster should skip edit log fsync by default. Contributed by Stephen Chu. 
(cherry picked from commit d805cc27a9)
 2014-08-27 13:37:48 -07:00
brandonli 99d8434511 HDFS-6892. Add XDR packaging method for each NFS request. Contributed by Brandon Li 
(cherry picked from commit cd9182d8b5)
 2014-08-27 11:15:13 -07:00
Jing Zhao c8b254d70e HDFS-6908. Incorrect snapshot directory diff generated by snapshot deletion. Contributed by Juan Yu and Jing Zhao. 
(cherry picked from commit 6b441d227a)
 2014-08-27 10:28:37 -07:00
Karthik Kambatla 2a3c8331fe Add a section for 2.5.1 in CHANGES.txt 
(cherry picked from commit dc154ab86d)
 2014-08-27 00:56:17 -07:00
Arpit Agarwal 9d09b549c5 HDFS-6899: Merging r1619970 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619975 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-23 06:36:46 +00:00
Arpit Agarwal 1846514dd2 HDFS-6899. Undo merge of r1619973 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619974 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-23 06:23:56 +00:00
Arpit Agarwal 554476881f HDFS-6899: Merging r1619970 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619973 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-23 06:22:38 +00:00
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
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
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
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 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
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
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
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
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
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 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 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
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
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
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
Chris Nauroth b66441827b HDFS-6603. Merging change r1607239 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607240 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-02 03:24:00 +00:00
Chris Nauroth 5a918b6b09 HDFS-6591. Merging change r1606927 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606931 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-30 20:57:50 +00:00
Kihwal Lee 905b8c0895 svn merge -c 1606855 merging from trunk to branch-2 to fix:HDFS-6558. Missing newline in the description of dfsadmin -rollingUpgrade. Contributed by Chen He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606856 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-30 18:18:53 +00:00
Steve Loughran 56294d8457 HDFS-6418. Regression: DFS_NAMENODE_USER_NAME_KEY missing 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606534 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-29 16:19:16 +00:00
Kihwal Lee 28b82d46af svn merge -c 1606371 merging from trunk to branch-2 to fix:HDFS-6601. Issues in finalizing rolling upgrade when there is a layout version change. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606372 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-28 15:25:18 +00:00
Uma Maheswara Rao G e41a821997 Merge from trunk. HDFS-6556. Refine XAttr permissions. Contributed by Uma Maheswara Rao G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606322 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-28 11:49:57 +00:00
Aaron Myers 02679111e5 HADOOP-10701. NFS should not validate the access premission only based on the user's primary group. Contributed by Harsh J. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606043 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-27 12:03:33 +00:00
Chris Nauroth 816b152c4a HDFS-6572. Merging change r1605928 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605930 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-26 23:16:12 +00:00
Tsz-wo Sze 3a07f1fc55 svn merge -c 1605565 from trunk for HDFS-6595. Allow the maximum threads for balancing on datanodes to be configurable. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605566 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-25 19:28:11 +00:00
Aaron Myers 25cc3044ec HDFS-6475. WebHdfs clients fail without retry because incorrect handling of StandbyException. Contributed by Yongjun Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605218 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-24 23:09:27 +00:00
Haohui Mai e19d15be8b HDFS-6587. Merge r1605184 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605186 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-24 20:50:07 +00:00
Haohui Mai 58d7d9c78f HDFS-6593. Merge r1605169 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605180 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-24 20:31:18 +00:00
Alejandro Abdelnur e9278879ac HDFS-6430. HTTPFS - Implement XAttr support. (Yi Liu via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605122 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-24 16:02:51 +00:00
Uma Maheswara Rao G 778608e1ad Merge from trunk. HDFS-6486. Add user doc for XAttrs via WebHDFS. Contributed by Yi Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605063 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-24 12:15:29 +00:00
Haohui Mai b86ac2279a HDFS-6562. Merge r1605016 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605018 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-24 06:58:05 +00:00
Arpit Agarwal fccacfb212 HDFS-6578: Merging r1604942 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604943 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-23 21:31:24 +00:00
Arpit Agarwal dd90472574 HDFS-6587: Merging r1604899 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604900 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-23 18:21:33 +00:00
Haohui Mai 3395e01504 HDFS-6580. Merge r1604704 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604705 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-23 07:22:25 +00:00
Vinayakumar B 4e3551eea6 Merged revision(s) 1604692 from hadoop/common/trunk: 
HDFS-6507. Improve DFSAdmin to support HA cluster better. (Contributd by Zesheng Wu)
........

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604695 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-23 05:19:28 +00:00
Haohui Mai dbfde21372 HDFS-6583. Merge r1604541 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604542 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-22 07:41:23 +00:00
Jing Zhao df1ab51d97 HDFS-4667. Merge r1604488 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604489 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-21 23:01:25 +00:00
Chris Nauroth 4c5d6b5f82 HDFS-6222. Remove background token renewer from webhdfs. Contributed by Rushabh Shah and Daryn Sharp. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604301 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-20 23:58:40 +00:00
Haohui Mai 9ba06f53fc HDFS-6557. Merge r1604242 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604244 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-20 18:56:00 +00:00
Jing Zhao eb7ea60a9a HDFS-6535. Merge r1604226 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604228 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-20 18:26:50 +00:00
Aaron Myers f4506f5f92 HDFS-6403. Add metrics for log warnings reported by JVM pauses. Contributed by Yongjun Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604076 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-20 02:39:36 +00:00
Alejandro Abdelnur de63c98853 HDFS-6312. WebHdfs HA failover is broken on secure clusters. (daryn via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604046 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 23:07:09 +00:00
Aaron Myers 16d769c864 HDFS-6549. Add support for accessing the NFS gateway from the AIX NFS client. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604023 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 19:41:24 +00:00
Kihwal Lee 6fdd0698bc svn merge -c 1604011 merging from trunk to branch-2 to fix:HDFS-3848. A Bug in recoverLeaseInternal method of FSNameSystem class. Contributed by Hooman Peiro Sajjad and Chen He. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604012 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 19:06:50 +00:00
Andrew Wang 17a6d23967 HDFS-6492. Support create-time xattrs and atomically setting multiple xattrs. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603978 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 17:55:01 +00:00
Aaron Myers b61992e807 HDFS-6563. NameNode cannot save fsimage in certain circumstances when snapshots are in use. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603713 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 05:20:23 +00:00
Haohui Mai f8240cdb87 HDFS-6480. Merge r1603705 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603706 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 04:15:56 +00:00
Brandon Li a817378930 HDFS-6553. Merging change r1603677 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603679 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 23:55:13 +00:00
Arpit Agarwal 12f2f5d1a3 HDFS-6559: Merging r1603638 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603639 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 21:30:11 +00:00
Brandon Li 5e0bc1ee85 HDFS-6439. Merging change r1603622 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603624 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 20:50:05 +00:00
Jing Zhao 6c92704276 HDFS-6551. Merge r1603612 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603615 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 19:58:36 +00:00
Arpit Agarwal f03ad3d756 HDFS-6552: Merging r1603602 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603603 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 19:37:45 +00:00
Tsz-wo Sze 019466b57b svn merge -c 1603571 from trunk for HDFS-6530. Fix Balancer documentation. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603572 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 18:45:23 +00:00
Jing Zhao ebe064b9ff HDFS-6527. Merge r1603340 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603341 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-18 01:02:23 +00:00
Kihwal Lee 97d57ff1f4 svn merge -c 1603239 merging from trunk to branch-2 to fix:HDFS-6545. Finalizing rolling upgrade can make NN unavailable for a long duration. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603241 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-17 18:00:54 +00:00
Andrew Wang 73da7dde47 HDFS-6528. Add XAttrs to TestOfflineImageViewer. Contributed by Stephen Chu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603021 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-16 23:08:24 +00:00
Andrew Wang 88344f9b06 HDFS-6518. TestCacheDirectives#testExceedsCapacity should take FSN read lock when accessing pendingCached list. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603017 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-16 22:48:22 +00:00
Colin McCabe a2aebb4b28 HDFS-6539. test_native_mini_dfs is skipped in hadoop-hdfs pom.xml (decstery via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602999 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-16 20:36:06 +00:00
Arun Murthy 3278b6cc39 Preparing to release hadoop-2.4.1. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602887 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-16 15:11:14 +00:00
Aaron Myers 8b1abad185 HDFS-6499. Use NativeIO#renameTo instead of File#renameTo in FileJournalManager. Contributed by Yongjun Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602543 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-14 02:17:10 +00:00
Aaron Myers 018793faa7 HDFS-6529. Trace logging for RemoteBlockReader2 to identify remote datanode and file being read. Contributed by Anubhav Dhoot. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602539 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-14 00:59:47 +00:00
Andrew Wang 7ce31cc100 HDFS-6470. TestBPOfferService.testBPInitErrorHandling is flaky. Contributed by Ming Ma. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602491 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-13 19:00:52 +00:00
Haohui Mai 99b18b0019 HDFS-6330. Merge r1602484 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602485 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-13 18:06:57 +00:00
Andrew Wang c5de5f87ea HDFS-3493. Invalidate excess corrupted blocks as long as minimum replication is satisfied. Contributed by Juan Yu and Vinayakumar B. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602293 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 21:17:46 +00:00
Andrew Wang 051049a4f5 HDFS-6395. Skip checking xattr limits for non-user-visible namespaces. Contributed by Yi Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602289 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 20:58:46 +00:00
Andrew Wang 35eeacc122 HDFS-6460. Ignore stale and decommissioned nodes in NetworkTopology#sortByDistance. Contributed by Yongjun Zhang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602287 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 20:45:52 +00:00
Uma Maheswara Rao G d59ca5c4e1 Merged from trunk to branch-2. HDFS-6375. Listing extended attributes with the search permission. Contributed by Charles Lamb 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602133 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 12:02:57 +00:00
Uma Maheswara Rao G 5677e994e3 Merge from trunk to branch-2. HDFS-6464. Support multiple xattr.name parameters for WebHDFS getXAttrs. Contributed by Yi Liu 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602125 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 11:22:43 +00:00
Konstantin Boudnik b0d286dddb HDFS-6471. Merge r1602064 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602066 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-12 05:52:05 +00:00
Alejandro Abdelnur cbec85322f HDFS-6379. HTTPFS - Implement ACLs support. (yoderme via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602042 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 22:40:15 +00:00
Uma Maheswara Rao G 6eb03a41cb Merge HDFS-2006 HDFS XAttrs feature from Trunk to Branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601992 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 19:25:17 +00:00
Haohui Mai 2582dd2ca3 HDFS-6315. Merge r1601960 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601963 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 17:28:12 +00:00
Haohui Mai c6ed9ac1d8 HDFS-6503. Merge r1601958 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601959 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-11 17:14:35 +00:00
Arpit Agarwal 705c23e718 HDFS-6364: Merging r1601771 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601772 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-10 21:03:16 +00:00
Andrew Wang f3e1811dbd HDFS-6399. Add note about setfacl in HDFS permissions guide. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601477 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-09 18:43:33 +00:00
Colin McCabe 7b795f6a7c HDFS-6257. TestCacheDirectives#testExceedsCapacity fails occasionally (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601474 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-09 18:40:00 +00:00
Junping Du d678a9ecf9 Merge r1601199 from trunk: HDFS-6500. Snapshot shouldn't be removed silently after renaming to an existing snapshot. (Contributed by Nicholas SZE) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601200 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-08 07:17:46 +00:00
Konstantin Boudnik 3cc1e9fc31 HDFS-6297. Add CLI testcases to reflect new features of dfs and dfsadmin (Contributed by Dasha Boudnik) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601060 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-07 05:23:40 +00:00
Colin McCabe 38c0114f2b HDFS-6497. Make TestAvailableSpaceVolumeChoosingPolicy deterministic (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601036 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-06 23:41:08 +00:00
Andrew Wang 96defb2d7b HDFS-6487. TestStandbyCheckpoint#testSBNCheckpoints is racy. Contributed by Mit Desai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601017 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-06 21:42:40 +00:00
Colin McCabe 10bfa1ef2b HDFS-6369. Document that BlockReader#available() can return more bytes than are remaining in the block (Ted Yu via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600802 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-06 00:59:44 +00:00
Andrew Wang 2abf0c7bea HDFS-6268. Better sorting in NetworkTopology#pseudoSortByDistance when no local node is found. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599842 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-04 00:37:38 +00:00
Andrew Wang bb87b70e37 Revert bad HDFS-6268 commit from branch-2 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599807 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-03 22:06:11 +00:00
Andrew Wang 2088225632 HDFS-6268. Merged from r1599734. Better sorting in NetworkTopology#pseudoSortByDistance when no local node is found. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599737 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-03 18:33:51 +00:00
Jing Zhao b712ed2b23 HDFS-6424. Merge r1599397 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599398 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-03 00:52:16 +00:00
Michael Stack 78d46e8508 HDFS-6109 let sync_file_range() system call run in background (Liang Xie via stack) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599351 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-02 20:34:20 +00:00
Brandon Li c1e2673754 HDFS-6056. Merging change r1598782 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598792 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-31 00:26:34 +00:00
Andrew Wang 0214a435a5 HDFS-6472. Merged from r1598746. fix typo in webapps/hdfs/explorer.js. Contributed by Juan Yu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598747 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-30 20:44:57 +00:00
Alejandro Abdelnur 2e8259ae25 HDFS-6404. HttpFS should use a 000 umask for mkdir and create operations. (yoderme via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598669 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-30 16:51:04 +00:00
Chris Nauroth c19b55ce32 HDFS-6463. Merging change r1598437 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598438 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 23:08:52 +00:00
Andrew Wang e3bd43766f HDFS-6447. balancer should timestamp the completion message. Contributed by Juan Yu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598412 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 21:39:09 +00:00
Andrew Wang 72aaab255d HDFS-6356. Merged from r1598408. Fix typo in DatanodeLayoutVersion. Contributed by Tulasi G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598409 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 21:33:22 +00:00
Brandon Li e4346e9877 HDFS-6462. Merging change r1598405 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598407 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 21:19:17 +00:00
Andrew Wang b5e9d1e8bd HDFS-6461. Use Time#monotonicNow to compute duration in DataNode#shutDown. Contributed by James Thomas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598400 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-29 21:02:31 +00:00
Andrew Wang e82172c455 HDFS-6453. Use Time#monotonicNow to avoid system clock reset. Contributed by Liang Xie. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598145 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-28 21:25:55 +00:00
Arpit Agarwal b97fac3359 HDFS-6442: Merging r1598078 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598081 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-28 17:45:21 +00:00
Colin McCabe f8dd75e7e9 HDFS-6448. BlockReaderLocalLegacy should set socket timeout based on conf.socketTimeout (liangxie via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598080 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-28 17:44:38 +00:00
Brandon Li 14ea885990 HDFS-6411. Merging change r1597895 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597896 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-27 23:05:15 +00:00
Brandon Li 3bd21e8814 HDFS-6416. Merging change r1597868 from trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597870 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-27 20:26:12 +00:00
Jing Zhao 3bfc0088f4 HDFS-6227. Merge r1597829 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597830 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-27 17:23:29 +00:00
Michael Stack 4206ef2611 HBASE-6110 adding more slow action log in critical write path (Liang Xie via stack) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597634 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-26 19:44:02 +00:00
Arpit Agarwal 2fe6e4ccfe HDFS-6443: Merging r1597238 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597240 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-24 05:09:39 +00:00
Andrew Wang 2a9d3a8824 HDFS-6435. Merged from r1596966. Add support for specifying a static uid/gid mapping for the NFS gateway. (atm via wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596967 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-22 20:45:13 +00:00
Jing Zhao 380bb4de57 HDFS-6423. Merge r1596774 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596775 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-22 08:08:56 +00:00
Jing Zhao 2858c7f470 HDFS-6438. Merge r1596772 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596773 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-22 07:32:13 +00:00
Chris Nauroth 378153dd71 HDFS-6433. Merging change r1596742 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596745 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-22 04:58:39 +00:00
Chris Nauroth c362382259 HDFS-6409. Merging change r1596739 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596740 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-22 04:43:59 +00:00
Andrew Wang 1ad5343c1f HDFS-6396. Remove support for ACL feature from INodeSymlink. Contributed by Charles Lamb. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596717 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-22 00:16:02 +00:00
Kihwal Lee 1f3ec0616a svn merge -c 1596344 merging from trunk to branch-2 to fix:HDFS-6419. TestBookKeeperHACheckpoints.TestSBNCheckpoints fails on trunk. Contributed by Akira AJISAKA. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596352 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-20 18:19:54 +00:00
Jing Zhao ffc50dfe01 HDFS-6432. Merge r1596334 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596335 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-20 17:35:14 +00:00
Colin McCabe 11bb19d1ff HDFS-6421. Fix vecsum.c compile on BSD and some other systems (Mit Desai via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596325 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-20 17:20:00 +00:00
Kihwal Lee c412a2bdf7 svn merge -c 1595978 merging from trunk to branch-2 to fix:HDFS-6397. NN shows inconsistent value in deadnode count. Contributed by Mohammad Kamrul Islam. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595980 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-19 17:54:18 +00:00
Konstantin Boudnik 0527d364e5 Merge r1595744 from trunk. HDFS-6325. Append should fail if the last block has insufficient number of replicas (Keith Pak via cos) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595745 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-19 05:26:44 +00:00
Colin McCabe 88335a843f HDFS-4913. Deleting file through fuse-dfs when using trash fails, requiring root permissions (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595372 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-16 22:24:54 +00:00
Aaron Myers 3f617e325c HDFS-6406. Add capability for NFS gateway to reject connections from unprivileged ports. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595352 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-16 21:25:05 +00:00
Junping Du 584caaef1b Merge r1595145 from trunk: HDFS-6250. Fix test failed in TestBalancerWithNodeGroup.testBalancerWithRackLocality (Contributed by Binglin Chang and Chen He 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595146 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-16 09:59:24 +00:00
Andrew Wang c8ba7039b7 HDFS-6345. DFS.listCacheDirectives() should allow filtering based on cache directive ID. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595087 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-16 01:19:17 +00:00
Chris Nauroth 17c08afc83 HDFS-6402. Merging change r1595070 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595071 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-15 23:17:23 +00:00
Arpit Agarwal b8c97091cc HDFS-6362. Merge r1595056 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595066 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-15 22:41:01 +00:00
Arpit Agarwal 8970cf4d86 HDFS-4052. Merge r1398631 from trunk to branch-2. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595063 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-15 22:21:48 +00:00