Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-9740. Use a reasonable limit in DFSTestUtil.waitForMetric() (Contributed by Chang Li) 

(cherry picked from commit eb2fb943fd)

 Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
This commit is contained in:
Vinayakumar B 2016-02-03 11:14:29 +05:30
parent e8a9a69a27
commit 6941e2ccbf
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -1858,6 +1858,9 @@ Release 2.7.3 - UNRELEASED
HDFS-9406. FSImage may get corrupted after deleting snapshot. HDFS-9406. FSImage may get corrupted after deleting snapshot.
(Contributed by Jing Zhao, Stanislav Antic, Vinayakumar B, Yongjun Zhang) (Contributed by Jing Zhao, Stanislav Antic, Vinayakumar B, Yongjun Zhang)
HDFS-9740. Use a reasonable limit in DFSTestUtil.waitForMetric()
(Chang Li via vinayakumarb)
Release 2.7.2 - 2016-01-25 Release 2.7.2 - 2016-01-25
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
View File

@ -1888,7 +1888,7 @@ public class DFSTestUtil {
throw new UnhandledException("Test failed due to unexpected exception", e); throw new UnhandledException("Test failed due to unexpected exception", e);
} }
} }
}, 1000, Integer.MAX_VALUE); }, 1000, 60000);
} }
public static StorageReceivedDeletedBlocks[] makeReportForReceivedBlock( public static StorageReceivedDeletedBlocks[] makeReportForReceivedBlock(