Skip to content

Fix bug where failoverTimeoutMs was not obeyed #244

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
sergiyvamz merged 1 commit into from
Oct 25, 2022
Merged

Fix bug where failoverTimeoutMs was not obeyed #244

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions ...src/main/java/software/amazon/jdbc/plugin/failover/ClusterAwareWriterFailoverHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,13 @@ public WriterFailoverResult failover(final List<HostSpec> currentTopology)
try {
final long startTimeNano = System.nanoTime();
WriterFailoverResult result = getNextResult(executorService, completionService, this.maxFailoverTimeoutMs);
final long endTimeNano = System.nanoTime();
if (result.isConnected() || result.getException() != null) {
return result;
}

final int durationMs = (int) TimeUnit.NANOSECONDS.toMillis(endTimeNano - startTimeNano);
final int remainingTimeMs = this.maxFailoverTimeoutMs - durationMs;
final long endTimeNano = System.nanoTime();
final long durationMs = TimeUnit.NANOSECONDS.toMillis(endTimeNano - startTimeNano);
final long remainingTimeMs = this.maxFailoverTimeoutMs - durationMs;

if (remainingTimeMs > 0) {
result = getNextResult(executorService, completionService, remainingTimeMs);
Expand Down Expand Up @@ -158,7 +158,7 @@ private void submitTasks(
private WriterFailoverResult getNextResult(
final ExecutorService executorService,
final CompletionService<WriterFailoverResult> completionService,
final int timeoutMs) throws SQLException {
final long timeoutMs) throws SQLException {
try {
final Future<WriterFailoverResult> firstCompleted = completionService.poll(
timeoutMs, TimeUnit.MILLISECONDS);
Expand Down