big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,560 Commits 2 Branches 2 Tags 264 MiB
74a7e227c8
Commit Graph

2289 Commits

Author SHA1 Message Date
Andrew Wang
bd616552cc 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/trunk@1618684 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 18:08:42 +00:00
Jing Zhao
5d5aae0694 HDFS-6801. Archival Storage: Add a new data migration tool. Contributed by Tsz Wo Nicholas Sze. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1618675 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 17:51:18 +00:00
Arpit Agarwal
1c77c80410 HDFS-6783. Addendum patch to fix test failures. (Contributed by Yi Liu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618635 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 15:34:58 +00:00
Tsz-wo Sze
cb75b6b07d Merge r1609845 through r1618416 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1618417 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-16 21:02:21 +00:00
Tsz-wo Sze
9b250d74f0 HDFS-6847. Support storage policy on directories and include storage policy in HdfsFileStatus. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1618416 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-16 20:58:20 +00:00
Charles Lamb
20dcb841ce HDFS-6546. Add non-superuser capability to get the encryption zone for a specific path. (clamb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1618022 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 19:11:06 +00:00
Uma Maheswara Rao G
44864c68b5 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/trunk@1617872 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 04:20:00 +00:00
Vinayakumar B
195961a7c1 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/trunk@1617799 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 18:43:05 +00:00
Vinayakumar B
6554994fab Reverted 
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/trunk@1617794 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 18:36:51 +00:00
Vinayakumar B
471b1368e2 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/trunk@1617784 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 18:06:33 +00:00
Haohui Mai
03d8ff496a HDFS-6567. Normalize the order of public final in HdfsFileStatus. Contributed by Tassapol Athiapinya. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617779 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 17:45:47 +00:00
Arpit Agarwal
a72fba5853 HDFS-6836. HDFS INFO logging is verbose & uses file appenders. (Contributed by Xiaoyu Yao) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617603 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-12 21:49:48 +00:00
Arpit Agarwal
662c5bb3af HDFS-6830. BlockInfo.addStorage fails when DN changes the storage for a block replica. (Arpit Agarwal) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617598 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-12 21:42:21 +00:00
Jing Zhao
37207b75d4 HDFS-6835. Archival Storage: Add a new API to set storage policy. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1617568 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-12 19:32:09 +00:00
Charles Lamb
74f7be0887 merge from trunk r1617527 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1617532 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-12 17:02:07 +00:00
Jing Zhao
04884cd530 Merging r1616894 through r1617376 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1617377 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-11 22:27:50 +00:00
Haohui Mai
80691b073f HDFS-6838. Code cleanup for unnecessary INode replacement. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617361 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-11 21:28:33 +00:00
Jing Zhao
e60673697d HDFS-6837. Code cleanup for Balancer and Dispatcher. Contributed by Tsz Wo Nicholas Sze. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617337 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-11 18:01:14 +00:00
Jing Zhao
9d5f8fa68d Merging r1616428 through r1616893 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1616897 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 22:21:35 +00:00
Jing Zhao
c3cf331dc9 HDFS-6828. Separate block replica dispatching from Balancer. Contributed by Tsz Wo Nicholas Sze. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616889 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 21:33:57 +00:00
Arpit Agarwal
05d1bf4157 HDFS-6830. Revert accidental checkin 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616884 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 21:22:48 +00:00
Arpit Agarwal
a70c9de3f1 HDFS-6830. BlockInfo.addStorage fails when DN changes the storage for a block replica. (Arpit Agarwal) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616883 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 21:20:19 +00:00
Ravi Prakash
6da830cfdf 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/trunk@1616845 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 18:21:18 +00:00
Uma Maheswara Rao G
1fa2d6c4ba HDFS-6834. Improve the configuration guidance in DFSClient when there are no Codec classes found in configs. Contributed by Uma Maheswara Rao G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616721 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 11:35:16 +00:00
Arpit Agarwal
d3a2fe2807 HDFS-6772. Get DN storages out of blockContentsStale state faster after NN restarts. (Contributed by Ming Ma) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616680 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-08 05:41:38 +00:00
Aaron Myers
d758be1f35 HDFS-6740. Make FSDataset support adding data volumes dynamically. Contributed by Lei Xu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616623 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 22:59:59 +00:00
Aaron Myers
eca80dca3e 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/trunk@1616615 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 22:46:51 +00:00
Andrew Wang
311d2f0773 Merge from trunk to branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616589 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 20:26:52 +00:00
Tsz-wo Sze
b50cb5e056 Merge r1609845 through r1616427 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1616428 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 07:38:23 +00:00
Tsz-wo Sze
0ed8732fee HDFS-6812. Remove addBlock and replaceBlock from DatanodeDescriptor. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616426 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 07:30:53 +00:00
Tsz-wo Sze
83b9933db3 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/trunk@1616422 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-07 07:18:48 +00:00
Jing Zhao
efc73a0f13 HDFS-6791. A block could remain under replicated if all of its replicas are on decommissioned nodes. Contributed by Ming Ma. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616306 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-06 19:03:07 +00:00
Yi Liu
2b5e044424 HDFS-6817. Fix findbugs and other warnings. (yliu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616092 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-06 04:43:58 +00:00
Brandon Li
812ac91add HDFS-6790. DFSUtil Should Use configuration.getPassword for SSL passwords. Contributed by Larry McCay 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1616058 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-06 00:50:07 +00:00
Andrew Wang
ac47ad11de HDFS-6394. HDFS encryption documentation. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1616016 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 21:49:31 +00:00
Andrew Wang
ac73d416f3 Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615844 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 02:30:54 +00:00
Uma Maheswara Rao G
431857d09d HDFS-6787. Remove duplicate code in FSDirectory#unprotectedConcat. Contributed by Yi Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615622 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-04 15:44:44 +00:00
Uma Maheswara Rao G
10db613389 HADOOP-10886. CryptoCodec#getCodecclasses throws NPE when configurations not loaded. Contributed by Uma Maheswara Rao G. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615523 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-04 09:56:57 +00:00
Vinayakumar B
33518e5613 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/trunk@1615504 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-04 08:43:51 +00:00
Vinayakumar B
30a9ec26f7 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/trunk@1615491 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-04 06:44:06 +00:00
Arpit Agarwal
bcf7ab1d0f HDFS-6810. StorageReport array is initialized with wrong size in DatanodeDescriptor#getStorageReports. (Contributed by szetszwo) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615381 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-03 02:08:32 +00:00
Colin McCabe
1ba3f89714 HDFS-6482. Use block ID-based block layout on datanodes (James Thomas via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615223 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 20:41:05 +00:00
Andrew Wang
07860b1c9e 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/trunk@1615190 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 18:56:06 +00:00
Andrew Wang
70c99278a9 HDFS-6780. Batch the encryption zones listing API. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615189 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 18:47:01 +00:00
Arpit Agarwal
45db4d204b HDFS-6794. Update BlockManager methods to use DatanodeStorageInfo where possible. (Arpit Agarwal) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615169 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 16:58:06 +00:00
Tsz-wo Sze
7e12b1912f HDFS-6796. Improve the argument check during balancer command line parsing. Contributed by Benoy Antony 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615107 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 14:12:35 +00:00
Tsz-wo Sze
dc7744d2e5 Merge r1609845 through r1615019 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1615020 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 01:29:49 +00:00
Arpit Agarwal
b5b862e3af HDFS-6797. DataNode logs wrong layoutversion during upgrade. (Contributed by Benoy Antony) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615017 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 01:13:42 +00:00
Tsz-wo Sze
b8597e6a10 HDFS-6685. Balancer should preserve storage type of replicas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615015 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 01:05:33 +00:00
Andrew Wang
beebb36595 Fix some merge errors that slipped through. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615013 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-31 22:45:08 +00:00
Arpit Agarwal
b8b8f3f5e7 HDFS-6441. Add ability to exclude/include specific datanodes while balancing. (Contributed by Benoy Antony and Yu Li) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614812 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-31 06:02:46 +00:00
Charles Lamb
ab47b666d0 HDFS-6785. Should not be able to create encryption zone using path to a non-directory file. (clamb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1614755 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 20:00:24 +00:00
Andrew Wang
7405953692 HDFS-6692. Add more HDFS encryption tests. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1614735 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 18:39:48 +00:00
Chris Nauroth
535fe14ded HDFS-6570. add api that enables checking if a user has certain permissions on a file. Contributed by Jitendra Pandey. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614723 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 17:49:09 +00:00
Steve Loughran
f6436c0720 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/trunk@1614663 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 14:05:59 +00:00
Andrew Wang
c3fa0b5884 Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1614553 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 06:09:33 +00:00
Andrew Wang
09e7ff05df 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/trunk@1614547 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 05:57:55 +00:00
Charles Lamb
9ca2f34c8f HDFS-6730. Create a .RAW extended attribute namespace. (clamb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1614535 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 01:35:04 +00:00
Andrew Wang
415223548d HDFS-6771. Require specification of an encryption key when creating an encryption zone. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1614519 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-29 23:39:38 +00:00
Andrew Wang
407bb3d3e4 HDFS-6509. Create a special /.reserved/raw directory for raw access to encrypted data. Contributed by Charles Lamb. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1614490 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-29 21:11:26 +00:00
Tsz-wo Sze
10d6210322 Merge r1609845 through r1614231 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1614234 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-29 00:49:14 +00:00
Tsz-wo Sze
4f9ffc7455 HDFS-6739. Add getDatanodeStorageReport to ClientProtocol. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614215 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-28 23:43:39 +00:00
Charles Lamb
1d3e9ec935 merge from trunk r1613787 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1613788 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-27 13:32:51 +00:00
Chris Nauroth
9bce3eca42 HDFS-6749. FSNamesystem methods should call resolvePath. Contributed by Charles Lamb. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1613561 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-26 04:18:28 +00:00
Colin McCabe
e85a3fecc6 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/trunk@1613537 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-25 23:56:47 +00:00
Colin McCabe
57d8f829d9 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/trunk@1613522 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-25 22:12:37 +00:00
Andrew Wang
b9e4be4523 HDFS-6724. Decrypt EDEK before creating CryptoInputStream/CryptoOutputStream. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1613490 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-25 18:33:10 +00:00
Vinayakumar B
2bb650146d HDFS-5919. FileJournalManager doesn't purge empty and corrupt inprogress edits files (vinayakumarb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1613355 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-25 07:02:53 +00:00
Andrew Wang
e670641bbf Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1613334 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-24 23:55:15 +00:00
Andrew Wang
e171254d56 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/trunk@1613329 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-24 23:42:06 +00:00
Jing Zhao
8c6e172a0a HDFS-6715. Webhdfs wont fail over when it gets java.io.IOException: Namenode is in startup mode. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1613237 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-24 18:28:00 +00:00
Todd Lipcon
2054453a39 HADOOP-10882. Move DirectBufferPool into common util. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1613006 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-24 06:22:02 +00:00
Colin McCabe
a6b1d2a85c 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/trunk@1612943 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-23 20:59:39 +00:00
Andrew Wang
552b4fb9f9 Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612928 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-23 19:26:29 +00:00
Uma Maheswara Rao G
5343b43fd9 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/trunk@1612922 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-23 19:05:11 +00:00
Tsz-wo Sze
48dc486672 Merge r1609845 through r1612880 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1612883 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-23 17:30:06 +00:00
Tsz-wo Sze
ac5e8aed7c HDFS-6686. Change BlockPlacementPolicy to use fallback when some storage types are unavailable. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1612880 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-23 17:25:06 +00:00
Charles Lamb
512b756973 HDFS-6738. Remove unnecessary getEncryptionZoneForPath call in EZManager#createEncryptionZone. (clamb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612849 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-23 15:23:03 +00:00
Charles Lamb
687ce1a5fc HDFS-6733. Creating encryption zone results in NPE when KeyProvider is null. (clamb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612843 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-23 14:51:06 +00:00
Brandon Li
853ed29f2d HDFS-6731. Run 'hdfs zkfc -formatZK' on a server in a non-namenode will cause a null pointer exception. Contributed by Masatake Iwasaki 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612715 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 22:29:04 +00:00
Andrew Wang
69b75fca7a HDFS-6720. Remove KeyProvider in EncryptionZoneManager. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612632 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 17:57:06 +00:00
Andrew Wang
c83c5b868e HDFS-6701. Make seed optional in NetworkTopology#sortByDistance. Contributed by Ashwin Shankar. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612625 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 17:47:49 +00:00
Yi Liu
b52b80d7bd HADOOP-10853. Refactor get instance of CryptoCodec and support create via algorithm/mode/padding. (yliu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612513 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 08:38:38 +00:00
Tsz-wo Sze
ee13f8bf3e Merge r1609845 through r1612502 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1612505 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 08:23:34 +00:00
Tsz-wo Sze
25b0e8471e 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/trunk@1612493 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 07:41:24 +00:00
Andrew Wang
b57ec16567 HDFS-6718. Remove EncryptionZoneManager lock. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612439 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 00:55:20 +00:00
Andrew Wang
7b466b3b70 HDFS-6716. Update usage of KeyProviderCryptoExtension APIs on NameNode. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612438 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 00:27:51 +00:00
Tsz-wo Sze
3de6c61f86 Merge r1609845 through r1612431 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1612432 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-21 23:37:54 +00:00
Tsz-wo Sze
44d9bb26d6 HDFS-6680. BlockPlacementPolicyDefault does not choose favored nodes correctly. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612427 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-21 23:21:12 +00:00
Andrew Wang
cb20bb6117 Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612403 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-21 21:44:50 +00:00
Tsz-wo Sze
ee3a32784f Merge r1609845 through r1612268 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1612270 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-21 13:48:02 +00:00
Tsz-wo Sze
0a736fbc17 HDFS-6679. Bump NameNodeLayoutVersion and update editsStored test files. Contributed by vinayakumarb 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1612266 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-21 13:38:06 +00:00
Tsz-wo Sze
014be2510f HDFS-6710. Change BlockPlacementPolicy to consider block storage policy in replica deletion. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1612265 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-21 13:34:10 +00:00
Tsz-wo Sze
7c18f8d55b HDFS-6616. Add exclude-datanodes feature to WebHDFS redirection so that it will not redirect retries to the same datanode. Contributed by zhaoyunjiong 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611750 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 18:20:20 +00:00
Daryn Sharp
551024915d 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/trunk@1611737 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 17:58:07 +00:00
Tsz-wo Sze
2b07af0c59 Merge r1609845 through r1611734 from tunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1611736 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 17:57:51 +00:00
Tsz-wo Sze
08466eaa00 HDFS-6700. BlockPlacementPolicy shoud choose storage but not datanode for deletion. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611731 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 17:40:03 +00:00
Chris Nauroth
5f9e52f745 HDFS-6597. Add a new option to NN upgrade to terminate the process after upgrade on NN is completed. Contributed by Danilo Vunjak. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1611723 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 17:14:22 +00:00
Charles Lamb
962ef6939e HDFS-6490. Fix the keyid format for generated keys in FSNamesystem.createEncryptionZone (clamb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1611722 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 17:13:55 +00:00
Vinayakumar B
9f75b97a09 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/trunk@1611562 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-18 08:48:52 +00:00