You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by sa...@apache.org on 2020/07/22 13:00:46 UTC
[hadoop-ozone] 36/39: HDDS-3986. Frequent failure in
TestCommitWatcher#testReleaseBuffersOnException (#1220)
This is an automated email from the ASF dual-hosted git repository.
sammichen pushed a commit to branch ozone-0.6.0
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit d9775d46ada415cd7ff81302b0d84972fd88041c
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Tue Jul 21 20:22:37 2020 +0530
HDDS-3986. Frequent failure in TestCommitWatcher#testReleaseBuffersOnException (#1220)
(cherry picked from commit 402a427f14f5b3d68956e93706de97d1ffae5b94)
---
.../hadoop/ozone/client/rpc/TestCommitWatcher.java | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCommitWatcher.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCommitWatcher.java
index c3eca6a..007fbdc 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCommitWatcher.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestCommitWatcher.java
@@ -46,6 +46,7 @@ import org.apache.hadoop.ozone.container.ContainerTestHelper;
import org.apache.ratis.protocol.AlreadyClosedException;
import org.apache.ratis.protocol.NotReplicatedException;
import org.apache.ratis.protocol.RaftRetryFailureException;
+import org.apache.ratis.protocol.TimeoutIOException;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -121,8 +122,8 @@ public class TestCommitWatcher {
RatisClientConfig ratisClientConfig =
conf.getObject(RatisClientConfig.class);
- ratisClientConfig.setWriteRequestTimeoutInMs(TimeUnit.SECONDS.toMillis(30));
- ratisClientConfig.setWatchRequestTimeoutInMs(TimeUnit.SECONDS.toMillis(30));
+ ratisClientConfig.setWriteRequestTimeoutInMs(TimeUnit.SECONDS.toMillis(10));
+ ratisClientConfig.setWatchRequestTimeoutInMs(TimeUnit.SECONDS.toMillis(10));
conf.setFromObject(ratisClientConfig);
conf.set(OzoneConfigKeys.OZONE_CLIENT_CHECKSUM_TYPE, "NONE");
@@ -312,14 +313,17 @@ public class TestCommitWatcher {
watcher.watchForCommit(replies.get(1).getLogIndex() + 100);
Assert.fail("Expected exception not thrown");
} catch(IOException ioe) {
- // with retry count set to lower limit and a lower watch request
+ // with retry count set to noRetry and a lower watch request
// timeout, watch request will eventually
- // fail with RaftRetryFailure exception from ratis client or the client
+ // fail with TimeoutIOException from ratis client or the client
// can itself get AlreadyClosedException from the Ratis Server
+ // and the write may fail with RaftRetryFailureException
Throwable t = HddsClientUtils.checkForException(ioe);
- Assert.assertTrue(t instanceof RaftRetryFailureException ||
- t instanceof AlreadyClosedException ||
- t instanceof NotReplicatedException);
+ Assert.assertTrue("Unexpected exception: " + t.getClass(),
+ t instanceof RaftRetryFailureException ||
+ t instanceof TimeoutIOException ||
+ t instanceof AlreadyClosedException ||
+ t instanceof NotReplicatedException);
}
if (ratisClient.getReplicatedMinCommitIndex() < replies.get(1)
.getLogIndex()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org