Skip to content

fix: isValidTimeout potentially rounded down to 0 #1546

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 2 commits into from
Oct 14, 2025
Merged

fix: isValidTimeout potentially rounded down to 0 #1546

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b6b3e2
fix: isValidTimeout potentially rounded down to 0
karenc-bq Oct 1, 2025
b92d620
chore: address comments
karenc-bq Oct 1, 2025
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
4 changes: 3 additions & 1 deletion wrapper/src/main/java/software/amazon/jdbc/plugin/efm2/HostMonitorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public class HostMonitorImpl extends AbstractMonitor implements HostMonitor {
private static final long THREAD_SLEEP_NANO = TimeUnit.MILLISECONDS.toNanos(100);
private static final long TERMINATION_TIMEOUT_SEC = 30;
private static final String MONITORING_PROPERTY_PREFIX = "monitoring-";
private static final int MIN_VALIDITY_CHECK_TIMEOUT_SEC = 1;

protected static final Executor ABORT_EXECUTOR =
ExecutorFactory.newSingleThreadExecutor("abort");
Expand Down Expand Up @@ -323,7 +324,8 @@ boolean checkConnectionStatus() {
// Some drivers, like MySQL Connector/J, execute isValid() in a double of specified timeout time.
final int validTimeout = (int) TimeUnit.NANOSECONDS.toSeconds(
this.failureDetectionIntervalNano - THREAD_SLEEP_NANO) / 2;
return this.monitoringConn.isValid(validTimeout);
// validTimeout could get rounded down to 0.
return this.monitoringConn.isValid(Math.max(MIN_VALIDITY_CHECK_TIMEOUT_SEC, validTimeout));
} catch (final SQLException sqlEx) {
return false;
} finally {
Expand Down
Loading