Skip to content

HDDS-11291. Fix timeout logic in XceiverServerRatis.submitRequest #7046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
symious wants to merge 4 commits into from
Closed

HDDS-11291. Fix timeout logic in XceiverServerRatis.submitRequest #7046

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2311826
HDDS-11291. Fix timeout logic in XceiverServerRatis.submitRequest
symious Aug 7, 2024
c842791
HDDS-11291. Fix imports
symious Aug 7, 2024
0e74fdd
HDDS-11291. Fix checkstyle
symious Aug 8, 2024
2bf2268
Merge branch 'master' into HDDS-11291
symious Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ...a/org/apache/hadoop/ozone/container/common/transport/server/ratis/XceiverServerRatis.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
Expand Down Expand Up @@ -75,6 +76,7 @@
import io.opentracing.Scope;
import io.opentracing.Span;
import io.opentracing.util.GlobalTracer;
import org.apache.hadoop.util.concurrent.HadoopExecutors;
import org.apache.ratis.conf.Parameters;
import org.apache.ratis.conf.RaftProperties;
import org.apache.ratis.grpc.GrpcConfigKeys;
Expand Down Expand Up @@ -180,6 +182,10 @@ private static long nextCallId() {
private final DatanodeRatisServerConfig ratisServerConfig;
private final HddsDatanodeService datanodeService;

private final ExecutorService timeoutExecutor = HadoopExecutors.newCachedThreadPool(
new ThreadFactoryBuilder().setDaemon(true)
.setNameFormat("XceiverServerRatisTimeoutThread-%d").build());

private XceiverServerRatis(HddsDatanodeService hddsDatanodeService, DatanodeDetails dd,
ContainerDispatcher dispatcher, ContainerController containerController,
StateContext context, ConfigurationSource conf, Parameters parameters)
Expand Down Expand Up @@ -601,6 +607,7 @@ public void stop() {
for (ExecutorService executor : chunkExecutors) {
executor.shutdown();
}
HadoopExecutors.shutdown(timeoutExecutor, LOG, 5, TimeUnit.SECONDS);
isStarted = false;
} catch (IOException e) {
LOG.error("XceiverServerRatis Could not be stopped gracefully.", e);
Expand Down Expand Up @@ -671,8 +678,9 @@ public void submitRequest(ContainerCommandRequestProto request,
RaftClientRequest.writeRequestType());
RaftClientReply reply;
try {
reply = server.submitClientRequestAsync(raftClientRequest)
.get(requestTimeout, TimeUnit.MILLISECONDS);
Future<RaftClientReply> futureReply = timeoutExecutor.submit(() ->
server.submitClientRequestAsync(raftClientRequest).join());
reply = futureReply.get(requestTimeout, TimeUnit.MILLISECONDS);
} catch (ExecutionException | TimeoutException e) {
throw new IOException(e.getMessage(), e);
} catch (InterruptedException e) {
Expand Down