big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,946 Commits 2 Branches 2 Tags 264 MiB
a9dc5cd706
Commit Graph

3918 Commits

Author SHA1 Message Date
Jing Zhao
1c8d191117 HDFS-7228. Fix TestDNFencing.testQueueingWithAppend. Contributed by Yongjun Zhang. 2014-10-22 10:48:15 -07:00
Allen Wittenauer
4baca311ff HDFS-7204. balancer doesn't run as a daemon (aw) 2014-10-21 14:26:08 -07:00
Jitendra Pandey
b85919feef Updated CHANGES.txt for HDFS-6581 merge into branch-2.6. 2014-10-21 13:24:03 -07:00
Andrew Wang
ac56b0637e HDFS-7221. TestDNFencingWithReplication fails consistently. Contributed by Charles Lamb. 2014-10-21 12:55:18 -07:00
Brandon Li
4e134a02a4 HDFS-7215.Add JvmPauseMonitor to NFS gateway. Contributed by Brandon Li 2014-10-21 11:49:10 -07:00
Brandon Li
b6f9d5538c HDFS-7259. Unresponseive NFS mount point due to deferred COMMIT response. Contributed by Brandon Li 2014-10-21 10:20:29 -07:00
Colin Patrick Mccabe
7aab5fa1bd HDFS-7154. Fix returning value of starting reconfiguration task (Lei Xu via Colin P. McCabe) 2014-10-20 18:33:11 -07:00
Colin Patrick Mccabe
4799570dfd HDFS-7266. HDFS Peercache enabled check should not lock on object (awang via cmccabe) 2014-10-20 18:24:53 -07:00
Benoy Antony
e4d6a87854 HDFS-7184. Allow data migration tool to run as a daemon. (Benoy Antony) 2014-10-20 12:15:58 -07:00
Tsz-Wo Nicholas Sze
2e140523d3 HDFS-7260. Change DFSOutputStream.MAX_PACKETS to be configurable. 2014-10-17 18:30:09 -07:00
Vinayakumar B
368743140d HDFS-7252. small refinement to the use of isInAnEZ in FSNamesystem. (Yi Liu via vinayakumarb) 2014-10-17 18:03:44 +05:30
Vinayakumar B
1c3ff0b7c8 HDFS-7242. Code improvement for FSN#checkUnreadableBySuperuser. (Contributed by Yi Liu) 2014-10-17 17:48:20 +05:30
Vinayakumar B
cba1f9e389 HDFS-6995. Block should be placed in the client's 'rack-local' node if 'client-local' node is not available (vinayakumarb) 
Adding missed test file
 2014-10-17 17:31:01 +05:30
Tsz-Wo Nicholas Sze
2894433332 HDFS-5089. When a LayoutVersion support SNAPSHOT, it must support FSIMAGE_NAME_OPTIMIZATION. 2014-10-15 20:56:59 -07:00
Tsz-Wo Nicholas Sze
41980c56d3 HDFS-7208. NN doesn't schedule replication when a DN storage fails. Contributed by Ming Ma 2014-10-15 20:44:24 -07:00
Jing Zhao
18620649f9 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:27:30 -07:00
Haohui Mai
128ace10cd HDFS-7190. Bad use of Preconditions in startFileInternal(). Contributed by Dawson Choong. 2014-10-14 23:42:19 -07:00
Haohui Mai
0260231667 HDFS-7201. Fix typos in hdfs-default.xml. Contributed by Dawson Choong. 2014-10-14 17:36:07 -07:00
Jing Zhao
7dcad84143 HDFS-7228. Add an SSD policy into the default BlockStoragePolicySuite. Contributed by Jing Zhao. 2014-10-14 10:22:34 -07:00
Tsz-Wo Nicholas Sze
f6d0b8892a HDFS-7237. The command "hdfs namenode -rollingUpgrade" throws ArrayIndexOutOfBoundsException. 2014-10-13 18:28:34 -07:00
cnauroth
1770bb942f HDFS-7090. Use unbuffered writes when persisting in-memory replicas. Contributed by Xiaoyu Yao. 2014-10-13 10:56:32 -07:00
Haohui Mai
53100318ea HDFS-6544. Broken Link for GFS in package.html. Contributed by Suraj Nayak M. 2014-10-13 10:33:19 -07:00
Jing Zhao
98ac9f26c5 HDFS-7236. Fix TestOpenFilesWithSnapshot#testOpenFilesWithMultipleSnapshots. Contributed by Yongjun Zhang. 2014-10-13 10:27:36 -07:00
Haohui Mai
428dfaad60 Update CHANGES.txt after merging HDFS-6252 and HDFS-6657 to branch-2. 2014-10-10 17:32:14 -07:00
Andrew Wang
d3d3d47202 HDFS-7209. Populate EDEK cache when creating encryption zone. (Yi Liu via wang) 2014-10-10 13:40:37 -07:00
Colin Patrick Mccabe
1ceb326933 HDFS-7198. Fix "unchecked conversion" warning in DFSClient#getPathTraceScope (cmccabe) 2014-10-10 13:03:29 -07:00
Aaron T. Myers
cbd21fd13b HDFS-7026. Introduce a string constant for "Failed to obtain user group info...". Contributed by Yongjun Zhang. 2014-10-09 18:52:48 -07:00
Andrew Wang
8d94114495 HADOOP-11174. Delegation token for KMS should only be got once if it already exists. (Yi Liu via wang) 2014-10-09 13:21:19 -07:00
cnauroth
9097183983 HDFS-7195. Update user doc of secure mode about Datanodes don't require root or jsvc. Contributed by Chris Nauroth. 2014-10-09 11:51:12 -07:00
Kihwal Lee
db71bb54bc HDFS-7217. Better batching of IBRs. Contributed by Kihwal Lee. 2014-10-09 12:07:51 -05:00
Aaron T. Myers
2a51494ce1 HADOOP-11161. Expose close method in KeyProvider to give clients of Provider implementations a hook to release resources. Contribued by Arun Suresh. 2014-10-08 18:01:51 -07:00
Colin Patrick Mccabe
d996235285 HDFS-7202. Should be able to omit package name of SpanReceiver on "hadoop trace -add" (iwasakims via cmccabe) 2014-10-08 17:55:46 -07:00
Kihwal Lee
853cb704ed HDFS-7203. Concurrent appending to the same file can cause data 
corruption. Contributed by Kihwal Lee.
 2014-10-08 15:05:34 -05:00
cnauroth
1efd9c9825 HDFS-7112. LazyWriter should use either async IO or one thread per physical disk. Contributed by Xiaoyu Yao. 2014-10-07 20:25:19 -07:00
cnauroth
9b8a35aff6 HDFS-7128. Decommission slows way down when it gets towards the end. Contributed by Ming Ma. 2014-10-07 15:01:09 -07:00
Andrew Wang
0263656247 Fixup for CHANGES.txt 2014-10-07 14:58:57 -07:00
Kihwal Lee
99d7a452be HADOOP-11007. Reinstate building of ant tasks support. Contributed by 
Jason Lowe.
 2014-10-07 16:20:16 -05:00
Colin Patrick Mccabe
8dc6abf2f4 HDFS-7194 Fix findbugs "inefficient new String constructor" warning in DFSClient#PATH (yzhang via cmccabe) 2014-10-06 15:29:09 -07:00
Tsz-Wo Nicholas Sze
3affad9ebd HDFS-7169. Add SE_BAD_FIELD to findbugsExcludeFile.xml. 2014-10-06 13:29:56 -07:00
Vinayakumar B
ed841dd9a9 HDFS-6995. Block should be placed in the client's 'rack-local' node if 'client-local' node is not available (vinayakumarb) 2014-10-06 14:31:15 +05:30
Colin Patrick Mccabe
7f6ed7fe36 HDFS-7055. Add tracing to DFSInputStream (cmccabe) 2014-10-03 13:35:43 -07:00
Andrew Wang
6ac10516e7 HDFS-7181. Remove incorrect precondition check on key length in FileEncryptionInfo. (wang) 2014-10-02 13:51:08 -07:00
Andrew Wang
d2d5a0ea03 HDFS-7179. DFSClient should instantiate a KeyProvider, not a KeyProviderCryptoExtension. (wang) 2014-10-02 13:50:05 -07:00
Colin Patrick Mccabe
a56f3ecf86 HDFS-7162. Fix CHANGES.txt (should have Chenging Liu's name) 2014-10-02 12:45:54 -07:00
Colin Patrick Mccabe
03db9cc839 HDFS-7162. Wrong path when deleting through fuse-dfs a file which already exists in trash (cmccabe) 2014-10-02 12:42:19 -07:00
arp
c2fa5d1c42 HDFS-7178. Additional unit test for replica write with full disk. (Arpit Agarwal) 2014-10-02 09:28:26 -07:00
Haohui Mai
8dfe54f6d3 Addendum patch for HDFS-7172. Contributed by Chris Nauroth. 2014-10-01 16:09:30 -07:00
Colin Patrick Mccabe
dd1b8f2ed8 HDFS-7176. The namenode usage message doesn't include "-rollingupgrade started" (cmccabe) 2014-10-01 14:53:44 -07:00
Haohui Mai
875aa797ca HDFS-6894. Add XDR parser method for each NFS response. Contributed by Brandon Li. 2014-10-01 13:18:56 -07:00
Haohui Mai
1f5b42ac48 HDFS-7158. Reduce the memory usage of WebImageViewer. Contributed by Haohui Mai. 2014-10-01 10:53:38 -07:00
Haohui Mai
737f280dde HDFS-7172. Test data files may be checked out of git with incorrect line endings, causing test failures in TestHDFSCLI. Contributed by Chris Nauroth. 2014-10-01 10:46:33 -07:00
arp
04b08431a3 HDFS-6581. Update CHANGES.txt in preparation for trunk merge 2014-10-01 09:01:08 -07:00
arp
e431d054cb Merge branch 'trunk' into HDFS-6581 2014-10-01 08:52:21 -07:00
Kihwal Lee
3f25d916d5 HDFS-6754. TestNamenodeCapacityReport.testXceiverCount may sometimes fail due to lack of retry. Contributed by Mit Desai. 2014-10-01 09:53:01 -05:00
arp
a45ad330fa HDFS-7171. Fix Jenkins failures in HDFS-6581 branch. (Arpit Agarwal) 2014-09-30 18:25:20 -07:00
arp
65ef35bbab Merge branch 'trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml
 2014-09-30 18:20:13 -07:00
arp
9e9e9cf711 HDFS-7153. Add storagePolicy to NN edit log during file creation. (Arpit Agarwal) 2014-09-30 18:10:13 -07:00
arp
dde2ed13c2 Merge branch 'trunk' into HDFS-6581 2014-09-30 18:05:54 -07:00
Jing Zhao
cdf1af0e5a HDFS-7167. NPE while running Mover if the given path is for a file. Contributed by Jing Zhao. 2014-09-30 11:13:35 -07:00
Arun C. Murthy
ea32a66f7d Preparing to branch hadoop-2.6 2014-09-30 10:26:42 -07:00
arp
5e8b697352 HDFS-7129. Metrics to track usage of memory for writes. (Contributed by Xiaoyu Yao) 2014-09-30 00:53:18 -07:00
arp
bb84f1fccb HDFS-7159. Use block storage policy to set lazy persist preference. (Arpit Agarwal) 2014-09-29 22:27:59 -07:00
arp
368e2423a5 Merge branch 'trunk' into HDFS-6581 2014-09-29 20:09:06 -07:00
Haohui Mai
0577eb32fc HDFS-6779. Add missing version subcommand for hdfs. Contributed by Sasaki Toru. 2014-09-29 18:10:47 -07:00
arp
7f0422be76 Merge branch 'trunk' into HDFS-6581 2014-09-29 16:29:43 -07:00
Andrew Wang
c6c3247dc0 HDFS-7122. Use of ThreadLocal<Random> results in poor block placement. (wang) 2014-09-29 15:00:26 -07:00
Andrew Wang
7f0efe96f8 HDFS-7124. Remove EncryptionZoneManager.NULL_EZ. (clamb via wang) 2014-09-29 14:14:22 -07:00
arp
1e6b4b9b2e Merge branch 'trunk' into HDFS-6581 2014-09-29 14:01:47 -07:00
Andrew Wang
a45b331cc9 Move HDFS-7157 to HDFS CHANGES.txt 2014-09-29 13:17:21 -07:00
Andrew Wang
f0293f11a8 HDFS-7104. Fix and clarify INodeInPath getter functions. Contributed by Zhe Zhang. 2014-09-29 12:58:37 -07:00
arp
d45e7c7e85 HDFS-7153. Add storagePolicy to NN edit log during file creation. (Arpit Agarwal) 2014-09-29 12:36:27 -07:00
Andrew Wang
371ef4cefc Move HDFS-4165 from trunk to 2.6.0 in CHANGES.txt. 2014-09-29 11:06:44 -07:00
Allen Wittenauer
84b9c632bf HDFS-4227. Document dfs.namenode.resource.* (Daisuke Kobayashi via aw) 2014-09-29 09:01:43 -07:00
Allen Wittenauer
9829f9fa58 HDFS-6519. Document oiv_legacy command (Akira AJISAKA via aw) 2014-09-29 08:51:41 -07:00
arp
9a53c3699b Merge branch 'trunk' into HDFS-6581 2014-09-28 20:42:56 -07:00
arp
b38e52b5e8 HDFS-7093. Add config key to restrict setStoragePolicy. (Arpit Agarwal) 2014-09-28 19:28:51 -07:00
Konstantin V Shvachko
400e1bb4ef HDFS-7156. Update fsck documentation. Contributed by Masahiro Yamaguch. 2014-09-27 21:04:23 -07:00
arp
d96396627f Merge branch 'trunk' into HDFS-6581 2014-09-26 16:31:08 -07:00
arp
a2d4edacea HDFS-7155. Bugfix in createLocatedFileStatus caused by bad merge. (Arpit Agarwal) 2014-09-26 16:30:47 -07:00
Allen Wittenauer
3a1f981686 HDFS-6664. HDFS permissions guide documentation states incorrect default group mapping class. (Ray Chiang via aw) 2014-09-26 12:20:40 -07:00
arp
7060502edb Merge branch 'trunk' into HDFS-6581 2014-09-26 11:09:03 -07:00
Colin Patrick Mccabe
55302ccfba HDFS-6956. Allow dynamically changing the tracing level in Hadoop servers (cmccabe) 2014-09-26 10:30:30 -07:00
Tsz-Wo Nicholas Sze
a6049aa994 CHANGES.txt: move HDFS-6584 and its subtasks to Release 2.6.0. 2014-09-26 23:51:00 +08:00
Andrew Wang
840825d819 Add HDFS-7148 to CHANGES.txt, branch-2 only commit. 2014-09-25 21:50:24 -07:00
arp
263977969b Fix test build break after merging from trunk 2014-09-25 20:29:24 -07:00
arp
032e0eba6b Merge branch 'trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 2014-09-25 19:50:28 -07:00
Andrew Wang
e96ce6f3e3 HDFS-7077. Separate CipherSuite from crypto protocol version. (wang) 2014-09-25 18:40:40 -07:00
Jing Zhao
e9c37de485 HDFS-7131. During HA upgrade, JournalNode should create a new committedTxnId file in the current directory. Contributed by Jing Zhao. 2014-09-25 17:15:33 -07:00
cnauroth
9f9a2222a2 HDFS-7119. Split error checks in AtomicFileOutputStream#close into separate conditions to improve diagnostics. Contributed by Chris Nauroth. 2014-09-25 13:33:37 -07:00
Colin Patrick Mccabe
1861b32eb5 HDFS-6808. Add command line option to ask DataNode reload configuration. (Lei Xu via Colin McCabe) 2014-09-25 13:11:59 -07:00
arp
5a5a7da3a3 Merge branch 'trunk' into HDFS-6581 2014-09-25 12:55:59 -07:00
cnauroth
b607c3c363 HDFS-7127. TestLeaseRecovery leaks MiniDFSCluster instances. Contributed by Chris Nauroth. 2014-09-25 11:24:31 -07:00
cnauroth
dc2ebf88a8 HDFS-7111. TestSafeMode assumes Unix line endings in safe mode tip. Contributed by Chris Nauroth. 2014-09-25 11:17:46 -07:00
arp
364e60b169 HDFS-7144. Fix findbugs warnings in RamDiskReplicaTracker. (Contributed by Tsz Wo Nicholas Sze) 2014-09-25 11:14:24 -07:00
arp
e9edafc731 Merge branch 'trunk' into HDFS-6581 2014-09-25 11:06:25 -07:00
cnauroth
e0b1dc514f HDFS-7118. Improve diagnostics on storage directory rename operations by using NativeIO#renameTo in Storage#rename. Contributed by Chris Nauroth. 2014-09-25 10:03:59 -07:00
arp
e8e7fbe81a HDFS-6932. Balancer and Mover tools should ignore replicas on RAM_DISK. (Contributed by Xiaoyu Yao) 2014-09-24 21:08:59 -07:00
arp
feda4733a8 HDFS-7143. Fix findbugs warnings in HDFS-6581 branch. (Contributed by Tsz Wo Nicholas Sze) 2014-09-24 21:06:56 -07:00
arp
b1000fbba4 Merge branch 'trunk' into HDFS-6581 
Conflicts:
	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/INodeFile.java
 2014-09-24 20:08:32 -07:00
Jing Zhao
428a76663a HDFS-7140. Add a tool to list all the existing block storage policies. Contributed by Jing Zhao. 2014-09-24 19:11:16 -07:00
Andrew Wang
116f83157a Add branch-2 only commit HDFS-7138 to CHANGES.txt 2014-09-24 16:47:09 -07:00
Andrew Wang
63198bfba7 HDFS-7139. Unit test for creating encryption zone on root path. (Zhe Zhang via wang) 2014-09-24 16:40:20 -07:00
Andrew Wang
9fa5a89be3 Move HDFS-6987 from trunk to branch-2 in CHANGES.txt 2014-09-24 12:11:58 -07:00
Jing Zhao
073bbd805c HDFS-7081. Add new DistributedFileSystem API for getting all the existing storage policies. Contributed by Jing Zhao. 2014-09-24 10:05:40 -07:00
Allen Wittenauer
cb74f39697 HDFS-6534. Fix build on macosx: HDFS parts (Binglin Chang via aw) 2014-09-24 08:22:02 -07:00
arp
bfc7b7e6a0 Merge branch 'trunk' into HDFS-6581 2014-09-23 16:40:35 -07:00
cnauroth
b93d9603a2 HDFS-7130. TestDataTransferKeepalive fails intermittently on Windows. Contributed by Chris Nauroth. 2014-09-23 14:35:33 -07:00
Andrew Wang
f48686a1ad HDFS-7132. hdfs namenode -metadataVersion command does not honor configured name dirs. Contributed by Charles Lamb. 2014-09-23 14:10:02 -07:00
Allen Wittenauer
3dc28e2052 HADOOP-11092. hadoop shell commands should print usage if not given a class (aw) 2014-09-23 12:24:23 -07:00
cnauroth
a1fd804a31 HDFS-7126. TestEncryptionZonesWithHA assumes Unix path separator for KMS key store path. Contributed by Xiaoyu Yao. 2014-09-23 08:21:46 -07:00
arp
8b139b0800 HDFS-6990. Add unit test for evict/delete RAM_DISK block with open handle. (Contributed by Xiaoyu Yao) 2014-09-22 18:10:28 -07:00
arp
889122bd55 Merge branch 'trunk' into HDFS-6581 2014-09-22 18:00:58 -07:00
Colin Patrick Mccabe
7b8df93ce1 HDFS-7001. Tests in TestTracing should not depend on the order of execution. (iwasakims via cmccabe) 2014-09-22 17:21:58 -07:00
Colin Patrick Mccabe
912ad32b03 HDFS-7106. Reconfiguring DataNode volumes does not release the lock files in removed volumes. (cnauroth via cmccabe) 2014-09-22 11:51:31 -07:00
cnauroth
26cba7f35f HDFS-7115. TestEncryptionZones assumes Unix path separator for KMS key store path. Contributed by Xiaoyu Yao. 2014-09-22 09:07:07 -07:00
Andrew Wang
1737950d0f HDFS-6987. Move CipherSuite xattr information up to the encryption zone root. Contributed by Zhe Zhang. 2014-09-21 21:29:46 -07:00
cnauroth
b6fd5ccbce HDFS-7110. Skip tests related to short-circuit read on platforms that do not currently implement short-circuit read. Contributed by Chris Nauroth. 2014-09-21 12:36:57 -07:00
cnauroth
0795fe3721 HDFS-7109. TestDataStorage does not release file locks between tests. Contributed by Chris Nauroth. 2014-09-20 21:01:13 -07:00
cnauroth
47491f9a11 HDFS-7107. Avoid Findbugs warning for synchronization on AbstractNNFailoverProxyProvider#fallbackToSimpleAuth. Contributed by Chris Nauroth. 2014-09-20 20:53:09 -07:00
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
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
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
arp
a4dcbaa332 HDFS-7066. LazyWriter#evictBlocks misses a null check for replicaState. (Contributed by Xiaoyu Yao) 2014-09-15 15:28:17 -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
Karthik Kambatla
17ffbe0864 Update CHANGES.txt to set the release date for 2.5.1 2014-09-11 17:35:35 -07:00
Jing Zhao
dc27ee9ae9 HDFS-7039. Archival Storage: fix Balancer tests. Contributed by Tsz Wo Nicholas Sze. 2014-09-11 14:19:18 -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
cnauroth
80ac6aabce HDFS-7042. Upgrade fails for Windows HA cluster due to file locks held during rename in JournalNode. Contributed by Chris Nauroth. 2014-09-11 12:16:19 -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
d1dab6cc63 HDFS-6621. Hadoop Balancer prematurely exits iterations. Contributed by Rafal Wodjdyla and Benjamin Bowman. 2014-09-11 10:32:20 -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
Tsz-Wo Nicholas Sze
4124905aa5 HDFS-7028: FSDirectory should not get storage policy id from symlinks 2014-09-10 12:34:15 +08:00
arp
0de563a18e HDFS-6482. Fix CHANGES.txt in trunk. 2014-09-09 18:09:10 -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
arp
be30c86cc9 HDFS-6482. Fix CHANGES.txt in trunk 2014-09-09 13:32:08 -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
90c8ece188 HDFS-6981. Fix CHANGES.txt 2014-09-08 21:41:56 -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
7498dd790e Update CHANGES.txt for HDFS-6951 2014-09-08 17:01:25 -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
Allen Wittenauer
d989ac0444 MAPREDUCE-5972. Fix typo 'programatically' in job.xml (and a few other places) (Akira AJISAKA via aw) 2014-09-08 13:15:46 -07:00
Allen Wittenauer
6c790a7ab0 HDFS-6893. crypto subcommand is not sorted properly in hdfs\'s hadoop_usage (David Luo via aw) 2014-09-08 13:10:53 -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
Haohui Mai
c1f8323234 HDFS-6943. Improve NN allocateBlock log to include replicas' datanode IPs. Contributed by Ming Ma. 2014-09-08 11:07:23 -07: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
21c0cdeec1 HADOOP-11067 [HDFS-6998]. Fix CHANGES.txt 2014-09-05 14:29:57 -07:00
Allen Wittenauer
a149afd9e6 HADOOP-11052. hadoop_verify_secure_prereq's results aren't checked in bin/hdfs (aw) 2014-09-05 13:50:42 -07:00
arp
fc68337049 HDFS-6998. warning message 'ssl.client.truststore.location has not been set' gets printed for hftp command. (Contributed by Xiaoyu Yao) 2014-09-05 13:50:42 -07:00
arp
c5ef9c9e69 HDFS-6862. Add missing timeout annotations to tests. (Contributed by Xiaoyu Yao) 2014-09-05 13:50:42 -07:00
cnauroth
c828b8aa91 HDFS-6979. Fix minor error in CHANGES.txt. Contributed by Chris Nauroth. 2014-09-05 13:50:42 -07:00
cnauroth
2cd5b4f20d HDFS-6979. hdfs.dll not produce .pdb files. Contributed by Chris Nauroth. 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
Allen Wittenauer
7a62515c86 HADOOP-11052. hadoop_verify_secure_prereq's results aren't checked in bin/hdfs (aw) 2014-09-05 11:31:49 -07:00
arp
71269f7097 HDFS-6998. warning message 'ssl.client.truststore.location has not been set' gets printed for hftp command. (Contributed by Xiaoyu Yao) 2014-09-05 11:14:10 -07:00
arp
9609b7303a HDFS-6862. Add missing timeout annotations to tests. (Contributed by Xiaoyu Yao) 2014-09-05 11:10:58 -07:00
cnauroth
b051327ab6 HDFS-6979. Fix minor error in CHANGES.txt. Contributed by Chris Nauroth. 2014-09-05 11:07:41 -07:00
cnauroth
fab9bc58ec HDFS-6979. hdfs.dll not produce .pdb files. Contributed by Chris Nauroth. 2014-09-05 11:03: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
Alejandro Abdelnur
1a09536141 Fixing HDFS CHANGES.txt, missing HDFS-6905 entry 2014-09-04 11:07:08 -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
arp
3a0142bd77 HDFS-6848. Lack of synchronization on access to datanodeUuid in DataStorage#format. (Contributed by Xiaoyu Yao) 2014-09-03 17:17:06 -07:00
Jing Zhao
45d5b13256 Merge changes from trunk 2014-09-03 15:36:47 -07:00
arp
cb9b485075 HDFS-6930. Improve replica eviction from RAM disk. (Arpit Agarwal) 2014-09-03 13:53:01 -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
Karthik Kambatla
ce0462129f HADOOP-10956. Fix create-release script to include docs and necessary txt files. (kasha) 2014-09-03 09:39:02 -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
a0ccf83dfd HDFS-6954. With crypto, no native lib systems are too verbose. Contributed by Charles Lamb. 2014-09-02 14:22:20 -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
Andrew Wang
6066b1a455 HDFS-6972. TestRefreshUserMappings.testRefreshSuperUserGroupsConfiguration doesn't decode url correctly. Contributed by Yongjun Zhang. 2014-08-29 15:47:01 -07:00
arp
f65183eba3 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
 2014-08-29 13:37:17 -07:00
Aaron T. Myers
7eab2a29a5 HDFS-6774. Make FsDataset and DataStore support removing volumes. Contributed by Lei Xu. 2014-08-29 13:00:17 -07:00
arp
4ae8178c56 HDFS-6800. Support Datanode layout changes with rolling upgrade. (Contributed by James Thomas) 2014-08-29 00:26:13 -07:00
arp
c92837aeab HDFS-6931. Move lazily persisted replicas to finalized directory on DN startup. (Arpit Agarwal) 2014-08-28 23:13:46 -07:00
arp
4cf9afacbe HDFS-6960. Bugfix in LazyWriter, fix test case and some refactoring. (Arpit Agarwal) 2014-08-28 23:05:32 -07:00
arp
7e32be8768 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
 2014-08-28 19:06:46 -07:00
Alejandro Abdelnur
2ca93d1fbf Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs following merge to branch-2 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-mapreduce-project/CHANGES.txt

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-08-28 19:05:57 -07:00
Allen Wittenauer
d8774cc577 HADOOP-11013. CLASSPATH handling should be consolidated, debuggable (aw) 2014-08-28 18:09:25 -07:00
Todd Lipcon
ab638e77b8 HDFS-6865. Byte array native checksumming on client side. Contributed by James Thomas. 2014-08-28 16:44:09 -07:00
arp
bbaa7dc28d HDFS-6928. 'hdfs put' command should accept lazyPersist flag for testing. (Arpit Agarwal) 2014-08-28 15:53:12 -07:00
Alejandro Abdelnur
d9a7404c38 Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs following merge to branch-2 
Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-mapreduce-project/CHANGES.txt

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
 2014-08-28 15:10:59 -07:00
arp
2e987148e0 HDFS-6929. NN periodically unlinks lazy persist files with missing replicas from namespace. (Arpit Agarwal) 2014-08-27 21:47:19 -07:00
arp
3f64c4aaf0 HDFS-6927. Initial unit tests for Lazy Persist files. (Arpit Agarwal) 2014-08-27 21:47:19 -07:00
arp
eb448e1439 HDFS-6926. DN support for saving replicas to persistent storage and evicting in-memory replicas. (Arpit Agarwal) 2014-08-27 21:47:19 -07:00
arp
a317bd7b02 HDFS-6925. DataNode should attempt to place replicas on transient storage first if lazyPersist flag is received. (Arpit Agarwal) 2014-08-27 21:47:19 -07:00
arp
c2354a7f81 HDFS-6923. Propagate LazyPersist flag to DNs via DataTransferProtocol. (Arpit Agarwal) 2014-08-27 21:47:18 -07:00
arp
042b33f20b HDFS-6922. Add LazyPersist flag to INodeFile, save it in FsImage and edit logs. (Arpit Agarwal) 2014-08-27 21:47:18 -07:00
arp
7f49537ba1 HDFS-6924. Add new RAM_DISK storage type. (Arpit Agarwal) 2014-08-27 21:47:18 -07:00
arp
a7bcc95358 HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal) 2014-08-27 21:47:18 -07:00
Colin Patrick Mccabe
7a16731191 HADOOP-10957. The globber will sometimes erroneously return a permission denied exception when there is a non-terminal wildcard. 2014-08-27 19:47:10 -07:00
Jing Zhao
a26aa6bd07 HDFS-6944. Archival Storage: add retry and termination logic for Mover. Contributed by Jing Zhao. 2014-08-27 14:20:54 -07:00
Colin Patrick Mccabe
37549576e7 Add HDFS-6879 to CHANGES.txt 2014-08-27 14:18:18 -07:00
Colin Patrick Mccabe
6962510f72 HDFS-6879. Adding tracing to Hadoop RPC. Contributed by Masatake Iwasaki. 2014-08-27 14:12:05 -07:00
Jing Zhao
b7ded466b0 HDFS-6920. Archival Storage: check the storage type of delNodeHintStorage when deleting a replica. Contributed by Tsz Wo Nicholas Sze. 2014-08-27 14:08:02 -07:00
Colin Patrick Mccabe
b6b95ff667 HDFS-6902. FileWriter should be closed in finally block in BlockReceiver#receiveBlock() (Tsuyoshi OZAWA via Colin Patrick McCabe) 2014-08-27 13:49:31 -07:00
Colin Patrick Mccabe
225569ece2 HDFS-4486. Add log category for long-running DFSClient notices. Contributed by Zhe Zhang. 2014-08-27 13:39:40 -07:00
Colin Patrick Mccabe
d805cc27a9 HDFS-6773. MiniDFSCluster should skip edit log fsync by default. Contributed by Stephen Chu. 2014-08-27 13:33:02 -07:00
Haohui Mai
26ebdd849b HDFS-6938. Cleanup javac warnings in FSNamesystem. Contributed by Charles Lamb. 2014-08-27 11:14:39 -07:00
brandonli
cd9182d8b5 HDFS-6892. Add XDR packaging method for each NFS request. Contributed by Brandon Li 2014-08-27 11:06:01 -07:00
Jing Zhao
8ea20b53a8 HDFS-6911. Archival Storage: check if a block is already scheduled in Mover. Contributed by Tsz Wo Nicholas Sze. 2014-08-27 10:38:10 -07:00
Jing Zhao
555900a9dc Merge branch 'trunk' into HDFS-6584 2014-08-27 10:32:30 -07:00
Jing Zhao
6b441d227a HDFS-6908. Incorrect snapshot directory diff generated by snapshot deletion. Contributed by Juan Yu and Jing Zhao. 2014-08-27 10:26:22 -07:00
arp
c5d9a4a91e HDFS-6694. TestPipelinesFailover.testPipelineRecoveryStress tests fail intermittently with various symptoms - debugging patch (Contributed by Yongjun Zhang) 2014-08-27 09:52:33 -07:00
Allen Wittenauer
9ec4a930f5 HADOOP-10996. Stop violence in the *_HOME (aw) 2014-08-27 07:00:31 -07:00
Karthik Kambatla
dc154ab86d Add a section for 2.5.1 in CHANGES.txt 2014-08-27 00:55:19 -07:00
Arpit Agarwal
e871955765 HDFS-6899. Allow changing MiniDFSCluster volumes per DN and capacity per volume. (Arpit Agarwal) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619970 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-23 06:01:17 +00:00
Chris Nauroth
a83d055f25 HDFS-4852. libhdfs documentation is out of date. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619967 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-23 05:30:21 +00:00
Arpit Agarwal
e6c3650070 HDFS-6829. DFSAdmin refreshSuperUserGroupsConfiguration failed in security cluster. (Contributed by zhaoyunjiong) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619882 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-22 18:14:55 +00:00
Alejandro Abdelnur
3aa3b0abc2 HDF-6905. fs-encryption merge triggered release audit failures. (clamb via tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619667 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-22 05:17:22 +00:00
Jing Zhao
e69954d22c HDFS-6906. Archival Storage: Add more tests for BlockStoragePolicy. Contributed by Tsz Wo Nicholas Sze. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1619628 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 23:42:33 +00:00
Jing Zhao
603cbe5eea HDFS-6863. Archival Storage: Support migration for snapshot paths. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1619627 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 23:41:10 +00:00
Brandon Li
7b28f363b1 HDFS-6890. NFS readdirplus doesn't return dotdot attributes. Contributed by Brandon Li 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619500 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 17:53:54 +00:00
Tsz-wo Sze
c92d869d02 Merge r1609845 through r1619277 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1619293 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 05:22:10 +00:00
Arpit Agarwal
6824abc19e HDFS-6758. Block writer should pass the expected block size to DataXceiverServer (Arpit Agarwal) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619275 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 01:13:49 +00:00
Arpit Agarwal
8f00897a4b HDFS-6878. Change MiniDFSCluster to support StorageType configuration for individual directories. (Arpit Agarwal) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619271 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-21 00:42:27 +00:00
Chris Nauroth
8304001861 HDFS-6858. Allow dfs.data.transfer.saslproperties.resolver.class default to hadoop.security.saslproperties.resolver.class. Contributed by Benoy Antony. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619256 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 22:46:35 +00:00
Karthik Kambatla
9b8250c742 Set the release date for 2.5.0 in CHANGES.txt 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619237 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 21:33:19 +00:00
Andrew Wang
b0f0ef17f0 Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619203 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 18:56:56 +00:00
Andrew Wang
834fccf02b Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1619194 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 18:19:13 +00:00
Jing Zhao
f20d363126 HDFS-6870. Blocks and INodes could leak for Rename with overwrite flag. Contributed by Yi Liu. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619192 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 18:13:03 +00:00
Andrew Wang
d2a39b61aa Merge from trunk to branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1619018 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-20 01:22:42 +00:00
Brandon Li
fbc1ee4d6f HDFS-6868. portmap and nfs3 are documented as hadoop commands instead of hdfs. Contributed by Brandon Li 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1619001 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-19 22:31:57 +00:00
Allen Wittenauer
31467453ec HADOOP-9902. Shell script rewrite (aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618847 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-19 12:11:17 +00:00
Tsz-wo Sze
4e324bcd3d Merge r1609845 through r1618763 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1618764 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 23:41:53 +00:00
Brandon Li
2fb04d2a30 HDFS-6569. OOB message can't be sent to the client when DataNode shuts down for upgrade. Contributed by Brandon Li 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618742 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 21:23:08 +00:00
Arpit Agarwal
1b5139b29a HDFS-6188. An ip whitelist based implementation of TrustedChannelResolver. (Contributed by Benoy Antony) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618727 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 20:50:06 +00:00
Andrew Wang
0cc08f6da4 Merge from trunk to branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1618700 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-18 18:41:31 +00:00
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
Allen Wittenauer
31e478905a Wrong categorization for a variety of commits in the CHANGES.txt files 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618233 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-15 16:47:34 +00:00
Aaron Myers
894b4e427f 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/trunk@1618091 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-15 02:33:24 +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
13ad623b9d Updated contributors name in CHANGES.txt for HDFS-6783 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617880 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-14 04:57:47 +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
Alejandro Abdelnur
065d9ec5d9 HDFS-6849. Replace HttpFS custom proxyuser handling with common implementation. (tucu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617831 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 20:27:50 +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
Allen Wittenauer
a34dafe325 HADOOP-8944. Shell command fs -count should include human readable option (Jonathan Allen via aw) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617775 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 17:30:26 +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
Charles Lamb
acc3d73a45 HDFS-6839. Fix TestCLI to expect new output. (clamb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1617526 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-12 16:50:18 +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
Brandon Li
b760f20af1 HDFS-6582. Missing null check in RpcProgramNfs3#read(XDR, SecurityHandler). Contributed by Abhiraj Butala 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617366 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-11 21:34:02 +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