Commit Graph

3519 Commits

Author SHA1 Message Date
arp e257b6dbb1 Merge branch 'trunk' into HDFS-6581 2014-09-20 16:13:17 -07:00
arp 50b321068d HDFS-7108. Fix unit test failures in SimulatedFsDataset. (Arpit Agarwal) 2014-09-20 16:12:17 -07:00
Jing Zhao 84a0a629d3 HDFS-7095. Archival Storage: TestStorageMover often fails in Jenkins. Contributed by Jing Zhao. 2014-09-20 13:44:53 -07:00
arp b2d5ed36bc HDFS-7100. Make eviction scheme pluggable. (Arpit Agarwal) 2014-09-20 13:25:23 -07:00
arp 09dab88d3e Merge branch 'trunk' into HDFS-6581 2014-09-20 10:34:45 -07:00
cnauroth f85cc14eb4 HDFS-7073. Allow falling back to a non-SASL connection on DataTransferProtocol in several edge cases. Contributed by Chris Nauroth. 2014-09-19 21:23:26 -07:00
cnauroth 332e2e23ba HDFS-7105. Fix TestJournalNode#testFailToStartWithBadConfig to match log output change. Contributed by Ray Chiang. 2014-09-19 21:04:55 -07:00
Kihwal Lee 9e35571965 HDFS-7046. HA NN can NPE upon transition to active. Contributed by
Kihwal Lee.
2014-09-19 17:07:06 -05:00
arp 222bf0fe67 Merge branch 'trunk' into HDFS-6581 2014-09-19 10:02:27 -07:00
Colin Patrick Mccabe 25fd69a8f9 HDFS-7096. Fix TestRpcProgramNfs3 to use DFS_ENCRYPTION_KEY_PROVIDER_URI (clamb via cmccabe) 2014-09-19 09:20:25 -07:00
Kihwal Lee bf27b9ca57 HDFS-7065. Pipeline close recovery race can cause block corruption.
Contributed by Kihwal Lee.
2014-09-19 09:00:13 -05:00
Kihwal Lee f02d934fed HDFS-6948. DN rejects blocks if it has older UC block. Contributed by
Eric Payne.
2014-09-19 08:50:43 -05:00
arp f8bbf80067 Merge branch 'trunk' into HDFS-6581
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/StorageType.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsLocatedFileStatus.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFileAttributes.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FSImageFormatPBSnapshot.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/fsimage.proto
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/hdfs.proto
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
2014-09-18 22:26:42 -07:00
arp e79c98c11f HDFS-7091. Add forwarding constructor for INodeFile for existing callers. (Arpit Agarwal) 2014-09-18 19:20:25 -07:00
Andrew Wang 8e73084491 HDFS-6840. Clients are always sent to the same datanode when read is off rack. (wang) 2014-09-18 17:49:17 -07:00
Andrew Wang 20a076bafc HDFS-6970. Move startFile EDEK retries to the DFSClient. (wang) 2014-09-18 17:35:24 -07:00
Colin Patrick Mccabe fe38d2e9b5 HDFS-6727. Refresh data volumes on DataNode based on configuration changes (Lei Xu via Colin Patrick McCabe) 2014-09-18 16:52:46 -07:00
Tsz-Wo Nicholas Sze 5d01a684a3 Revise the HDFS-6584 entry CHANGES.txt. 2014-09-19 07:46:18 +08:00
Tsz-Wo Nicholas Sze fd3cddf364 Fix hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt for HDFS-6584 after
merge.
2014-09-19 07:33:43 +08:00
Tsz-Wo Nicholas Sze 98f7bfe993 Merge branch 'HDFS-6584' into trunk 2014-09-19 07:11:19 +08:00
arp 22295b4783 Merge branch 'trunk' into HDFS-6581 2014-09-18 15:59:37 -07:00
Andrew Wang 70be56d093 HDFS-7003. Add NFS Gateway support for reading and writing to encryption zones. (clamb via wang) 2014-09-18 14:57:25 -07:00
arp 0b10e5a0f7 Merge branch 'trunk' into HDFS-6581 2014-09-18 12:10:45 -07:00
Colin Patrick Mccabe 570b8b468e HDFS-7047. Expose FileStatus#isEncrypted in libhdfs (cmccabe) 2014-09-18 11:42:23 -07:00
arp 5e4627d0fb HDFS-7084. FsDatasetImpl#copyBlockFiles debug log can be improved. (Contributed by Xiaoyu Yao) 2014-09-18 11:13:53 -07:00
arp 849ccfa699 Merge branch 'trunk' into HDFS-6581 2014-09-18 11:06:40 -07:00
Jing Zhao 76ccb80fad HDFS-7088. Archival Storage: fix TestBalancer and TestBalancerWithMultipleNameNodes. Contributed by Tsz Wo Nicholas Sze. 2014-09-18 10:54:01 -07:00
Tsz-Wo Nicholas Sze 2d2b0009e6 Merge branch 'trunk' into HDFS-6584
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
2014-09-18 13:00:29 +08:00
Andrew Wang 0ecefe6017 HDFS-7078. Fix listEZs to work correctly with snapshots. (wang) 2014-09-17 21:28:05 -07:00
Andrew Wang 10e8602f32 HDFS-7004. Update KeyProvider instantiation to create by URI. (wang) 2014-09-17 20:14:40 -07:00
Andrew Wang bf38793ce1 Move some HDFS JIRAs to the correct CHANGES.txt 2014-09-17 18:08:34 -07:00
arp 4eab083b1b HDFS-7080. Fix finalize and upgrade unit test failures. (Arpit Agarwal) 2014-09-17 15:25:04 -07:00
arp a186d514bd Merge branch 'trunk' into HDFS-6581
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
2014-09-17 15:03:55 -07:00
Jing Zhao 911979c8ab Merge changes from trunk 2014-09-17 13:12:45 -07:00
Colin Patrick Mccabe e3803d002c HDFS-6843. Create FileStatus isEncrypted() method (clamb via cmccabe) 2014-09-17 12:55:35 -07:00
arp 24f8156886 Merge branch 'trunk' into HDFS-6581 2014-09-17 12:10:50 -07:00
Andrew Wang ea4e2e843e HDFS-6705. Create an XAttr that disallows the HDFS admin from accessing a file. (clamb via wang) 2014-09-17 11:23:47 -07:00
Jing Zhao b014e83bc5 HDFS-6864. Archival Storage: add user documentation. Contributed by Tsz Wo Nicholas Sze. 2014-09-17 09:40:17 -07:00
Alejandro Abdelnur c0c7e6fabd HADOOP-11062. CryptoCodec testcases requiring OpenSSL should be run only if -Pnative is used. (asuresh via tucu) 2014-09-16 23:36:36 -07:00
Alejandro Abdelnur e14e71d5fe HADOOP-11096. KMS: KeyAuthorizationKeyProvider should verify the keyversion belongs to the keyname on decrypt. (tucu) 2014-09-16 23:20:35 -07:00
Tsz-Wo Nicholas Sze 91f6ddeb34 Fix hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt . 2014-09-17 14:09:08 +08:00
Tsz-Wo Nicholas Sze bd2e409de1 HDFS-7072. Fix TestBlockManager and TestStorageMover. Contributed by Jing Zhao 2014-09-17 13:48:32 +08:00
arp dcbc467301 HDFS-7079. Few more unit test fixes for HDFS-6581. (Arpit Agarwal) 2014-09-16 18:19:57 -07:00
arp a24a9331d4 Merge branch 'trunk' into HDFS-6581 2014-09-16 18:18:09 -07:00
Jing Zhao 432b863719 Merge changes from trunk 2014-09-16 17:58:39 -07:00
Jing Zhao 2e4033e872 HDFS-7052. Archival Storage: Add Mover into hdfs script. Contributed by Jing Zhao. 2014-09-16 17:52:28 -07:00
Andrew Wang a044407b5c HDFS-6789. TestDFSClientFailover.testFileContextDoesntDnsResolveLogicalURI and TestDFSClientFailover.testDoesntDnsResolveLogicalURI failing on jdk7. Contributed by Akira Ajisaka. 2014-09-16 17:02:06 -07:00
Andrew Wang 33ce887c20 HDFS-6851. Refactor EncryptionZoneWithId and EncryptionZone. (clamb via wang) 2014-09-16 16:41:09 -07:00
Benoy Antony 02adf7185d HDFS-6799. The invalidate method in SimulatedFSDataset failed to remove (invalidate) blocks from the file system. Contributed by Megasthenis Asteris. 2014-09-16 16:24:23 -07:00
Allen Wittenauer 7971c97ec1 HADOOP-11022. User replaced functions get lost 2-3 levels deep (e.g., sbin) (aw) 2014-09-16 16:06:23 -07:00