2341 Commits

Author SHA1 Message Date
Andrew Wang
38f3b11c29 HDFS-7124. Remove EncryptionZoneManager.NULL_EZ. (clamb via wang)
(cherry picked from commit 7f0efe96f85704e39349f20ab6a11bfaa81c6a75)
2014-09-29 14:14:49 -07:00
Andrew Wang
d551a95fc4 Move HDFS-7157 to HDFS CHANGES.txt
(cherry picked from commit a45b331cc9b9c772504474c224aa23bcbac403db)
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 f0293f11a85176afc04d809574c9126a80b700cc)
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 0f7a4337ac96141db4a3400fd8308436d87042f4)

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 55302ccfba199ddf070119be30df06afd2511e05)
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 e96ce6f3e3e549202ce3c48d4733ba34098870ad)

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 9f9a2222a2e142a47537bc57ca98fb07a7a78ad4)
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 1861b32eb551a07d748afc6205ea9573f9503eda)
2014-09-25 13:22:35 -07:00
cnauroth
6bace90b29 HDFS-7127. TestLeaseRecovery leaks MiniDFSCluster instances. Contributed by Chris Nauroth.
(cherry picked from commit b607c3c3636064c28202cb71887a77e74b1168f2)
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 dc2ebf88a8e6fdf752b3f67933ff6c276ab90921)
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 e0b1dc514f1b9e26b21d97ece0d94cd9c827fc59)
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 63198bfba7b899b33f26c079bc8241dad1bdbc57)
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 b93d9603a25b6b93f67c69503130164eef047876)
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 f48686a1ad81823000534665a76264bba51182f4)
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 a1fd804a314481065c849cb8e1d7c75494e24660)
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 7b8df93ce1b7204a247e64b394d57eef748e73aa)
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 912ad32b03c1e023ab88918bfa8cb356d1851545)
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 26cba7f35ff24262afa5d8f9ed22f3a7f01d9a71)
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 b6fd5ccbce25f390c0e348d296b4fe1f8b9b738f)
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 0795fe3721cf86ed89d5e9058c977a1113247d08)
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 47491f9a119faf75abaa56f676ae93460583bd3f)
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 f85cc14eb49a46e81d2edcdc1ffe4d0852f193a5)

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 332e2e23ba6f0748a46c0bda76f426d9cad73edd)
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 9e355719653c5e7b48b601090634882e4f29a743)
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 25fd69a8f9defb21a5c0e3b7243657d9e8080319)
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 bf27b9ca574592ef603e126bacb9b6a37c9eb5c6)
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 f02d934fedf00f0ce43d6f3f9b06d89ccc6851a5)
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 8e73084491c9f317bc8cc3590f93ca67a63687a8)
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 20a076bafce548298729bab4fb81d12f829e8f7e)

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
Colin Patrick Mccabe
d329237990 HDFS-6727. Refresh data volumes on DataNode based on configuration changes (Lei Xu via Colin Patrick McCabe)
(cherry picked from commit fe38d2e9b5ac7e13f97cd2d3d2a984ab6bbaaf77)
2014-09-18 16:53:07 -07:00
Andrew Wang
47c9dcfe8e HDFS-7003. Add NFS Gateway support for reading and writing to encryption zones. (clamb via wang)
(cherry picked from commit 70be56d093022de9953e14a92dfa1a146bd9a290)
2014-09-18 14:57:33 -07:00
Colin Patrick Mccabe
2b1c9c6210 HDFS-7047. Expose FileStatus#isEncrypted in libhdfs (cmccabe)
(cherry picked from commit 570b8b468e1a75ad29c674699f0f4fe34d919ed9)
2014-09-18 11:42:53 -07:00
Andrew Wang
008e2f68f1 HDFS-7078. Fix listEZs to work correctly with snapshots. (wang)
(cherry picked from commit 0ecefe60179968984b1892a14411566b7a0c8df3)
2014-09-17 21:28:15 -07:00