Commit Graph

2080 Commits

Author SHA1 Message Date
arp
8c9860f7c9 HDFS-7071. Undo accidental commit of binary file editsStored. 2014-09-20 17:11:11 -07:00
arp
486a76a39b HDFS-7071. Updated editsStored and editsStored.xml to bump layout version and add LazyPersist flag. (Contributed by Xiaoyu Yao and Arpit Agarwal) 2014-09-20 16:58:58 -07:00
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
arp
222bf0fe67 Merge branch 'trunk' into HDFS-6581 2014-09-19 10:02:27 -07: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
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
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
Tsz-Wo Nicholas Sze
bd2e409de1 HDFS-7072. Fix TestBlockManager and TestStorageMover. Contributed by Jing Zhao 2014-09-17 13:48:32 +08: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
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
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
arp
4603e4481f HDFS-7064. Fix unit test failures in HDFS-6581 branch. (Contributed by Xiaoyu Yao) 2014-09-16 15:45:07 -07:00
Alejandro Abdelnur
3e85f5b605 HDFS-7006. Test encryption zones with KMS. (Anthony Young-Garner and tucu) 2014-09-16 14:36:07 -07:00
arp
e0d7fb48fb Merge branch 'trunk' into HDFS-6581
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/Receiver.java
2014-09-16 14:32:57 -07:00
Colin Patrick Mccabe
56119fec96 HDFS-6880. Adding tracing to DataNode data transfer protocol (iwasakims via cmccabe) 2014-09-16 13:59:32 -07:00
Kihwal Lee
0c26412be4 HDFS-6965. NN continues to issue block locations for DNs with full
disks. Contributed by Rushabh Shah.
2014-09-16 09:04:54 -05:00
arp
a7814e1aa4 Merge branch 'trunk' into HDFS-6581 2014-09-15 15:30:19 -07:00
Kihwal Lee
2f847b3357 HDFS-7059. HAadmin transtionToActive with forceActive option can show
confusing message. Contributed by Rushabh Shah.
2014-09-15 16:27:22 -05:00
Jing Zhao
ece3ecabdf Merge remote-tracking branch 'origin/trunk' into HDFS-6584 2014-09-15 10:45:45 -07:00
Andrew Wang
43b0303008 HDFS-7032. Add WebHDFS support for reading and writing to encryption zones. Contributed by Charles Lamb. 2014-09-15 10:23:57 -07:00
Jing Zhao
2689b6ca72 HDFS-7062. Archival Storage: skip under construction block for migration. Contributed by Jing Zhao. 2014-09-15 10:16:56 -07:00
Andrew Wang
fc741b5d78 HDFS-7061. Add test to verify encryption zone creation after NameNode restart without saving namespace. Contributed by Stephen Chu. 2014-09-14 23:49:01 -07:00
Tsz-Wo Nicholas Sze
dba52ce0bb Merge branch 'trunk' into HDFS-6584 2014-09-13 14:56:48 +08:00
arp
9f22fb8c9a HDFS-6978. Directory scanner should correctly reconcile blocks on RAM disk. (Arpit Agarwal) 2014-09-12 22:13:18 -07:00
arp
7aeda47bd9 Merge branch 'trunk' into HDFS-6581 2014-09-12 11:45:11 -07:00
cnauroth
d6ce26986e HDFS-7051. TestDataNodeRollingUpgrade#isBlockFileInPrevious assumes Unix file path separator. Contributed by Chris Nauroth. 2014-09-11 20:58:15 -07:00
Jing Zhao
8de20a1987 Merge trunk into HDFS-6584 2014-09-11 13:04:35 -07:00
Jing Zhao
0d85f7e591 HDFS-7034. Archival Storage: Fix TestBlockPlacement and TestStorageMover. Contributed by Jing Zhao. 2014-09-11 13:00:43 -07:00
Andrew Wang
1e684995d7 HDFS-7045. Fix NameNode deadlock when opening file under /.reserved path. Contributed by Yi Liu. 2014-09-11 10:59:09 -07:00
Andrew Wang
bf64fce78c HDFS-6966. Add additional unit tests for encryption zones. Contributed by Stephen Chu. 2014-09-11 10:26:13 -07:00
Tsz-Wo Nicholas Sze
70dfe9cfab Merge branch 'trunk' into HDFS-6584 2014-09-11 15:23:38 +08:00
Jing Zhao
db41a1b7b9 Merge changes from trunk 2014-09-09 22:47:50 -07:00
Alejandro Abdelnur
bbff44cb03 HDFS-6776. Using distcp to copy data between insecure and secure cluster via webdhfs doesn't work. (yzhangal via tucu) 2014-09-09 22:16:42 -07:00
arp
0d2f6b4600 Merge branch 'trunk' into HDFS-6581 2014-09-09 18:07:18 -07:00
Konstantin V Shvachko
05af0ff4be Revert HDFS-6940. 2014-09-09 17:30:10 -07:00
cnauroth
2749fc677c Newly moved block replica been invalidated and deleted in TestBalancer. Contributed by Binglin Chang. 2014-09-09 11:32:54 -07:00
arp
61ccd50362 Merge branch 'trunk' into HDFS-6581
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
2014-09-08 22:44:04 -07:00
arp
f949f6b548 HDFS-6981. Fix DN upgrade with layout version change. (Arpit Agarwal) 2014-09-08 21:20:55 -07:00
Andrew Wang
04915a0814 HDFS-6951. Correctly persist raw namespace xattrs to edit log and fsimage. Contributed by Charles Lamb. 2014-09-08 16:59:30 -07:00
Jing Zhao
6997c1c658 Merge remote-tracking branch 'origin/trunk' into HDFS-6584 2014-09-08 15:15:34 -07:00
arp
4ff128af12 Merge branch 'trunk' into HDFS-6581 2014-09-08 15:00:01 -07:00
Jing Zhao
867f0f141c HDFS-7029. Archival Storage: fix TestDFSInotifyEventInputStream and TestDistributedFileSystem. Contributed by Tsz Wo Nicholas Sze. 2014-09-08 14:57:27 -07:00
arp
a18caf7753 HDFS-6991. Notify NN of evicted block before deleting it from RAM disk. (Arpit Agarwal) 2014-09-08 14:29:30 -07:00
Jing Zhao
74a7e227c8 HDFS-7027. Archival Storage: Mover does not terminate when some storage type is out of space. Contributed by Tsz Wo Nicholas Sze. 2014-09-08 14:21:26 -07:00
Jing Zhao
2b5c528a73 HDFS-6875. Archival Storage: support migration for a list of specified paths. Contributed by Jing Zhao. 2014-09-08 14:10:00 -07:00
Colin Patrick Mccabe
cad14aa916 HDFS-6036. Forcibly timeout misbehaving DFSClients that try to do no-checksum reads that extend too long. (cmccabe) 2014-09-08 12:51:56 -07:00
Kihwal Lee
6a84f88c11 HDFS-7005. DFS input streams do not timeout. Contributed by Daryn Sharp. 2014-09-08 14:41:44 -05:00
arp
ccdf0054a3 HDFS-6977. Delete all copies when a block is deleted from the block space. (Arpit Agarwal) 2014-09-08 10:35:54 -07:00
Tsz-Wo Nicholas Sze
f1432e2424 Merge branch 'trunk' into HDFS-6584
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
2014-09-08 10:54:48 +08:00
arp
eb8284d50e Merge trunk into HDFS-6581
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/FsVolumeSpi.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java
2014-09-07 14:46:46 -07:00
cnauroth
a23144fd8a HDFS Credential Provider related Unit Test Failure. Contributed by Xiaoyu Yao. 2014-09-07 08:39:20 -07:00
arp
d1fa58292e HDFS-6898. DN must reserve space for a full block when an RBW block is created. (Contributed by Arpit Agarwal) 2014-09-06 21:04:29 -07:00
Tsz-Wo Nicholas Sze
22a41dce4a HDFS-6997: add more tests for data migration and replicaion. 2014-09-07 07:44:28 +08:00
arp
31bbeaf383 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 2014-09-06 12:28:22 -07:00
Konstantin V Shvachko
88209ce181 HDFS-6940. Refactoring to allow ConsensusNode implementation.
Contributed by Konstantin Shvachko.
2014-09-06 12:07:52 -07:00
Alejandro Abdelnur
3b35f81603 HDFS-6986. DistributedFileSystem must get delegation tokens from configured KeyProvider. (zhz via tucu) 2014-09-05 22:33:48 -07:00
arp
339d21f273 Merge trunk into HDFS-6581
Conflicts:
	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/NameNodeLayoutVersion.java
2014-09-05 21:36:25 -07:00
arp
c5ef9c9e69 HDFS-6862. Add missing timeout annotations to tests. (Contributed by Xiaoyu Yao) 2014-09-05 13:50:42 -07:00
Jing Zhao
54767d3ff4 Fix TestOfflineEditsViewer after merging. 2014-09-05 12:05:22 -07:00
Jing Zhao
300cb12bef Merge trunk into HDFS-6584 2014-09-05 11:37:22 -07:00
arp
9609b7303a HDFS-6862. Add missing timeout annotations to tests. (Contributed by Xiaoyu Yao) 2014-09-05 11:10:58 -07:00
arp
9e941d9f99 HDFS-6831. Inconsistency between 'hdfs dfsadmin' and 'hdfs dfsadmin -help'. (Contributed by Xiaoyu Yao) 2014-09-05 10:45:54 -07:00
Jing Zhao
c6107f566f HDFS-6376. Distcp data between two HA clusters requires another configuration. Contributed by Dave Marion and Haohui Mai. 2014-09-05 10:40:02 -07:00
Vinayakumar B
772d1fb01e HDFS-6714. TestBlocksScheduledCounter#testBlocksScheduledCounter should shutdown cluster (vinayakumarb) 2014-09-05 10:25:09 +05:30
Jing Zhao
185200e709 HDFS-6876. Archival Storage: support set/get storage policy in DFSAdmin. Contributed by Jing Zhao. 2014-09-04 20:14:46 -07:00
Jing Zhao
6104520369 HDFS-6886. Use single editlog record for creating file + overwrite. Contributed by Yi Liu. 2014-09-04 18:54:38 -07:00
Jing Zhao
f7df24bb1b HDFS-6996. SnapshotDiff report can hit IndexOutOfBoundsException when there are nested renamed directory/file. Contributed by Jing Zhao. 2014-09-04 16:12:44 -07:00
Jing Zhao
e08701ec71 HDFS-6961. Archival Storage: BlockPlacementPolicy#chooseTarget should check each valid storage type in each choosing round. 2014-09-04 14:19:32 -07:00
Colin Patrick Mccabe
f4caedfcbf HDFS-6959 Make the HDFS home directory location customizable. Contributed by Yongjun Zhang 2014-09-03 19:30:30 -07:00
Jing Zhao
45d5b13256 Merge changes from trunk 2014-09-03 15:36:47 -07:00
arp
08a8f2be81 Merge trunk into HDFS-6581 2014-09-03 10:53:37 -07:00
arp
762b04e994 HDFS-6950. Add Additional unit tests for HDFS-6581. (Contributed by Xiaoyu Yao) 2014-09-03 10:51:26 -07:00
Uma Maheswara Rao G
3425ae5d7e HDFS-2975. Rename with overwrite flag true can make NameNode to stuck in safemode on NN (crash + restart). (Yi Liu via umamahesh) 2014-09-03 18:53:51 +05:30
arp
a6b32a3e78 Merge trunk into HDFS-6581 2014-09-02 16:25:32 -07:00
Haohui Mai
08a9ac7098 HDFS-6942. Fix typos in log messages. Contributed by Ray Chiang. 2014-09-02 16:22:18 -07:00
Colin Patrick Mccabe
727331becc HDFS-4257. The ReplaceDatanodeOnFailure policies could have a forgiving option. Contributed by szetszwo. 2014-09-02 15:14:33 -07:00
Andrew Wang
faa4455be5 HDFS-6634. inotify in HDFS. Contributed by James Thomas. 2014-09-02 14:02:29 -07:00
Jing Zhao
3e2a0b5446 HDFS-6969. Archival Storage: INode#getStoragePolicyID should always return the latest storage policy. Contributed by Jing Zhao. 2014-09-01 17:56:04 -07:00
arp
217dea7794 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 2014-09-01 11:52:59 -07:00