Clone
 

walter su <waltersu4549@apache.org> in hadoop

HDFS-9744. TestDirectoryScanner#testThrottling occasionally time out after 300 seconds. Contributed by Lin Yiqun.

HDFS-9744. TestDirectoryScanner#testThrottling occasionally time out after 300 seconds. Contributed by Lin Yiqun.

(cherry picked from commit 90d1af141666ba12f18d44464cb6169c445d0902)

HDFS-9744. TestDirectoryScanner#testThrottling occasionally time out after 300 seconds. Contributed by Lin Yiqun.

(cherry picked from commit 90d1af141666ba12f18d44464cb6169c445d0902)

HDFS-10284. o.a.h.hdfs.server.blockmanagement.TestBlockManagerSafeMode.testCheckSafeMode fails intermittently. Contributed by Mingliang Liu.

(cherry picked from commit 4b4df2cd48649b2d9cbdd97907c8d5f813cacdb1)

HDFS-10284. o.a.h.hdfs.server.blockmanagement.TestBlockManagerSafeMode.testCheckSafeMode fails intermittently. Contributed by Mingliang Liu.

HDFS-10275. TestDataNodeMetrics failing intermittently due to TotalWriteTime counted incorrectly. Contributed by Lin Yiqun.

HDFS-10275. TestDataNodeMetrics failing intermittently due to TotalWriteTime counted incorrectly. Contributed by Lin Yiqun.

(cherry picked from commit ab903029a9d353677184ff5602966b11ffb408b9)

HDFS-10275. TestDataNodeMetrics failing intermittently due to TotalWriteTime counted incorrectly. Contributed by Lin Yiqun.

(cherry picked from commit ab903029a9d353677184ff5602966b11ffb408b9)

HDFS-10275. TestDataNodeMetrics failing intermittently due to TotalWriteTime counted incorrectly. Contributed by Lin Yiqun.

(cherry picked from commit ab903029a9d353677184ff5602966b11ffb408b9)

HDFS-9412. getBlocks occupies FSLock and takes too long to complete. Contributed by He Tianyi.

(cherry picked from commit 67523ffcf491f4f2db5335899c00a174d0caaa9b)

Conflicts:

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestGetBlocks.java

HDFS-9412. getBlocks occupies FSLock and takes too long to complete. Contributed by He Tianyi.

(cherry picked from commit 67523ffcf491f4f2db5335899c00a174d0caaa9b)

Conflicts:

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestGetBlocks.java

(cherry picked from commit a6d0e9e56a7eef226c8a891cf741ab22d8205e1c)

HDFS-9412. getBlocks occupies FSLock and takes too long to complete. Contributed by He Tianyi.

HDFS-9772. TestBlockReplacement#testThrottler doesn't work as expected. Contributed by Lin Yiqun.

(cherry picked from commit 903428bf946827b4d58c7c577ed0c574a7cff029)

HDFS-9772. TestBlockReplacement#testThrottler doesn't work as expected. Contributed by Lin Yiqun.

(cherry picked from commit 903428bf946827b4d58c7c577ed0c574a7cff029)

HDFS-9772. TestBlockReplacement#testThrottler doesn't work as expected. Contributed by Lin Yiqun.

HDFS-9772. TestBlockReplacement#testThrottler doesn't work as expected. Contributed by Lin Yiqun.

(cherry picked from commit 903428bf946827b4d58c7c577ed0c574a7cff029)

HDFS-10182. Hedged read might overwrite user's buf. Contributed by zhouyingchao.

HDFS-10182. Hedged read might overwrite user's buf. Contributed by zhouyingchao.

(cherry picked from commit d8383c687c95dbb37effa307ab2d41497da1cfc2)

HDFS-10182. Hedged read might overwrite user's buf. Contributed by zhouyingchao.

HDFS-10182. Hedged read might overwrite user's buf. Contributed by zhouyingchao.

(cherry picked from commit d8383c687c95dbb37effa307ab2d41497da1cfc2)

HDFS-10182. Hedged read might overwrite user's buf. Contributed by zhouyingchao.

(cherry picked from commit d8383c687c95dbb37effa307ab2d41497da1cfc2)

Move HDFS-9347 from 2.8.0 to 2.6.5 in CHANGES.txt.

Move HDFS-9347 from 2.8.0 to 2.6.5 in CHANGES.txt.

HADOOP-12715. TestValueQueue#testgetAtMostPolicyALL fails intermittently. Contributed by Xiao Chen.

(cherry picked from commit 6eacdea0e475b4fff91cedce5005a7c11749cf64)

HADOOP-12715. TestValueQueue#testgetAtMostPolicyALL fails intermittently. Contributed by Xiao Chen.

(cherry picked from commit 6eacdea0e475b4fff91cedce5005a7c11749cf64)

HADOOP-12715. TestValueQueue#testgetAtMostPolicyALL fails intermittently. Contributed by Xiao Chen.

(cherry picked from commit 6eacdea0e475b4fff91cedce5005a7c11749cf64)

HADOOP-12715. TestValueQueue#testgetAtMostPolicyALL fails intermittently. Contributed by Xiao Chen.

HADOOP-12715. TestValueQueue#testgetAtMostPolicyALL fails intermittently. Contributed by Xiao Chen.

(cherry picked from commit 6eacdea0e475b4fff91cedce5005a7c11749cf64)

CHANGES.txt: move HDFS-9423 to trunk

HDFS-9423. Fix intermittent failure of TestEditLogTailer. Contributed by Masatake Iwasaki.

(cherry picked from commit 201f14e2714895ad8262507f5b9deb3521770e91)