Skip to content

Async driver request timeout #387

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.

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

Merged
merged 5 commits into from
Apr 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.arangodb.async.internal.utils;

import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

public class CompletableFutureUtils {

private CompletableFutureUtils() {
}

private static final ScheduledExecutorService timeoutScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
Thread t = Executors.defaultThreadFactory().newThread(r);
t.setDaemon(true);
return t;
}
);

public static <T> CompletableFuture<T> orTimeout(CompletableFuture<T> completableFuture, long timeout, TimeUnit unit) {
ScheduledFuture<?> timeoutTask = timeoutScheduler.schedule(() ->
completableFuture.completeExceptionally(new TimeoutException()), timeout, unit);
completableFuture.whenComplete((v, e) -> timeoutTask.cancel(false));
return completableFuture;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

package com.arangodb.async.internal.velocystream;

import com.arangodb.async.internal.utils.CompletableFutureUtils;
import com.arangodb.internal.net.HostDescription;
import com.arangodb.internal.velocystream.internal.Chunk;
import com.arangodb.internal.velocystream.internal.Message;
Expand All @@ -30,6 +31,7 @@
import java.util.Collection;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;

/**
* @author Mark Vollmary
Expand All @@ -54,7 +56,11 @@ public synchronized CompletableFuture<Message> write(final Message message, fina
});
messageStore.storeMessage(message.getId(), task);
super.writeIntern(message, chunks);
return future;
if (timeout == null || timeout == 0L) {
return future;
} else {
return CompletableFutureUtils.orTimeout(future, timeout, TimeUnit.MILLISECONDS);
}
}

@Override
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/arangodb.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ arangodb.hosts=172.28.3.1:8529
arangodb.connections.max=1
arangodb.acquireHostList=true
arangodb.password=test
arangodb.timeout=30000