Commit Graph

4313 Commits

Author SHA1 Message Date
Wei-Chiu Chuang 2463923492 HDFS-11306. Print remaining edit logs from buffer if edit log can't be rolled. Contributed by Wei-Chiu Chuang.
(cherry picked from commit 1cde954a4f)
(cherry picked from commit 914eeb997b)
2017-02-13 10:18:04 -08:00
Kihwal Lee 22f8b66137 HDFS-11379. DFSInputStream may infinite loop requesting block locations. Contributed by Daryn Sharp.
(cherry picked from commit 33c62d2d19)
2017-02-10 12:56:44 -06:00
Eric Payne 4e423edd95 HDFS-9300. TestDirectoryScanner.testThrottle() is still a little flakey. Contributed by Daniel Templeton.
(cherry picked from commit 3c0adac88c)
2017-02-02 15:34:59 -05:00
Anu Engineer 4f135647fd HDFS-9911. TestDataNodeLifeline Fails intermittently. Contributed by Yiqun Lin
(cherry picked from commit a95639068c)
2017-01-27 21:09:03 +00:00
Zhe Zhang 1a6b6e249f HDFS-10534. NameNode WebUI should display DataNode usage histogram. Contributed by Kai Sasaki.
(cherry picked from commit 18e1d68209)
(cherry picked from commit 558fee285a)
2017-01-25 10:53:06 -08:00
Akira Ajisaka 71cbc4f6b5 HDFS-11290. TestFSNameSystemMBean should wait until JMX cache is cleared. Contributed by Erik Krogen.
(cherry picked from commit b1a9ec856b)
(cherry picked from commit db47bd15dd)
2017-01-24 14:10:54 +09:00
Vinitha Reddy Gankidi e7b4f88acd HDFS-10733. NameNode terminated after full GC thinking QJM is unresponsive. Contributed by Vinitha Gankidi. 2017-01-18 12:57:09 -08:00
Andrew Wang b7b8671c0e HDFS-11312. Fix incompatible tag number change for nonDfsUsed in DatanodeInfoProto. Contributed by Sean Mackrory.
(cherry picked from commit d51f8ba808)
(cherry picked from commit b089e122b1)
2017-01-11 15:13:43 -08:00
Junping Du 7706a63fb4 Preparing for 2.8.1 development after cutting off 2.8.0 branch. 2017-01-10 18:03:51 -08:00
Yongjun Zhang f5e837e300 HDFS-11292. log lastWrittenTxId etc info in logSyncAll. Contributed by Yongjun Zhang.
(cherry picked from commit 603cbcd513)
2017-01-09 16:25:18 -08:00
Chris Nauroth 15e89634a5 HDFS-9483. Documentation does not cover use of "swebhdfs" as URL scheme for SSL-secured WebHDFS. Contributed by Surendra Singh Lilhore.
(cherry picked from commit 4c8f9e1302)
(cherry picked from commit 9c61858ee7)
2017-01-05 15:05:12 -08:00
Wei-Chiu Chuang 162c6cc9f4 HDFS-11160. VolumeScanner reports write-in-progress replicas as corrupt incorrectly. Contributed by Wei-Chiu Chuang and Yongjun Zhang.
(cherry picked from commit 0cb99db9d9)

Conflicts:
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockScanner.java
2017-01-05 13:29:43 -08:00
Haohui Mai e690cd5011 HDFS-11280. Allow WebHDFS to reuse HTTP connections to NN. Contributed by Zheng Shao. 2017-01-04 21:15:01 -08:00
Brahma Reddy Battula 7392a5a72c Revert "HDFS-11280. Allow WebHDFS to reuse HTTP connections to NN. Contributed by Zheng Shao."
This reverts commit 0ff9efcf37.
2017-01-03 19:30:45 +05:30
Haohui Mai 0ff9efcf37 HDFS-11280. Allow WebHDFS to reuse HTTP connections to NN. Contributed by Zheng Shao. 2016-12-31 01:07:41 -08:00
Daniel Templeton 747be79b22 HDFS-11278. Add missing @Test annotation for TestSafeMode.testSafeModeUtils() (Contributed by Lukas Majercak via Daniel Templeton)
(cherry picked from commit ce3613c965)
(cherry picked from commit af266c8c85)
2016-12-28 20:11:56 -08:00
Brahma Reddy Battula 218ed0a96b HDFS-11252. TestFileTruncate#testTruncateWithDataNodesRestartImmediately can fail with BindException. Contributed by Yiqun Lin.
(cherry picked from commit 0ddb8defad)
2016-12-28 10:43:21 +05:30
Mingliang Liu 9a976f3859 HDFS-11270. Document the missing options of NameNode bootstrap command. Contributed by Yiqun Lin
(cherry picked from commit c0e0ef2969)
2016-12-27 11:41:34 -08:00
Akira Ajisaka 0caa114183 HDFS-11272. Refine the assert messages in TestFSDirAttrOp. Contributed by Jimmy Xiang.
(cherry picked from commit ea547529cb)
(cherry picked from commit cd331556f6)
2016-12-26 17:17:40 +09:00
Akira Ajisaka daa475ff72 HDFS-11250. Fix a typo in ReplicaUnderRecovery#setRecoveryID. Contributed by Yiqun Lin.
(cherry picked from commit 8f218ea284)
(cherry picked from commit 1b39268233)
2016-12-26 16:53:14 +09:00
Akira Ajisaka 704560d95f HDFS-11271. Typo in NameNode UI. Contributed by Wei-Chiu Chuang.
(cherry picked from commit 483cd06ad4)
(cherry picked from commit a779b4ab8f)
2016-12-26 16:38:14 +09:00
Akira Ajisaka 990e272f96 HDFS-11258. Addendum patch to fix compile issue. Contributed by Jimmy Xiang.
(cherry picked from commit 16c4dcad85)
2016-12-23 03:58:10 +09:00
Haohui Mai 72a8c8dc6f HDFS-11258. File mtime change could not save to editlog. Contributed by Jimmy Xiang. 2016-12-21 14:22:27 -08:00
Mingliang Liu 059d33bb8b HDFS-11094. Send back HAState along with NamespaceInfo during a versionRequest as an optional parameter. Contributed by Eric Badger
(cherry picked from commit 012d28a1fa)
2016-12-20 14:29:33 -08:00
Xiao Chen aec0d06a34 HDFS-11195. Return error when appending files by webhdfs rest api fails. Contributed by Yuanbo Liu.
(cherry picked from commit 5b7acdd206)
2016-12-20 12:27:44 -08:00
Brahma Reddy Battula a43bbea3c8 HDFS-11263. ClassCastException when we use Bzipcodec for Fsimage compression. Contributed by Brahma Reddy Battula.
(cherry picked from commit 1b401f6a73)
2016-12-20 21:16:54 +05:30
Akira Ajisaka 1e3304ad23 HDFS-11262. Remove unused variables in FSImage.java. Contributed by Jagadesh Kiran N.
(cherry picked from commit d2026ae9e6)
(cherry picked from commit a95acbcb6e)
2016-12-20 14:37:57 +09:00
Akira Ajisaka 07a221e6aa HDFS-11249. Redundant toString() in DFSConfigKeys.java. Contributed by Jagadesh Kiran N.
(cherry picked from commit 36947f79ba)
(cherry picked from commit eaa50a1087)
2016-12-16 00:41:03 +09:00
Akira Ajisaka 901bc5eef5 HDFS-11204. Document the missing options of hdfs zkfc command. Contributed by Yiqun Lin.
(cherry picked from commit 72bff192cd)
(cherry picked from commit 190b2dca62)
2016-12-14 18:54:39 +09:00
Andrew Wang 158292fd7e HDFS-10684. WebHDFS DataNode calls fail without parameter createparent. Contributed by John Zhuge.
(cherry picked from commit fbdbbd57cd)
(cherry picked from commit 6b795c34d0)
2016-12-13 18:01:40 -08:00
Vinayakumar B 69db9eecfa HDFS-10570. Remove classpath conflicts of netty-all jar in hadoop-hdfs-client (Contributed by Vinayakumar B)
(cherry picked from commit c6fb9f0d0b)
2016-12-12 12:12:30 +05:30
Wei-Chiu Chuang fa3b2bee61 HDFS-11229. HDFS-11056 failed to close meta file. Contributed by Wei-Chiu Chuang.
(cherry picked from commit 292bd78b44)
2016-12-09 16:12:09 -08:00
Andrew Wang e8b0ef0618 HDFS-8630. WebHDFS : Support get/set/unset StoragePolicy. Contributed by Surendra Singh Lilhore. 2016-12-09 14:56:49 -08:00
Andrew Wang bced9e2e5b HDFS-11217. Annotate NameNode and DataNode MXBean interfaces as Private/Stable. Contributed by Jagadesh Kiran N.
(cherry picked from commit 5bd7dece92)
(cherry picked from commit 85adc6677b)
2016-12-09 12:05:50 -08:00
Vinayakumar B b1c08737d8 HDFS-11224. Lifeline message should be ignored for dead nodes (Contributed by Vinayakumar B)
(cherry picked from commit d1d4aba71b)
(cherry picked from commit 199d8b5594)
2016-12-09 14:58:28 +05:30
Xiao Chen 892ee3f191 HDFS-11197. Listing encryption zones fails when deleting a EZ that is on a snapshotted directory. Contributed by Wellington Chevreuil.
(cherry picked from commit 401c731872)
2016-12-08 12:41:31 -08:00
Akira Ajisaka 39bf840398 HDFS-11223. Fix typos in HttpFs documentations. Contributed by Yiqun Lin.
(cherry picked from commit 4c2cf5560f)
(cherry picked from commit 0478597ea9)
2016-12-08 20:53:36 +09:00
Akira Ajisaka 59b0857c6b HDFS-11140. Directory Scanner should log startup message time correctly. Contributed by Yiqun Lin.
(cherry picked from commit 9ef89ede2f)
(cherry picked from commit e00a124cb5)
2016-12-08 13:42:02 +09:00
Vinayakumar B 7dc22dbe0c HDFS-9057. allow/disallow snapshots via webhdfs (Contributed by Brahma Reddy Battula)
(cherry picked from commit 6d2332ae37)
(cherry picked from commit 4b21b47f56)
2016-12-07 15:58:29 -08:00
Kihwal Lee ac9801fec8 HDFS-11198. NN UI should link DN web address using hostnames. Contributed by Weiwei Yang. 2016-12-06 08:08:28 -06:00
Andrew Wang 1a7b2ab9bb Revert "HDFS-11156. Add new op GETFILEBLOCKLOCATIONS to WebHDFS REST API. Contributed by Weiwei Yang"
This reverts commit 3b80424d4f.
2016-12-05 23:09:30 -08:00
Andrew Wang 79f830ed22 HDFS-10581. Hide redundant table on NameNode WebUI when no nodes are decomissioning. Contributed by Weiwei Yang.
(cherry picked from commit 8e63fa98ea)
(cherry picked from commit 2fdae7324b)
2016-12-05 18:14:09 -08:00
Wei-Chiu Chuang 590c7f0d78 HDFS-11181. Fuse wrapper has a typo. Contributed by Wei-Chiu Chuang.
(cherry picked from commit b36af9b76c)
2016-12-05 08:56:24 -08:00
Mingliang Liu 3b80424d4f HDFS-11156. Add new op GETFILEBLOCKLOCATIONS to WebHDFS REST API. Contributed by Weiwei Yang
(cherry picked from commit c7ff34f8dc)
(cherry picked from commit be969e5918)
2016-12-02 11:38:36 -08:00
Akira Ajisaka 5025a898e1 HDFS-11180. Intermittent deadlock in NameNode when failover happens.
(cherry picked from commit 5a7941a4fc)
2016-12-02 11:35:22 +09:00
Kihwal Lee dd4acebb41 HDFS-8674. Improve performance of postponed block scans. Contributed by Daryn Sharp.
(cherry picked from commit 0d8a35bd6d)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
2016-12-01 12:20:30 -06:00
Akira Ajisaka 129beeeddd HADOOP-13812. Upgrade Tomcat to 6.0.48. Contributed by John Zhuge.
(cherry picked from commit 00096dcc0c)
(cherry picked from commit 0c895e8a62)
2016-11-29 19:51:38 +09:00
Robert Kanter 92ee5e2077 HADOOP-13838. KMSTokenRenewer should close providers (xiaochen via rkanter)
(cherry picked from commit 47ca9e26fb)
(cherry picked from commit 285edf691d)
2016-11-28 18:23:23 -08:00
Akira Ajisaka c9297b608c HDFS-11174. Wrong HttpFS test command in doc. Contributed by John Zhuge.
(cherry picked from commit bb1b5e083b)
(cherry picked from commit 6fe5ffd05d)
2016-11-25 21:29:48 +09:00
Akira Ajisaka 011d478aab HDFS-11175. Document uppercase key names are not supported in TransparentEncryption.md. Contributed by Yiqun Lin.
(cherry picked from commit 636f7547b7)
(cherry picked from commit 0df7f5cdf6)
2016-11-25 17:50:43 +09:00
Brahma Reddy Battula 9be7b353dd HADOOP-13646. Remove outdated overview.html. Contributed By Brahma Reddy Battula.
(cherry picked from commit afcf8d38e7)
2016-11-22 20:36:32 +05:30
Kihwal Lee f5410f0814 HDFS-10966. Enhance Dispatcher logic on deciding when to give up a source DataNode. Contributed by Mark Wagner and Zhe Zhang.
(cherry picked from commit 774b0cd845)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/resources/hdfs-default.xml
2016-11-21 10:52:42 -06:00
Brahma Reddy Battula ce4cd98784 HDFS-11101. TestDFSShell#testMoveWithTargetPortEmpty fails intermittently. Contributed By Brahma Reddy Battula.
(cherry picked from commit f922067748)
2016-11-21 19:36:57 +05:30
Brahma Reddy Battula 23ddb98e1b HDFS-11144. TestFileCreationDelete#testFileCreationDeleteParent fails wind bind exception. Contributed By Brahma Reddy Battula.
(cherry picked from commit c68dad18ab)
2016-11-21 11:00:15 +05:30
Brahma Reddy Battula f0e2271149 HDFS-11134. Fix bind exception threw in TestRenameWhileOpen. Contributed By Yiqun Lin.
(cherry picked from commit b2d4b7b1b9)
2016-11-17 10:26:50 +05:30
Mingliang Liu a8dadd8c53 HDFS-11105. TestRBWBlockInvalidation#testRWRInvalidation fails intermittently. Contributed by Yiqun Lin
(cherry picked from commit c90891e7b3)
2016-11-16 13:13:19 -08:00
Kihwal Lee 15f08e9298 HDFS-8870. Lease is leaked on write failure. Contributed by Kuhu Shukla.
(cherry picked from commit 4fcea8a0c8)
2016-11-15 14:57:04 -06:00
Zhe Zhang c6e7b631bd HDFS-10872. Add MutableRate metrics for FSNamesystemLock operations. Contributed by Erik Krogen.
(cherry picked from commit 818915aabb)
2016-11-14 16:39:26 -08:00
Brahma Reddy Battula 4dc40fe28e HDFS-11135. The tests in TestBalancer run fails due to NPE. Contributed By Yiqun Lin
(cherry picked from commit 6efb8c9c60)
2016-11-14 20:42:50 +05:30
Erik Krogen 3d52459712 HDFS-11087. NamenodeFsck should check if the output writer is still writable. Contributed by Erik Krogen.
(cherry picked from commit 98d9e9c4c8)
2016-11-13 14:54:49 -08:00
Mingliang Liu 4bcef1c616 HADOOP-13813. TestDelegationTokenFetcher#testDelegationTokenWithoutRenewer is failing. Contributed by Mingliang Liu
(cherry picked from commit fb3a5085e8)
2016-11-12 10:37:46 -08:00
Mingliang Liu fcedb6812b HDFS-11129. TestAppendSnapshotTruncate fails with bind exception. Contributed by Brahma Reddy Battula
(cherry picked from commit 2ee18fc15e)
2016-11-11 22:19:39 -08:00
Xiaoyu Yao c443ecb267 HDFS-10941. Improve BlockManager#processMisReplicatesAsync log. Contributed by Chen Liang.
(cherry picked from commit 4484b48498)
2016-11-11 14:32:11 -08:00
Mingliang Liu ae7a20f524 HDFS-11122. TestDFSAdmin#testReportCommand fails due to timed out. Contributed by Yiqun Lin
(cherry picked from commit aa6010ccca)
2016-11-11 12:35:21 -08:00
Brahma Reddy Battula 121b56de14 HDFS-11128. CreateEditsLog throws NullPointerException. Contributed by Hanisha Koneru.
(cherry picked from commit 1ae57f0f75)
2016-11-11 20:11:13 +05:30
Xiao Chen d81706cd99 HDFS-11120. TestEncryptionZones should waitActive. Contributed by John Zhuge.
(cherry picked from commit 907b1431c0ead934e26cf7dbc51bfab5d7cc5ddc)
2016-11-09 17:16:36 -08:00
Wei-Chiu Chuang 1d75da8e26 HDFS-11056. Concurrent append and read operations lead to checksum error. Contributed by Wei-Chiu Chuang.
(cherry picked from commit 16430c64b7)
2016-11-09 13:32:35 -08:00
Mingliang Liu ad992e05a6 HDFS-11083. Add unit test for DFSAdmin -report command. Contributed by Xiaobing Zhou
(cherry picked from commit 62d8c17dfd)
2016-11-08 17:10:59 -08:00
Mingliang Liu 00625004b7 HDFS-11085. Add unit test for NameNode failing to start when name dir is unwritable. Contributed by Xiaobing Zhou
(cherry picked from commit 0c0ab102ab)
2016-11-04 14:45:43 -07:00
Mingliang Liu b082d4b746 HDFS-11076. Add unit test for extended Acls. Contributed by Chen Liang
(cherry picked from commit 7534aee09a)
2016-11-03 13:55:43 -07:00
Arpit Agarwal 3f2bfdba3e HDFS-11097. Fix warnings for deprecated StorageReceivedDeletedBlocks constructor. Contributed by Yiqun Lin. 2016-11-03 10:33:28 -07:00
Andrew Wang e393dd788e HDFS-11080. Update HttpFS to use ConfigRedactor. Contributed by Sean Mackrory. 2016-11-02 19:11:25 -07:00
Brahma Reddy Battula 77142827e8 HDFS-11031. Add additional unit test for DataNode startup behavior when volumes fail. Contributed by Mingliang Liu.
(cherry picked from commit 35e6081020)
2016-11-02 10:40:22 +05:30
Mingliang Liu 10eb21e52e HDFS-11065. Add space quota tests for heterogenous storages. Contributed by Xiaobing Zhou
(cherry picked from commit fa1512a740)
2016-11-01 14:50:16 -07:00
Kihwal Lee db6dfeca1a HDFS-10997. Reduce number of path resolving methods. Contributed by Daryn Sharp.
(cherry picked from commit 7c1a1834e4)
2016-11-01 08:26:25 -05:00
Brahma Reddy Battula c895f08936 HDFS-10455. Logging the username when deny the setOwner operation. Contributed by Rakesh R.
(cherry picked from commit 1c5708f6de)
2016-11-01 10:53:37 +05:30
Kihwal Lee 91640a0170 Addendum of HDFS-10722 to include HDFS-7964 logic.
(cherry picked from commit 4a8e6dc02f)
(cherry picked from commit 3b2554f3b0)
(cherry picked from commit c2bb9bf00c)
2016-10-31 16:37:00 -07:00
Zhe Zhang 7900b1e803 Revert "HDFS-10722. Fix race condition in TestEditLog#testBatchedSyncWithClosedLogs. Contributed by Daryn Sharp."
This reverts commit c2bb9bf00c.
2016-10-31 16:35:05 -07:00
Kihwal Lee c2bb9bf00c HDFS-10722. Fix race condition in TestEditLog#testBatchedSyncWithClosedLogs. Contributed by Daryn Sharp.
(cherry picked from commit 4a8e6dc02f)
(cherry picked from commit 3b2554f3b0)
2016-10-31 16:30:39 -07:00
Akira Ajisaka a17fc1dca3 HDFS-10485. Fix findbugs warning in FSEditLog.java. (aajisaka)
(cherry picked from commit e620530301)
(cherry picked from commit b8c1db6f63)
2016-10-31 16:24:35 -07:00
Jing Zhao e327325a37 HDFS-7964. Add support for async edit logging. Contributed by Daryn Sharp.
(cherry picked from commit 2151716832)
(cherry picked from commit 3cb7ae11a8)
2016-10-31 16:24:35 -07:00
Mingliang Liu fece3c881b HDFS-11030. TestDataNodeVolumeFailure#testVolumeFailure is flaky (though passing). Contributed by Mingliang Liu
(cherry picked from commit 6bb12ecc3f)
2016-10-31 16:06:41 -07:00
Arpit Agarwal f0a6d17e3b HDFS-11074. Remove unused method FsDatasetSpi#getFinalizedBlocksOnPersistentStorage. Contributed by Hanisha Koneru. 2016-10-31 12:40:03 -07:00
Mingliang Liu 616c1194fe HDFS-11047. Remove deep copies of FinalizedReplica to alleviate heap consumption on DataNode. Contributed by Xiaobing Zhou
(cherry picked from commit 2848a27700)
2016-10-28 11:18:26 -07:00
Mingliang Liu a8a99f3423 HDFS-11048. Audit Log should escape control characters. Contributed by Eric Badger
(cherry picked from commit 8a9388e5f6)
2016-10-28 11:01:09 -07:00
Erik Krogen 2ec90a1a4b HDFS-9500. Fix software version counts for DataNodes during rolling upgrade. Contributed by Erik Krogen.
(cherry picked from commit f3ac1f41b8)
2016-10-27 16:04:58 -07:00
Wei-Chiu Chuang bc2f429c0e HDFS-11055. Update default-log4j.properties for httpfs to imporve test logging. Contributed by Wei-Chiu Chuang.
(cherry picked from commit 31ff42b510)
(cherry picked from commit 2cf3138d72)
2016-10-27 13:47:26 -07:00
Kihwal Lee 40dbf2a18d HDFS-11069. Tighten the authorization of datanode RPC. Contributed by Kihwal Lee
(cherry picked from commit ae48c496dc)
2016-10-27 14:18:48 -05:00
Kihwal Lee 5b0d32b4aa Revert "HDFS-10455. Logging the username when deny the setOwner operation. Contributed by Tianyin Xiu"
This reverts commit d6dfc76dfe.
2016-10-27 14:10:52 -05:00
Brahma Reddy Battula d6dfc76dfe HDFS-10455. Logging the username when deny the setOwner operation. Contributed by Tianyin Xiu
(cherry picked from commit ac35ee9393)
2016-10-27 20:23:07 +05:30
Vinayakumar B 7279ce831d HDFS-8492. DN should notify NN when client requests a missing block (Contributed by Walter Su)
(cherry picked from commit 1cf6ec4ad4)
(cherry picked from commit 144f7a9e0e)
2016-10-27 16:56:25 +05:30
Masatake Iwasaki 6d9b6fac86 HADOOP-13017. Implementations of InputStream.read(buffer, offset, bytes) to exit 0 if bytes==0. Contributed by Steve Loughran.
(cherry picked from commit 0bdd263d82)
2016-10-27 15:55:35 +09:00
Mingliang Liu a7684f6517 HDFS-10921. TestDiskspaceQuotaUpdate doesn't wait for NN to get out of safe mode. Contributed by Eric Badger
(cherry picked from commit 55e1fb8e32)
2016-10-26 14:18:00 -07:00
Kihwal Lee e7bd2e8d63 HDFS-11053. Unnecessary superuser check in versionRequest(). Contributed by Kihwal Lee.
(cherry picked from commit e90af4a89b)
2016-10-26 09:18:01 -05:00
Kihwal Lee 49adab66b8 HDFS-11050. Change log level to 'warn' when ssl initialization fails and defaults to DEFAULT_TIMEOUT_CONN_CONFIGURATOR. Contributed by Kuhu Shukla.
(cherry picked from commit ce6bbfb23c)
2016-10-26 08:11:51 -05:00
Arpit Agarwal df83d86da7 HDFS-11054. Suppress verbose log message in BlockPlacementPolicyDefault. Contributed by Chen Liang. 2016-10-25 19:51:53 -07:00
Xiaoyu Yao e0fc749a46 HDFS-11011. Add unit tests for HDFS command 'dfsadmin -set/clrSpaceQuota'. Contributed by Xiaobing Zhou.
(cherry picked from commit 85f6fec0370b3cd94d6c2f19920c0b6d33f127c6)
(cherry picked from commit c2ba4b650168be4fad7ffdb546b8a0d985268393)
2016-10-25 11:22:07 -07:00
Zhe Zhang 262518fa5b HDFS-11015. Enforce timeout in balancer. Contributed by Kihwal Lee.
(cherry picked from commit f6367c5f44)
(cherry picked from commit ff806cbfc7)
2016-10-25 10:59:03 -07:00
Kihwal Lee c82910203c HDFS-11042. Add missing cleanupSSLConfig() call for tests that use setupSSLConfig(). Contributed by Kuhu Shukla.
(cherry picked from commit 086577c67a)

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs-httpfs/src/test/java/org/apache/hadoop/fs/http/client/TestHttpFSFWithSWebhdfsFileSystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTokens.java
2016-10-24 09:00:28 -05:00
Brahma Reddy Battula 5754772bd6 HADOOP-13236. truncate will fail when we use viewfilesystem. Contributed by Brahma Reddy Battula
(cherry picked from commit f872c6bc03)
2016-10-21 16:22:42 +05:30