Commit Graph

2445 Commits

Author SHA1 Message Date
arp 05cfd68863 HDFS-7143. Fix findbugs warnings in HDFS-6581 branch. (Contributed by Tsz Wo Nicholas Sze)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:52 -07:00
arp 9de4d1897a HDFS-6932. Balancer and Mover tools should ignore replicas on RAM_DISK. (Contributed by Xiaoyu Yao)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/StorageType.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/mover/TestStorageMover.java
2014-10-17 16:00:52 -07:00
arp a59ce50627 HDFS-6990. Add unit test for evict/delete RAM_DISK block with open handle. (Contributed by Xiaoyu Yao)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:52 -07:00
arp e9eebaa012 HDFS-7100. Make eviction scheme pluggable. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
2014-10-17 16:00:52 -07:00
arp 144198892f HDFS-7108. Fix unit test failures in SimulatedFsDataset. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:51 -07:00
arp ebdbb5ec24 HDFS-7091. Add forwarding constructor for INodeFile for existing callers. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	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/FSImageSerialization.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSPermissionChecker.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestINodeFile.java
2014-10-17 16:00:51 -07:00
arp d32ce5794a HDFS-7084. FsDatasetImpl#copyBlockFiles debug log can be improved. (Contributed by Xiaoyu Yao)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:51 -07:00
arp b7062e8d3e HDFS-7080. Fix finalize and upgrade unit test failures. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:51 -07:00
arp d3ccbd8e65 HDFS-7064. Fix unit test failures in HDFS-6581 branch. (Contributed by Xiaoyu Yao)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:51 -07:00
arp 6cc206b8ad HDFS-6978. Directory scanner should correctly reconcile blocks on RAM disk. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:51 -07:00
arp 2fdd9f51ce HDFS-7066. LazyWriter#evictBlocks misses a null check for replicaState. (Contributed by Xiaoyu Yao)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:50 -07:00
arp bcec6582cf HDFS-6991. Notify NN of evicted block before deleting it from RAM disk. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
2014-10-17 16:00:50 -07:00
arp 186d195033 HDFS-6977. Delete all copies when a block is deleted from the block space. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:50 -07:00
arp 34f28eaff9 HDFS-6930. Improve replica eviction from RAM disk. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:50 -07:00
arp 4609ba0dc8 HDFS-6950. Add Additional unit tests for HDFS-6581. (Contributed by Xiaoyu Yao)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
2014-10-17 16:00:50 -07:00
arp 754ba3a42d HDFS-6931. Move lazily persisted replicas to finalized directory on DN startup. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
2014-10-17 16:00:50 -07:00
arp d973656e5d HDFS-6960. Bugfix in LazyWriter, fix test case and some refactoring. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:50 -07:00
arp 2079d4b72e HDFS-6928. 'hdfs put' command should accept lazyPersist flag for testing. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:49 -07:00
arp 15372df48d HDFS-6929. NN periodically unlinks lazy persist files with missing replicas from namespace. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:49 -07:00
arp c2721edc50 HDFS-6927. Initial unit tests for Lazy Persist files. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
2014-10-17 16:00:49 -07:00
arp 8e01a89b61 HDFS-6926. DN support for saving replicas to persistent storage and evicting in-memory replicas. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
2014-10-17 16:00:49 -07:00
arp 34d0088bf9 HDFS-6925. DataNode should attempt to place replicas on transient storage first if lazyPersist flag is received. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/FsVolumeSpi.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/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java
2014-10-17 16:00:49 -07:00
arp 8c3c0ec977 HDFS-6923. Propagate LazyPersist flag to DNs via DataTransferProtocol. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	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-10-17 16:00:49 -07:00
arp 1d9d29ad40 HDFS-6922. Add LazyPersist flag to INodeFile, save it in FsImage and edit logs. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	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/FSEditLogLoader.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/FSImageSerialization.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/proto/fsimage.proto
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/CreateEditsLog.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFSPermissionChecker.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestINodeFile.java
2014-10-17 16:00:48 -07:00
arp d09f316520 HDFS-6924. Add new RAM_DISK storage type. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-6581.txt
	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/protocolPB/PBHelper.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/hdfs.proto
2014-10-17 16:00:34 -07:00
Tsz-Wo Nicholas Sze fd036896a8 HDFS-5089. When a LayoutVersion support SNAPSHOT, it must support FSIMAGE_NAME_OPTIMIZATION. 2014-10-15 20:59:38 -07:00
Tsz-Wo Nicholas Sze 253e3eb31c HDFS-7208. NN doesn't schedule replication when a DN storage fails. Contributed by Ming Ma
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeDescriptor.java
2014-10-15 20:49:18 -07:00
Jing Zhao 439560dcf2 HDFS-7185. The active NameNode will not accept an fsimage sent from the standby during rolling upgrade. Contributed by Jing Zhao. 2014-10-15 10:28:40 -07:00
Jing Zhao 3d2d501abb HDFS-7228. Add an SSD policy into the default BlockStoragePolicySuite. Contributed by Jing Zhao.
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/server/blockmanagement/BlockStoragePolicySuite.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/mover/TestStorageMover.java
2014-10-14 10:43:12 -07:00
Tsz-Wo Nicholas Sze 20fc34edac HDFS-7237. The command "hdfs namenode -rollingUpgrade" throws ArrayIndexOutOfBoundsException. 2014-10-13 18:37:34 -07:00
Haohui Mai 4fb157655a HDFS-6544. Broken Link for GFS in package.html. Contributed by Suraj Nayak M. 2014-10-13 10:35:48 -07:00
Jing Zhao 369ef7c4b7 HDFS-7236. Fix TestOpenFilesWithSnapshot#testOpenFilesWithMultipleSnapshots. Contributed by Yongjun Zhang. 2014-10-13 10:30:44 -07:00
Andrew Wang 2ff182c890 HADOOP-11174. Delegation token for KMS should only be got once if it already exists. (Yi Liu via wang)
(cherry picked from commit 8d94114495)
2014-10-09 13:21:34 -07:00
cnauroth 754718aed5 HDFS-7195. Update user doc of secure mode about Datanodes don't require root or jsvc. Contributed by Chris Nauroth.
(cherry picked from commit 4e544c84e9)
2014-10-09 11:57:00 -07:00
Kihwal Lee 0280e9aee0 HDFS-7217. Better batching of IBRs. Contributed by Kihwal Lee.
(cherry picked from commit db71bb54bc)
2014-10-09 12:11:42 -05:00
Aaron T. Myers f86c9c6c71 HADOOP-11161. Expose close method in KeyProvider to give clients of Provider implementations a hook to release resources. Contribued by Arun Suresh.
(cherry picked from commit d9556e873ef4d3e68c4f0c991f856d1faa747f07)
(cherry picked from commit 3a2565c7be80cf6e9cdfec0f5460ed8ed2252768)
2014-10-08 18:00:37 -07:00
Kihwal Lee 522b6505f4 HDFS-7203. Concurrent appending to the same file can cause data
corruption. Contributed by Kihwal Lee.
(cherry picked from commit 853cb704ed)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-10-08 15:10:03 -05:00
Kihwal Lee 3f200fddfd HADOOP-11007. Reinstate building of ant tasks support. Contributed by
Jason Lowe.
(cherry picked from commit 99d7a452be)
2014-10-07 16:24:23 -05:00
Haohui Mai f567f3c833 HDFS-7172. Test data files may be checked out of git with incorrect line endings, causing test failures in TestHDFSCLI. Contributed by Chris Nauroth.
(cherry picked from commit 5db04a5a1a)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-10-06 09:15:41 -07:00
Colin Patrick Mccabe cf025cc39b HDFS-7176. The namenode usage message doesn't include "-rollingupgrade started" (cmccabe)
(cherry picked from commit dd1b8f2ed8)
(cherry picked from commit 1725d56132)
2014-10-02 14:08:15 -07:00
Colin Patrick Mccabe 94277a7d21 HDFS-7162. Wrong path when deleting through fuse-dfs a file which already exists in trash (cmccabe)
(cherry picked from commit 03db9cc839)
(cherry picked from commit ab1afc4e1c)
2014-10-02 14:07:44 -07:00
Andrew Wang dea3f133ff HDFS-7181. Remove incorrect precondition check on key length in FileEncryptionInfo. (wang)
(cherry picked from commit 6ac10516e7)
(cherry picked from commit 6dbba19469)
2014-10-02 14:01:30 -07:00
Andrew Wang 59e9858181 HDFS-7179. DFSClient should instantiate a KeyProvider, not a KeyProviderCryptoExtension. (wang)
(cherry picked from commit d2d5a0ea03)
(cherry picked from commit 6ddd9eff78)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-10-02 14:01:20 -07:00
arp 39bad4a4c8 HDFS-7178. Additional unit test for replica write with full disk. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-10-02 09:29:44 -07:00
Haohui Mai 364c110c2b Addendum patch for HDFS-7172. Contributed by Chris Nauroth. 2014-10-01 16:11:02 -07:00
Haohui Mai 5d2f325483 HDFS-6894. Add XDR parser method for each NFS response. Contributed by Brandon Li. 2014-10-01 13:22:12 -07:00
Haohui Mai 0eec4c187c HDFS-7158. Reduce the memory usage of WebImageViewer. Contributed by Haohui Mai. 2014-10-01 13:22:07 -07:00
Kihwal Lee bd69f86668 HDFS-6754. TestNamenodeCapacityReport.testXceiverCount may sometimes fail due to lack of retry. Contributed by Mit Desai.
(cherry picked from commit 3f25d916d5)
2014-10-01 14:44:30 -05:00
arp 0abbfcf2d0 HDFS-7153. Add storagePolicy to NN edit log during file creation. (Arpit Agarwal) 2014-09-30 23:34:11 -07:00
Jing Zhao 62d47e3965 HDFS-7167. NPE while running Mover if the given path is for a file. Contributed by Jing Zhao.
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-09-30 11:23:45 -07:00
Arun C. Murthy d3e61c96b5 Branching for hadoop-2.6 2014-09-30 10:38:47 -07:00
Arun C. Murthy 6a60fa279a Preparing to branch hadoop-2.6 2014-09-30 10:37:03 -07:00
Haohui Mai eea383ff2e HDFS-6779. Add missing version subcommand for hdfs. Contributed by Sasaki Toru. 2014-09-29 18:20:44 -07:00
Andrew Wang 47ddaee1db HDFS-7122. Use of ThreadLocal<Random> results in poor block placement. (wang)
(cherry picked from commit d7086c563ff2847c415913ac625b2a557eeccbdd)
2014-09-29 15:00:28 -07:00
Andrew Wang 38f3b11c29 HDFS-7124. Remove EncryptionZoneManager.NULL_EZ. (clamb via wang)
(cherry picked from commit 7f0efe96f8)
2014-09-29 14:14:49 -07:00
Andrew Wang d551a95fc4 Move HDFS-7157 to HDFS CHANGES.txt
(cherry picked from commit a45b331cc9)
2014-09-29 13:17:28 -07:00
Andrew Wang 58bdba9dc0 HDFS-7104. Fix and clarify INodeInPath getter functions. Contributed by Zhe Zhang.
(cherry picked from commit f0293f11a8)
2014-09-29 12:58:45 -07:00
Suresh Srinivas c7cf212b2a HDFS-4165. Faulty sanity check in FsDirectory.unprotectedSetQuota. Contributed by Binglin Chang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1407245 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 0f7a4337ac)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-09-29 11:06:17 -07:00
Allen Wittenauer dacf2b5515 HDFS-4227. Document dfs.namenode.resource.* (Daisuke Kobayashi via aw) 2014-09-29 09:01:59 -07:00
Allen Wittenauer 96fc90a9c4 HDFS-6519. Document oiv_legacy command (Akira AJISAKA via aw) 2014-09-29 08:51:55 -07:00
arp 8ebea28b40 HDFS-7093. Add config key to restrict setStoragePolicy. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
2014-09-28 19:34:25 -07:00
Konstantin V Shvachko 3472221989 HDFS-7156. Update fsck documentation. Contributed by Masahiro Yamaguch. 2014-09-27 21:26:38 -07:00
Allen Wittenauer 3c86c68078 HDFS-6664. HDFS permissions guide documentation states incorrect default group mapping class. (Ray Chiang via aw) 2014-09-26 12:21:37 -07:00
Colin Patrick Mccabe b5b4cb4d64 HDFS-6956. Allow dynamically changing the tracing level in Hadoop servers (cmccabe)
(cherry picked from commit 55302ccfba)
2014-09-26 10:34:42 -07:00
Andrew Wang 09c324a4a8 HDFS-7148. TestEncryptionZones#testIsEncryptedMethod fails on branch-2 after archival storage merge. (wang) 2014-09-25 21:50:12 -07:00
Andrew Wang 3f71a15813 HDFS-7077. Separate CipherSuite from crypto protocol version. (wang)
(cherry picked from commit e96ce6f3e3)

Conflicts:
	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/namenode/FSNamesystem.java
2014-09-25 18:42:17 -07:00
Jing Zhao 9ad9e51cd9 HDFS-7131. During HA upgrade, JournalNode should create a new committedTxnId file in the current directory. Contributed by Jing Zhao.
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-09-25 17:18:02 -07:00
Jing Zhao 87f07e67b1 HDFS-7140. Add a tool to list all the existing block storage policies. Contributed by Jing Zhao.
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
2014-09-26 05:16:44 +08:00
Jing Zhao f83096d49c HDFS-7081. Add new DistributedFileSystem API for getting all the existing storage policies. Contributed by Jing Zhao.
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-09-26 05:08:32 +08:00
Jing Zhao ba3182c60c HDFS-7095. Archival Storage: TestStorageMover often fails in Jenkins. Contributed by Jing Zhao.
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-09-26 05:02:21 +08:00
Tsz-Wo Nicholas Sze 788ba5e4c4 Revise the HDFS-6584 entry CHANGES.txt.
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-09-26 04:59:00 +08:00
Tsz-Wo Nicholas Sze 80bd4d88eb Fix hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt for HDFS-6584 after
merge.

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-09-26 04:57:45 +08:00
Tsz-Wo Nicholas Sze 022474c807 Merge branch 'HDFS-6584' into trunk
Conflicts:
	hadoop-common-project/hadoop-common/src/main/conf/hadoop-env.sh
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
	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/balancer/Dispatcher.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.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/FSEditLogLoader.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicy.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestReplicationPolicyConsiderLoad.java
2014-09-26 04:47:25 +08:00
cnauroth fd3aa38231 HDFS-7119. Split error checks in AtomicFileOutputStream#close into separate conditions to improve diagnostics. Contributed by Chris Nauroth.
(cherry picked from commit 9f9a2222a2)
2014-09-25 13:35:40 -07:00
Colin Patrick Mccabe cb9283549f HDFS-6808. Add command line option to ask DataNode reload configuration. (Lei Xu via Colin McCabe)
(cherry picked from commit 1861b32eb5)
2014-09-25 13:22:35 -07:00
cnauroth 6bace90b29 HDFS-7127. TestLeaseRecovery leaks MiniDFSCluster instances. Contributed by Chris Nauroth.
(cherry picked from commit b607c3c363)
2014-09-25 11:29:15 -07:00
cnauroth 94517982a9 HDFS-7111. TestSafeMode assumes Unix line endings in safe mode tip. Contributed by Chris Nauroth.
(cherry picked from commit dc2ebf88a8)
2014-09-25 11:21:07 -07:00
cnauroth 707a7dbd24 HDFS-7118. Improve diagnostics on storage directory rename operations by using NativeIO#renameTo in Storage#rename. Contributed by Chris Nauroth.
(cherry picked from commit e0b1dc514f)
2014-09-25 10:06:09 -07:00
Andrew Wang 835ade7064 HDFS-7138. Fix hftp to work with encryption. (clamb via wang) 2014-09-24 16:45:29 -07:00
Andrew Wang a17544e5e3 HDFS-7139. Unit test for creating encryption zone on root path. (Zhe Zhang via wang)
(cherry picked from commit 63198bfba7)
2014-09-24 16:40:40 -07:00
Andrew Wang 3cf28210ec HDFS-6987. Move CipherSuite xattr information up to the encryption zone root. (Zhe Zhang via wang) 2014-09-24 12:11:45 -07:00
Haohui Mai 53c2288dc6 HDFS-7049. TestByteRangeInputStream.testPropagatedClose fails and throw NPE on branch-2. Contributed by Juan Yu. 2014-09-24 12:07:26 -07:00
Allen Wittenauer 151281bfca HDFS-6534. Fix build on macosx: HDFS parts (Binglin Chang via aw) 2014-09-24 08:35:31 -07:00
cnauroth fd3003d63b HDFS-7130. TestDataTransferKeepalive fails intermittently on Windows. Contributed by Chris Nauroth.
(cherry picked from commit b93d9603a2)
2014-09-23 14:44:26 -07:00
Andrew Wang 0d116b18de HDFS-7132. hdfs namenode -metadataVersion command does not honor configured name dirs. Contributed by Charles Lamb.
(cherry picked from commit f48686a1ad)
2014-09-23 14:10:40 -07:00
cnauroth ac3b62dae7 HDFS-7126. TestEncryptionZonesWithHA assumes Unix path separator for KMS key store path. Contributed by Xiaoyu Yao.
(cherry picked from commit a1fd804a31)
2014-09-23 08:22:04 -07:00
Colin Patrick Mccabe cac7063b31 HDFS-7001. Tests in TestTracing should not depend on the order of execution. (iwasakims via cmccabe)
(cherry picked from commit 7b8df93ce1)
2014-09-22 17:22:42 -07:00
Colin Patrick Mccabe d7b0e9382d HDFS-7106. Reconfiguring DataNode volumes does not release the lock files in removed volumes. (cnauroth via cmccabe)
(cherry picked from commit 912ad32b03)
2014-09-22 11:52:01 -07:00
cnauroth 39bcc57c3e HDFS-7115. TestEncryptionZones assumes Unix path separator for KMS key store path. Contributed by Xiaoyu Yao.
(cherry picked from commit 26cba7f35f)
2014-09-22 09:07:41 -07:00
cnauroth 4a77729a1c HDFS-7110. Skip tests related to short-circuit read on platforms that do not currently implement short-circuit read. Contributed by Chris Nauroth.
(cherry picked from commit b6fd5ccbce)
2014-09-21 12:37:37 -07:00
cnauroth 465ba7fe31 HDFS-7109. TestDataStorage does not release file locks between tests. Contributed by Chris Nauroth.
(cherry picked from commit 0795fe3721)
2014-09-20 21:01:52 -07:00
cnauroth 3ad3f034bb HDFS-7107. Avoid Findbugs warning for synchronization on AbstractNNFailoverProxyProvider#fallbackToSimpleAuth. Contributed by Chris Nauroth.
(cherry picked from commit 47491f9a11)
2014-09-20 20:53:38 -07:00
cnauroth cadba3067f HDFS-7073. Allow falling back to a non-SASL connection on DataTransferProtocol in several edge cases. Contributed by Chris Nauroth.
(cherry picked from commit f85cc14eb4)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/Dispatcher.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/balancer/NameNodeConnector.java
2014-09-19 22:04:13 -07:00
cnauroth 9ee5e26cbb HDFS-7105. Fix TestJournalNode#testFailToStartWithBadConfig to match log output change. Contributed by Ray Chiang.
(cherry picked from commit 332e2e23ba)
2014-09-19 21:06:04 -07:00
Kihwal Lee b55aa50ec6 HDFS-7046. HA NN can NPE upon transition to active. Contributed by
Kihwal Lee.
(cherry picked from commit 9e35571965)
2014-09-19 17:08:30 -05:00
Colin Patrick Mccabe 5520ca6ec3 HDFS-7096. Fix TestRpcProgramNfs3 to use DFS_ENCRYPTION_KEY_PROVIDER_URI (clamb via cmccabe)
(cherry picked from commit 25fd69a8f9)
2014-09-19 09:20:55 -07:00
Kihwal Lee 35fccfda3e HDFS-7065. Pipeline close recovery race can cause block corruption.
Contributed by Kihwal Lee.
(cherry picked from commit bf27b9ca57)
2014-09-19 09:01:27 -05:00
Kihwal Lee 2a6c9f0725 HDFS-6948. DN rejects blocks if it has older UC block. Contributed by
Eric Payne.
(cherry picked from commit f02d934fed)
2014-09-19 08:52:16 -05:00
Andrew Wang 58d9cc0914 HDFS-6840. Clients are always sent to the same datanode when read is off rack. (wang)
(cherry picked from commit 8e73084491)
2014-09-18 18:14:10 -07:00
Andrew Wang ef693b541c HDFS-6970. Move startFile EDEK retries to the DFSClient. (wang)
(cherry picked from commit 20a076bafc)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
2014-09-18 17:41:22 -07:00