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

HDFS-10878. TestDFSClientRetries#testIdempotentAllocateBlockAndClose throws ConcurrentModificationException. Contributed by Rushabh S Shah.

Browse Source 
Modified CHANGES.txt
(cherry picked from commit 382307cbdd94107350fe6fad1acf87d63c9be9d6)
This commit is contained in:
Kihwal Lee 2016-10-04 11:16:43 -05:00
parent c08346ea2d
commit 3eff0873f6
2 changed files with 4 additions and 3 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

@ -35,6 +35,9 @@ Release 2.7.4 - UNRELEASED
HDFS-10889. Remove outdated Fault Injection Framework documentaion.
(Brahma Reddy Battula)
HDFS-10878. TestDFSClientRetries#testIdempotentAllocateBlockAndClose
throws ConcurrentModificationException. (Rushabh S Shaah via kihwal)
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java
View File

@ -102,7 +102,6 @@
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import com.google.common.base.Joiner;
/**
* These tests make sure that DFSClient retries fetching data from DFS
@ -481,8 +480,7 @@ public Boolean answer(InvocationOnMock invocation) throws Throwable {
// complete() may return false a few times before it returns
// true. We want to wait until it returns true, and then
// make it retry one more time after that.
LOG.info("Called complete(: " +
Joiner.on(",").join(invocation.getArguments()) + ")");
LOG.info("Called complete:");
if (!(Boolean)invocation.callRealMethod()) {
LOG.info("Complete call returned false, not faking a retry RPC");
return false;