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.

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

Merged
merged 5 commits into from
Apr 28, 2021
Merged

Async driver request timeout #387

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31e3098
async driver request timeout
rashtao Apr 27, 2021
04f9e15
CompletableFutureUtils refactoring
rashtao Apr 28, 2021
8464228
Merge branch 'master' into bugfix/async_timeout_request
rashtao Apr 28, 2021
435f158
test fixes
rashtao Apr 28, 2021
923fec9
test fixes
rashtao Apr 28, 2021
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
Prev Previous commit
Next Next commit
test fixes
  • Loading branch information
@rashtao
rashtao committed Apr 28, 2021
commit 435f1587d3a8df7a32a12be05bc90b26ecca1320
6 changes: 5 additions & 1 deletion src/main/java/com/arangodb/async/internal/velocystream/VstConnectionAsync.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ public synchronized CompletableFuture<Message> write(final Message message, fina
});
messageStore.storeMessage(message.getId(), task);
super.writeIntern(message, chunks);
return CompletableFutureUtils.orTimeout(future, timeout, TimeUnit.MILLISECONDS);
if (timeout == null || timeout == 0L) {
return future;
} else {
return CompletableFutureUtils.orTimeout(future, timeout, TimeUnit.MILLISECONDS);
}
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/arangodb.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ arangodb.hosts=172.28.3.1:8529
arangodb.connections.max=1
arangodb.acquireHostList=true
arangodb.password=test
arangodb.timeout=5000
arangodb.timeout=10000