Commit Graph

2420 Commits

Author SHA1 Message Date
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
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 fe38d2e9b5)
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 70be56d093)
2014-09-18 14:57:33 -07:00
Colin Patrick Mccabe 2b1c9c6210 HDFS-7047. Expose FileStatus#isEncrypted in libhdfs (cmccabe)
(cherry picked from commit 570b8b468e)
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 0ecefe6017)
2014-09-17 21:28:15 -07:00
Andrew Wang b477d30e63 HDFS-7004. Update KeyProvider instantiation to create by URI. (wang)
(cherry picked from commit 10e8602f32)
2014-09-17 20:15:42 -07:00
Andrew Wang b05da10d0d Move some HDFS JIRAs to the correct CHANGES.txt 2014-09-17 18:08:24 -07:00
Colin Patrick Mccabe 6cb8ed0d22 HDFS-6843. Create FileStatus isEncrypted() method (clamb via cmccabe)
(cherry picked from commit e3803d002c)
2014-09-17 13:36:41 -07:00
Andrew Wang 5e54aae62b HDFS-6705. Create an XAttr that disallows the HDFS admin from accessing a file. (clamb via wang)
(cherry picked from commit ea4e2e843e)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
2014-09-17 11:26:17 -07:00
Alejandro Abdelnur 1c847fdd61 HADOOP-11062. CryptoCodec testcases requiring OpenSSL should be run only if -Pnative is used. (asuresh via tucu)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/pom.xml
2014-09-16 23:37:21 -07:00
Alejandro Abdelnur 94a1e68aa5 HADOOP-11096. KMS: KeyAuthorizationKeyProvider should verify the keyversion belongs to the keyname on decrypt. (tucu) 2014-09-16 23:21:17 -07:00
Andrew Wang fcd181bde1 HDFS-6789. TestDFSClientFailover.testFileContextDoesntDnsResolveLogicalURI and TestDFSClientFailover.testDoesntDnsResolveLogicalURI failing on jdk7. Contributed by Akira Ajisaka.
(cherry picked from commit a044407b5c)
2014-09-16 17:03:52 -07:00
Andrew Wang 23f34b75e4 HDFS-6851. Refactor EncryptionZoneWithId and EncryptionZone. (clamb via wang)
(cherry picked from commit 33ce887c20)
2014-09-16 16:57:06 -07:00
Benoy Antony 215216abeb HDFS-6799. The invalidate method in SimulatedFSDataset failed to remove (invalidate) blocks from the file system. Contributed by Megasthenis Asteris. 2014-09-16 16:27:25 -07:00
Alejandro Abdelnur 5d897026e4 HDFS-7006. Test encryption zones with KMS. (Anthony Young-Garner and tucu) 2014-09-16 14:37:04 -07:00
Colin Patrick Mccabe 9be338911b HDFS-6880. Adding tracing to DataNode data transfer protocol (iwasakims via cmccabe)
(cherry picked from commit 56119fec96)
2014-09-16 13:59:58 -07:00
Kihwal Lee 08abb320a7 HDFS-6965. NN continues to issue block locations for DNs with full
disks. Contributed by Rushabh Shah.
(cherry picked from commit 0c26412be4)
2014-09-16 09:06:43 -05:00
Alejandro Abdelnur e59f6771e8 HADOOP-10868. AuthenticationFilter should support externalizing the secret for signing and provide rotation support. (rkanter via tucu) 2014-09-15 17:10:43 -07:00
Kihwal Lee e6e31fbbba HDFS-7059. HAadmin transtionToActive with forceActive option can show
confusing message. Contributed by Rushabh Shah.
(cherry picked from commit 2f847b3357)
2014-09-15 16:30:22 -05:00
Andrew Wang d595557859 HDFS-7032. Add WebHDFS support for reading and writing to encryption zones. Contributed by Charles Lamb.
(cherry picked from commit 43b0303008)
2014-09-15 10:24:38 -07:00
Aaron T. Myers a0c54aeb00 HADOOP-10400. Incorporate new S3A FileSystem implementation. Contributed by Jordan Mendelson and Dave Wang. 2014-09-15 08:30:42 -07:00
Andrew Wang dd3e28d434 HDFS-7061. Add test to verify encryption zone creation after NameNode restart without saving namespace. Contributed by Stephen Chu.
(cherry picked from commit fc741b5d78)
2014-09-14 23:49:26 -07:00
cnauroth 993ede4db3 HDFS-7051. TestDataNodeRollingUpgrade#isBlockFileInPrevious assumes Unix file path separator. Contributed by Chris Nauroth.
(cherry picked from commit d6ce26986e)
2014-09-11 20:58:54 -07:00
Karthik Kambatla d22cd065ed Update CHANGES.txt to set the release date for 2.5.1
(cherry picked from commit 17ffbe0864)
2014-09-11 17:36:06 -07:00
cnauroth ac296f9522 HDFS-7042. Upgrade fails for Windows HA cluster due to file locks held during rename in JournalNode. Contributed by Chris Nauroth.
(cherry picked from commit 80ac6aabce)
2014-09-11 12:17:19 -07:00
Andrew Wang 6151c2bea7 HDFS-7045. Fix NameNode deadlock when opening file under /.reserved path. Contributed by Yi Liu.
(cherry picked from commit 1e684995d7)
2014-09-11 10:59:24 -07:00
Andrew Wang c90e15c559 HDFS-6621. Hadoop Balancer prematurely exits iterations. Contributed by Rafal Wodjdyla and Benjamin Bowman.
(cherry picked from commit d1dab6cc63)
2014-09-11 10:32:57 -07:00
Andrew Wang 0fae8a0e14 HDFS-6966. Add additional unit tests for encryption zones. Contributed by Stephen Chu.
(cherry picked from commit bf64fce78c)
2014-09-11 10:26:21 -07:00
Alejandro Abdelnur 16a4558fda HDFS-6776. Using distcp to copy data between insecure and secure cluster via webdhfs doesn't work. (yzhangal via tucu) 2014-09-09 22:20:36 -07:00
Konstantin V Shvachko c1df6f3b40 Revert HDFS-6940. 2014-09-09 17:34:25 -07:00
cnauroth c6fabbb9e9 Newly moved block replica been invalidated and deleted in TestBalancer. Contributed by Binglin Chang.
(cherry picked from commit 2749fc677c)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-09-09 11:43:21 -07:00
arp e736018601 HDFS-6981. Fix DN upgrade with layout version change. (Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-09-08 22:06:51 -07:00
arp 3259e8954f HDFS-6800. Support Datanode layout changes with rolling upgrade. (Contributed by James Thomas)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-09-08 22:06:12 -07:00
Colin McCabe da118bb113 HDFS-6482. Use block ID-based block layout on datanodes (James Thomas via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615223 13f79535-47bb-0310-9956-ffa450edef68

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	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/datanode/fsdataset/impl/BlockPoolSlice.java
2014-09-08 22:00:51 -07:00
Andrew Wang 176b07b480 Update CHANGES.txt for HDFS-6951
(cherry picked from commit 7498dd790e)
2014-09-08 17:01:53 -07:00
Andrew Wang dc4da242f2 HDFS-6951. Correctly persist raw namespace xattrs to edit log and fsimage. Contributed by Charles Lamb.
(cherry picked from commit 04915a0814)
2014-09-08 17:01:47 -07:00
Colin Patrick Mccabe bdcf5e940f HDFS-6036. Forcibly timeout misbehaving DFSClients that try to do no-checksum reads that extend too long. (cmccabe)
(cherry picked from commit cad14aa916)
2014-09-08 13:02:54 -07:00
Kihwal Lee d20047edda HDFS-7005. DFS input streams do not timeout. Contributed by Daryn Sharp.
(cherry picked from commit 6a84f88c11)
2014-09-08 14:44:47 -05:00
Haohui Mai 876062ac20 HDFS-6943. Improve NN allocateBlock log to include replicas' datanode IPs. Contributed by Ming Ma. 2014-09-08 11:07:56 -07:00
cnauroth b87d1d7d0a HDFS Credential Provider related Unit Test Failure. Contributed by Xiaoyu Yao.
(cherry picked from commit a23144fd8a)
2014-09-07 08:41:08 -07:00
arp eba06e61ce HDFS-6898. DN must reserve space for a full block when an RBW block is created. (Contributed by Arpit Agarwal)
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java
2014-09-06 21:04:21 -07:00
Konstantin V Shvachko 1ea3883553 HDFS-6940. Refactoring to allow ConsensusNode implementation.
Contributed by Konstantin Shvachko.
2014-09-06 12:04:49 -07:00
Alejandro Abdelnur 035112f251 HDFS-6986. DistributedFileSystem must get delegation tokens from configured KeyProvider. (zhz via tucu) 2014-09-05 22:33:58 -07:00
arp 27c53a1d67 HADOOP-11067 [HDFS-6998]. Fix CHANGES.txt 2014-09-05 11:18:30 -07:00
arp 624e793ad6 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:24 -07:00
arp 34a3faf180 HDFS-6862. Add missing timeout annotations to tests. (Contributed by Xiaoyu Yao) 2014-09-05 11:09:47 -07:00
cnauroth df2ab4c76f HDFS-6979. Fix minor error in CHANGES.txt. Contributed by Chris Nauroth.
(cherry picked from commit b051327ab6)
2014-09-05 11:08:16 -07:00
cnauroth ac218d4dac HDFS-6979. hdfs.dll not produce .pdb files. Contributed by Chris Nauroth.
(cherry picked from commit fab9bc58ec)
2014-09-05 11:04:57 -07:00
arp be7e5837a9 HDFS-6831. Inconsistency between 'hdfs dfsadmin' and 'hdfs dfsadmin -help'. (Contributed by Xiaoyu Yao) 2014-09-05 10:46:33 -07:00
Jing Zhao a074342b4c HDFS-6376. Distcp data between two HA clusters requires another configuration. Contributed by Dave Marion and Haohui Mai. 2014-09-05 10:40:50 -07:00
Vinayakumar B 0bd0423ff5 HDFS-6714. TestBlocksScheduledCounter#testBlocksScheduledCounter should shutdown cluster (vinayakumarb)
(cherry picked from commit 772d1fb01e)
2014-09-05 10:26:51 +05:30
Jing Zhao b675f3f150 HDFS-6886. Use single editlog record for creating file + overwrite. Contributed by Yi Liu.
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-09-04 18:56:51 -07:00
Jing Zhao 2363bad793 HDFS-6996. SnapshotDiff report can hit IndexOutOfBoundsException when there are nested renamed directory/file. Contributed by Jing Zhao. 2014-09-04 16:40:51 -07:00
arp 0bbeb80931 HDFS-6848. Lack of synchronization on access to datanodeUuid in DataStorage#format. (Contributed by Xiaoyu Yao) 2014-09-04 16:19:52 -07:00
Alejandro Abdelnur 5dc45d529b HDFS-6905. fs-encryption merge triggered release audit failures. (clamb via tucu) 2014-09-04 11:06:58 -07:00
Alejandro Abdelnur dc2e38780b HADOOP-11015. Http server/client utils to propagate and recreate Exceptions from server to client. (tucu) 2014-09-04 09:14:07 -07:00
Haohui Mai b68818c4f0 HDFS-6609. Use DirectorySnapshottableFeature to represent a snapshottable directory. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1608631 13f79535-47bb-0310-9956-ffa450edef68
2014-09-03 23:11:31 -07:00
Colin Patrick Mccabe 23c41897cb HDFS-6959 Make the HDFS home directory location customizable. Contributed by Yongjun Zhang
(cherry picked from commit f4caedfcbf)
2014-09-03 19:33:30 -07:00
Karthik Kambatla 9855e884cb HADOOP-10956. Fix create-release script to include docs and necessary txt files. (kasha)
(cherry picked from commit ce0462129f)
2014-09-03 09:39:32 -07:00
Uma Maheswara Rao G 3f9c31c873 HDFS-2975. Rename with overwrite flag true can make NameNode to stuck in safemode on NN (crash + restart). (Yi Liu via umamahesh)
(cherry picked from commit 3425ae5d7e)
2014-09-03 19:02:11 +05:30
Haohui Mai 786b43c7a3 HDFS-6942. Fix typos in log messages. Contributed by Ray Chiang. 2014-09-02 16:24:11 -07:00
Colin Patrick Mccabe 4c17d4d975 HDFS-4257. The ReplaceDatanodeOnFailure policies could have a forgiving option. Contributed by szetszwo.
(cherry picked from commit 727331becc)
2014-09-02 15:20:50 -07:00
Andrew Wang 9daf035fbc HDFS-6954. With crypto, no native lib systems are too verbose. Contributed by Charles Lamb.
(cherry picked from commit a0ccf83dfd)
2014-09-02 14:22:46 -07:00
Andrew Wang 958c9b5080 HDFS-6634. inotify in HDFS. Contributed by James Thomas.
(cherry picked from commit faa4455be5)

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/qjournal/client/IPCLoggerChannel.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
2014-09-02 14:17:51 -07:00
Andrew Wang f6319b5131 HDFS-6972. TestRefreshUserMappings.testRefreshSuperUserGroupsConfiguration doesn't decode url correctly. Contributed by Yongjun Zhang.
(cherry picked from commit 6066b1a455)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-08-29 15:49:06 -07:00
Aaron T. Myers 135315b66f HDFS-6774. Make FsDataset and DataStore support removing volumes. Contributed by Lei Xu.
(cherry picked from commit 7eab2a29a5)
2014-08-29 13:00:36 -07:00
Alejandro Abdelnur 09a0ad328f HADOOP-10814. Update Tomcat version used by HttpFS and KMS to latest 6.x version. (rkanter via tucu)
(cherry picked from commit 189abddf0b68ab43978dacaf3a9bf6ee7169cf78)
2014-08-29 11:53:13 -07:00
Todd Lipcon ed2a997f49 HDFS-6865. Byte array native checksumming on client side. Contributed by James Thomas.
(cherry picked from commit ab638e77b8)
2014-08-28 16:49:32 -07:00
Alejandro Abdelnur 1a65717ffa Removing CHANGES-fs-encryption.txt files 2014-08-28 15:13:24 -07:00
Alejandro Abdelnur 5c37f02e27 Fix up CHANGES.txt for HDFS-6134, HADOOP-10150 and related JIRAs following merge to branch-2
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-mapreduce-project/CHANGES.txt

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
2014-08-28 15:05:07 -07:00
Alejandro Abdelnur c77bd85b62 HDFS-6134 and HADOOP-10150 subtasks. 2014-08-28 15:03:08 -07:00
Colin Patrick Mccabe 66ba7b2e7c HADOOP-10957. The globber will sometimes erroneously return a permission denied exception when there is a non-terminal wildcard.
(cherry picked from commit 7a16731191)
2014-08-27 19:52:23 -07:00
Colin Patrick Mccabe f1ee8cec61 HDFS-6879. Adding tracing to Hadoop RPC. Contributed by Masatake Iwasaki.
(cherry picked from commit 6962510f72)
2014-08-27 14:17:29 -07:00
Colin Patrick Mccabe 4afd04a09f fix extra line added to CHANGES.txt in HDFS-6902 cherry-pick 2014-08-27 13:51:54 -07:00
Colin Patrick Mccabe 01b2c9b15f HDFS-6902. FileWriter should be closed in finally block in BlockReceiver#receiveBlock() (Tsuyoshi OZAWA via Colin Patrick McCabe)
(cherry picked from commit b6b95ff667)
2014-08-27 13:51:10 -07:00
Colin Patrick Mccabe fdc15db2e1 HDFS-4486. Add log category for long-running DFSClient notices. Contributed by Zhe Zhang.
(cherry picked from commit 225569ece2)
2014-08-27 13:45:10 -07:00
Colin Patrick Mccabe ddb9d565c8 HDFS-6773. MiniDFSCluster should skip edit log fsync by default. Contributed by Stephen Chu.
(cherry picked from commit d805cc27a9)
2014-08-27 13:37:48 -07:00
brandonli 99d8434511 HDFS-6892. Add XDR packaging method for each NFS request. Contributed by Brandon Li
(cherry picked from commit cd9182d8b5)
2014-08-27 11:15:13 -07:00
Jing Zhao c8b254d70e HDFS-6908. Incorrect snapshot directory diff generated by snapshot deletion. Contributed by Juan Yu and Jing Zhao.
(cherry picked from commit 6b441d227a)
2014-08-27 10:28:37 -07:00
Karthik Kambatla 2a3c8331fe Add a section for 2.5.1 in CHANGES.txt
(cherry picked from commit dc154ab86d)
2014-08-27 00:56:17 -07:00
Arpit Agarwal 9d09b549c5 HDFS-6899: Merging r1619970 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619975 13f79535-47bb-0310-9956-ffa450edef68
2014-08-23 06:36:46 +00:00
Arpit Agarwal 1846514dd2 HDFS-6899. Undo merge of r1619973
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619974 13f79535-47bb-0310-9956-ffa450edef68
2014-08-23 06:23:56 +00:00
Arpit Agarwal 554476881f HDFS-6899: Merging r1619970 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619973 13f79535-47bb-0310-9956-ffa450edef68
2014-08-23 06:22:38 +00:00
Arpit Agarwal 3031e29a90 HDFS-6899. Undo merge of r1619971
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619972 13f79535-47bb-0310-9956-ffa450edef68
2014-08-23 06:22:15 +00:00
Arpit Agarwal 36e3de0577 HDFS-6899: Merging r1619970 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619971 13f79535-47bb-0310-9956-ffa450edef68
2014-08-23 06:01:38 +00:00
Chris Nauroth b2d86ebf78 HDFS-4852. Merging change r1619967 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619968 13f79535-47bb-0310-9956-ffa450edef68
2014-08-23 05:30:59 +00:00
Arpit Agarwal d9e55176b8 HDFS-6829: Merging r1619882 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619883 13f79535-47bb-0310-9956-ffa450edef68
2014-08-22 18:15:13 +00:00
Brandon Li d887700240 HDFS-6890. Merging change r1619500 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619501 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 18:03:55 +00:00
Arpit Agarwal f7e3b6e761 HDFS-6758: Merging r1619275 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619276 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 01:14:14 +00:00
Arpit Agarwal 3e9b4f1950 HDFS-6878: Merging r1619271 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619272 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 00:42:42 +00:00
Chris Nauroth fd50cd9150 HDFS-6858. Merging change r1619256 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619258 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 22:49:38 +00:00
Karthik Kambatla 8b8fe3a425 Set the release date for 2.5.0 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619238 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 21:33:42 +00:00
Jing Zhao f87e8dc4b8 HDFS-6870. Merge r1619192 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619193 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 18:14:43 +00:00
Vinayakumar B 12e216ad29 Merged revision(s) 1617799 from hadoop/common/trunk:
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/branches/branch-2@1619084 13f79535-47bb-0310-9956-ffa450edef68
2014-08-20 12:14:42 +00:00
Brandon Li 388d6cffe5 HDFS-6868. Merging change r1619001 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619002 13f79535-47bb-0310-9956-ffa450edef68
2014-08-19 22:33:23 +00:00
Brandon Li d926fd12cf HDFS-6569. Merging change r1618742 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618747 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 21:26:45 +00:00
Arpit Agarwal ab1c7bee12 HDFS-6188: Merging r1618727 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618728 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 20:50:27 +00:00
Andrew Wang 9b38a6ab23 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/branches/branch-2@1618689 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:10:50 +00:00
Arpit Agarwal e4b1a7696c HDFS-6783: Merging r1618635 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618636 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 15:35:21 +00:00
Aaron Myers 3bf1c3bdf6 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/branches/branch-2@1618092 13f79535-47bb-0310-9956-ffa450edef68
2014-08-15 02:35:25 +00:00
Uma Maheswara Rao G 593ebbfdd7 Merge. Updated contributors name in CHANGES.txt for HDFS-6783
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617881 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 05:00:05 +00:00
Uma Maheswara Rao G 193d2ad731 Merge. 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/branches/branch-2@1617873 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 04:21:11 +00:00
Alejandro Abdelnur de53a50ece HDFS-6849. Replace HttpFS custom proxyuser handling with common implementation. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617833 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 20:29:54 +00:00
Vinayakumar B ece88b6d57 Reverted
Merged revision(s) 1617794 from hadoop/common/trunk:


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617797 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 18:40:28 +00:00
Vinayakumar B c3efba38b0 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/branches/branch-2@1617785 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 18:07:57 +00:00
Haohui Mai e9bd4578d6 HDFS-6567. Merge r1617779 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617780 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 17:47:28 +00:00
Allen Wittenauer 100ae93d42 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/branches/branch-2@1617776 13f79535-47bb-0310-9956-ffa450edef68
2014-08-13 17:32:18 +00:00
Arpit Agarwal f1f1ff8f82 HDFS-6836: Merging r1617603 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617604 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 21:50:09 +00:00
Arpit Agarwal 004068c391 HDFS-6830: Merging r1617598 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617599 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 21:43:06 +00:00
Brandon Li afa125ccfd HDFS-6582. Merging change r1617366 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617369 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 21:38:33 +00:00
Haohui Mai bee0c9b615 HDFS-6838. Merge r1617361 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617363 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 21:30:17 +00:00
Jing Zhao f805ac93a9 HDFS-6837. Merge r1617337 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617338 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 18:02:57 +00:00
Jing Zhao 0960e67787 HDFS-6828. Merge r1616889 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616890 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 21:35:44 +00:00
Ravi Prakash c89c2e597b HDFS-6823. dfs.web.authentication.kerberos.principal shows up in logs for insecure HDFS
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616847 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 18:26:41 +00:00
Chris Nauroth 97dd53a608 HDFS-573. Merging change r1616814 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616817 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 16:29:07 +00:00
Arpit Agarwal 8d73cbb8d8 HDFS-6772: Merging r1616680 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616681 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 05:42:00 +00:00
Alejandro Abdelnur 481ac00c65 HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 2. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616674 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 05:01:12 +00:00
Alejandro Abdelnur d17a4da545 HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 1. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616673 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 05:00:28 +00:00
Haohui Mai 061a26631f HDFS-6722. Merge r1616669 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616670 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 04:29:32 +00:00
Aaron Myers 1fe7b04863 HDFS-6740. Make FSDataset support adding data volumes dynamically. Contributed by Lei Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616624 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 23:01:36 +00:00
Aaron Myers 84d57bbfa8 HDFS-6728. Dynamically add new volumes to DataStorage, formatted if necessary. Contributed by Lei Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616620 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 22:53:00 +00:00
Arpit Agarwal 79d6802d5f HDFS-6781. Add file missed in previous commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616577 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 19:46:38 +00:00
Arpit Agarwal 3f54884b46 HDFS-6781. Separate HDFS commands from CommandsManual.apt.vm. (Contributed by Akira Ajisaka)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616576 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 19:46:14 +00:00
Tsz-wo Sze 67557212c7 svn merge -c 1616426 from trunk for HDFS-6812. Remove addBlock and replaceBlock from DatanodeDescriptor.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616427 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 07:33:01 +00:00
Tsz-wo Sze 645ca2d8f5 svn merge -c 1616422 from trunk for HDFS-6809. Move Balancer's inner classes MovedBlocks and Matcher as to standalone classes and separates KeyManager from NameNodeConnector.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616423 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 07:23:06 +00:00
Jing Zhao 5c7571fa3f HDFS-6791. Merge change r1616306 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616311 13f79535-47bb-0310-9956-ffa450edef68
2014-08-06 19:15:04 +00:00
Allen Wittenauer cc5a7495b7 HDFS-6517. Remove hadoop-metrics2.properties from hdfs project (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616265 13f79535-47bb-0310-9956-ffa450edef68
2014-08-06 16:13:36 +00:00
Brandon Li 5e3640eb4f HDFS-6790. Merging change r1616058 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616072 13f79535-47bb-0310-9956-ffa450edef68
2014-08-06 01:13:36 +00:00
Karthik Kambatla 5f81675aea Edit CHANGES.txt files to move HADOOP-10759 and HDFS-6717 from 2.5.0 to 2.6.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616037 13f79535-47bb-0310-9956-ffa450edef68
2014-08-05 22:49:34 +00:00
Alejandro Abdelnur 891d93bbcf HADOOP-10791. AuthenticationFilter should support externalizing the secret for signing and provide rotation support. (rkanter via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616006 13f79535-47bb-0310-9956-ffa450edef68
2014-08-05 21:25:22 +00:00
Brandon Li c1452c4722 Merging change r1615801 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615802 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 21:33:10 +00:00
Brandon Li 225febccc1 HDFS-6451. Merging change r1615702 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615708 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 17:44:45 +00:00
Uma Maheswara Rao G 4ac92fdbd5 Merge from trunk. HDFS-6787. Remove duplicate code in FSDirectory#unprotectedConcat. Contributed by Yi Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615623 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 15:45:56 +00:00
Vinayakumar B 8e8d4717e9 Merged revision(s) 1615504 from hadoop/common/trunk:
HDFS-5185. DN fails to startup if one of the data dir is full. Contributed by Vinayakumar B.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615505 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 08:44:39 +00:00
Vinayakumar B fed094d0af Merged revision(s) 1615491 from hadoop/common/trunk:
HDFS-5723. Append failed FINALIZED replica should not be accepted as valid when that block is underconstruction. Contributed by Vinayakumar B.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615492 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 06:46:01 +00:00
Chris Nauroth 2852c4866e HDFS-6810: fix compilation error in TestReplicationPolicy.java.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615387 13f79535-47bb-0310-9956-ffa450edef68
2014-08-03 05:13:44 +00:00
Arpit Agarwal 89cf64edf3 HDFS-6810: Merging r1615381 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615382 13f79535-47bb-0310-9956-ffa450edef68
2014-08-03 02:08:57 +00:00
Andrew Wang 743837b259 HDFS-6793. Missing changes in HftpFileSystem when Reintroduce dfs.http.port / dfs.https.port in branch-2. Contributed by Juan Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615243 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 21:54:18 +00:00
Andrew Wang 5f115917b3 HDFS-6788. Improve synchronization in BPOfferService with read write lock. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615242 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 21:50:45 +00:00
Andrew Wang 2777f777e9 Revert HDFS-6788, bad merge.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615239 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 21:45:38 +00:00
Andrew Wang 511234c828 HDFS-6788. Improve synchronization in BPOfferService with read write lock. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615191 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 18:56:25 +00:00
Andrew Wang e86559fde3 HDFS-6802. Some tests in TestDFSClientFailover are missing @Test annotation. Contributed by Akira Ajisaka.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615184 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 17:58:37 +00:00