smengcl commented on code in PR #11890:
URL: https://github.com/apache/ozone/pull/11890#discussion_r4463459695
##########
hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java:
##########
@@ -322,9 +325,15 @@ public CompletableFuture<XceiverClientReply>
watchForCommit(long index) {
final Collection<CommitInfoProto> commitInfoProtoList =
((NotReplicatedException) nre).getCommitInfos();
replyFuture.complete(handleFailedAllCommit(index,
commitInfoProtoList));
} else {
- getClient().async().watch(index, ReplicationLevel.MAJORITY_COMMITTED)
- .thenApply(reply -> handleFailedAllCommit(index,
reply.getCommitInfos()))
- .whenComplete(JavaUtils.asBiConsumer(replyFuture));
+ try {
+ getClient().async().watch(index,
ReplicationLevel.MAJORITY_COMMITTED)
+ .thenApply(reply -> handleFailedAllCommit(index,
reply.getCommitInfos()))
+ .whenComplete(JavaUtils.asBiConsumer(replyFuture));
+ } catch (RuntimeException fallbackFailure) {
Review Comment:
nit: this guards only the fallback watch call. Anything else that throws
inside the `exceptionally` lambda (e.g. `handleFailedAllCommit` in the
`NotReplicatedException` branch) would still be swallowed and leave
`replyFuture` incomplete. Would it be worth adding a catch-all after the
handler, so `watchForCommit` always completes the future it returns? Something
like:
```diff
} else {
replyFuture.completeExceptionally(e);
}
return null;
- });
+ }).exceptionally(t -> {
+ // anything thrown by the handler above would otherwise leave
replyFuture incomplete
+ replyFuture.completeExceptionally(t);
+ return null;
+ });
return replyFuture;
```
The try/catch here can stay as is, so the original watch failure is still
the one reported for the fallback case.
##########
hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientRatis.java:
##########
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hdds.scm;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.CALLS_REAL_METHODS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockStatic;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.hdds.ratis.RatisHelper;
+import org.apache.hadoop.hdds.scm.pipeline.MockPipeline;
+import org.apache.hadoop.hdds.scm.pipeline.Pipeline;
+import org.apache.ratis.client.RaftClient;
+import org.apache.ratis.client.api.AsyncApi;
+import org.apache.ratis.proto.RaftProtos.ReplicationLevel;
+import org.apache.ratis.protocol.RaftClientReply;
+import org.apache.ratis.protocol.exceptions.AlreadyClosedException;
+import org.apache.ratis.rpc.RpcType;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.MockedStatic;
+
+/**
+ * Tests for {@link XceiverClientRatis#watchForCommit}: the returned future
must complete even when the client is
+ * closed while the watch is pending (HDDS-17648).
+ */
+class TestXceiverClientRatis {
+
+ private static final long INDEX = 10;
+
+ private final RaftClient raftClient = mock(RaftClient.class);
+ private final AsyncApi async = mock(AsyncApi.class);
+ private final CompletableFuture<RaftClientReply> allCommitted = new
CompletableFuture<>();
+ private XceiverClientRatis client;
+
+ @BeforeEach
+ void setUp() throws Exception {
+ when(raftClient.async()).thenReturn(async);
+ when(async.watch(INDEX,
ReplicationLevel.ALL_COMMITTED)).thenReturn(allCommitted);
+ Pipeline pipeline = MockPipeline.createRatisPipeline();
+ client = XceiverClientRatis.newXceiverClientRatis(pipeline, new
OzoneConfiguration());
+ try (MockedStatic<RatisHelper> ratisHelper = mockStatic(RatisHelper.class,
CALLS_REAL_METHODS)) {
+ ratisHelper.when(() -> RatisHelper.newRaftClient(any(RpcType.class),
any(Pipeline.class), any(), any(), any()))
+ .thenReturn(raftClient);
+ client.connect();
+ }
+ }
+
+ /** The client is closed (for example evicted and released) while the
ALL_COMMITTED watch is pending. */
+ @Test
+ void watchCompletesWhenClientIsClosedDuringWatch() {
+ CompletableFuture<XceiverClientReply> reply = client.watchForCommit(INDEX);
+ client.close();
+ allCommitted.completeExceptionally(new IOException("watch timed out"));
+
+ ExecutionException e = assertThrows(ExecutionException.class, () ->
reply.get(10, TimeUnit.SECONDS));
+ assertThat(e.getCause()).hasMessageContaining("watch timed out");
+ }
+
+ @Test
+ void noMajorityWatchWhenClientIsClosed() {
+ CompletableFuture<XceiverClientReply> reply = client.watchForCommit(INDEX);
+ allCommitted.completeExceptionally(new AlreadyClosedException("client is
closed"));
+
+ assertThrows(ExecutionException.class, () -> reply.get(10,
TimeUnit.SECONDS));
Review Comment:
nit: could we also check the cause here? That would confirm the original
failure is the one reported when the fallback is skipped.
```suggestion
ExecutionException e = assertThrows(ExecutionException.class, () ->
reply.get(10, TimeUnit.SECONDS));
assertThat(e.getCause()).isInstanceOf(AlreadyClosedException.class);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]