Repository navigation
fix: converting db-connect-timeout to be used for all datasources - #48055
Merged
Merged
Conversation
closes: keycloak#48053 Signed-off-by: Steve Hawkins <shawkins@redhat.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Extends --db-connect-timeout support to named datasources (e.g. --db-connect-timeout-users) and consolidates the vendor-specific timeout mapping logic in the Quarkus runtime configuration layer.
Changes:
- Adds
db-connect-timeout-<datasource>as a generated datasource option and exposes it in CLI help output. - Refactors connect-timeout mapping in
DatabasePropertyMappersto use a consolidated vendor-aware mapper. - Updates/extends runtime configuration tests and CLI “unknown option” suggestions accordingly.
Reviewed changes
Copilot reviewed 5 out of 21 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/DatabasePropertyMappers.java | Refactors/connects db-connect-timeout mapping and enables it for wildcard (named) datasources. |
| quarkus/config-api/src/main/java/org/keycloak/config/DatabaseOptions.java | Adds DB_CONNECT_TIMEOUT to the list of options that get -<datasource> variants. |
| quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/DatasourcesConfigurationTest.java | Adds assertions for connect-timeout behavior with named datasources. |
| quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ConfigurationTest.java | Updates default timeout tests to align with the new consolidated mapping behavior. |
| quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/cli/PicocliTest.java | Updates “Possible solutions” list to include --db-connect-timeout-<datasource>. |
| quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testUpdateCompatibilityMetadataHelpAll.approved.txt | CLI help snapshot updated to include --db-connect-timeout-<datasource>. |
| quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testUpdateCompatibilityMetadataHelp.approved.txt | CLI help snapshot updated to include --db-connect-timeout-<datasource>. |
| quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testUpdateCompatibilityCheckHelpAll.approved.txt | CLI help snapshot updated to include --db-connect-timeout-<datasource>. |
| quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testUpdateCompatibilityCheckHelp.approved.txt | CLI help snapshot updated to include --db-connect-timeout-<datasource>. |
| quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartOptimizedHelpAll.approved.txt | CLI help snapshot updated to include --db-connect-timeout-<datasource>. |
| quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartOptimizedHelp.approved.txt | CLI help snapshot updated to include --db-connect-timeout-<datasource>. |
| quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelpAll.approved.txt | CLI help snapshot updated to include --db-connect-timeout-<datasource>. |
| quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartHelp.approved.txt | CLI help snapshot updated to include --db-connect-timeout-<datasource>. |
| quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelpAll.approved.txt | CLI help snapshot updated to include --db-connect-timeout-<datasource>. |
| quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testStartDevHelp.approved.txt | CLI help snapshot updated to include --db-connect-timeout-<datasource>. |
| quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelpAll.approved.txt | CLI help snapshot updated to include --db-connect-timeout-<datasource>. |
| quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testImportHelp.approved.txt | CLI help snapshot updated to include --db-connect-timeout-<datasource>. |
| quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelpAll.approved.txt | CLI help snapshot updated to include --db-connect-timeout-<datasource>. |
| quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testExportHelp.approved.txt | CLI help snapshot updated to include --db-connect-timeout-<datasource>. |
| quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBootstrapAdminUser.approved.txt | CLI help snapshot updated to include --db-connect-timeout-<datasource>. |
| quarkus/tests/integration/src/test/resources/org/keycloak/it/cli/dist/approvals/cli/help/HelpCommandDistTest.testBootstrapAdminService.approved.txt | CLI help snapshot updated to include --db-connect-timeout-<datasource>. |
mabartos
requested changes
Apr 15, 2026
pruivo
reviewed
Apr 15, 2026
| return false; | ||
| } | ||
| String dbDriver = getDatasourceOptionValue(DatabaseOptions.DB_DRIVER, datasource).orElse(null); | ||
| if (!Objects.equals(Database.getDriver(db, true).orElse(null), dbDriver) && |
Member
There was a problem hiding this comment.
Should we drop this check? It annoys me that the CLI options only apply to default drivers. cc @ahus1
Contributor
Author
There was a problem hiding this comment.
@pruivo do you want to address that here or in a follow-up?
Member
There was a problem hiding this comment.
@shawkins If you agree with the suggestion, do it here 👍
Contributor
Author
There was a problem hiding this comment.
My understanding of the concern is that an alternative driver, such as datadirect, may not use the same property key/value semantics as the standard one, so it's better to do nothing than something that may be wrong.
Co-authored-by: Martin Bartoš <mabartos@redhat.com> Signed-off-by: Steven Hawkins <shawkins@redhat.com>
mabartos
approved these changes
Apr 15, 2026
pruivo
approved these changes
Apr 16, 2026
Closed
sashyo
pushed a commit
to tide-foundation/keycloak-IGA
that referenced
this pull request
Jul 20, 2026
…ycloak#48055) * fix: converting db-connect-timeout to be used for all datasources closes: keycloak#48053 Signed-off-by: Steve Hawkins <shawkins@redhat.com> * Apply suggestions from code review Co-authored-by: Martin Bartoš <mabartos@redhat.com> Signed-off-by: Steven Hawkins <shawkins@redhat.com> --------- Signed-off-by: Steve Hawkins <shawkins@redhat.com> Signed-off-by: Steven Hawkins <shawkins@redhat.com> Co-authored-by: Martin Bartoš <mabartos@redhat.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
closes: #48053
Also consolidates the connect timeout logic.