Skip to content

user pool_size takes precedence over database pool_size. #781

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
levkk merged 3 commits into from
Feb 19, 2026
Merged

user pool_size takes precedence over database pool_size. #781

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
546fab2
user pool_size takes precedence over database pool_size.
mijoharas Feb 19, 2026
4fd5dde
Switch user and database config in remaining places.
mijoharas Feb 19, 2026
1abcfaf
Test that all user properties override db properties.
mijoharas Feb 19, 2026
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
73 changes: 53 additions & 20 deletions pgdog/src/backend/pool/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,46 +99,42 @@ impl Config {
pub fn new(general: &General, database: &Database, user: &User, is_only_replica: bool) -> Self {
Self {
inner: pgdog_stats::Config {
min: database
min: user
.min_pool_size
.unwrap_or(user.min_pool_size.unwrap_or(general.min_pool_size)),
max: database
.unwrap_or(database.min_pool_size.unwrap_or(general.min_pool_size)),
max: user
.pool_size
.unwrap_or(user.pool_size.unwrap_or(general.default_pool_size)),
.unwrap_or(database.pool_size.unwrap_or(general.default_pool_size)),
max_age: Duration::from_millis(
database
.server_lifetime
.unwrap_or(user.server_lifetime.unwrap_or(general.server_lifetime)),
user.server_lifetime
.unwrap_or(database.server_lifetime.unwrap_or(general.server_lifetime)),
),
healthcheck_interval: Duration::from_millis(general.healthcheck_interval),
idle_healthcheck_interval: Duration::from_millis(general.idle_healthcheck_interval),
idle_healthcheck_delay: Duration::from_millis(general.idle_healthcheck_delay),
healthcheck_timeout: Duration::from_millis(general.healthcheck_timeout),
ban_timeout: Duration::from_millis(general.ban_timeout),
rollback_timeout: Duration::from_millis(general.rollback_timeout),
statement_timeout: if let Some(statement_timeout) = database.statement_timeout {
Some(statement_timeout)
} else {
user.statement_timeout
}
.map(Duration::from_millis),
statement_timeout: user
.statement_timeout
.or(database.statement_timeout)
.map(Duration::from_millis),
replication_mode: user.replication_mode,
pooler_mode: database
pooler_mode: user
.pooler_mode
.unwrap_or(user.pooler_mode.unwrap_or(general.pooler_mode)),
.unwrap_or(database.pooler_mode.unwrap_or(general.pooler_mode)),
connect_timeout: Duration::from_millis(general.connect_timeout),
connect_attempts: general.connect_attempts,
connect_attempt_delay: general.connect_attempt_delay(),
query_timeout: Duration::from_millis(general.query_timeout),
checkout_timeout: Duration::from_millis(general.checkout_timeout),
idle_timeout: Duration::from_millis(
database
.idle_timeout
.unwrap_or(user.idle_timeout.unwrap_or(general.idle_timeout)),
user.idle_timeout
.unwrap_or(database.idle_timeout.unwrap_or(general.idle_timeout)),
),
read_only: database
read_only: user
.read_only
.unwrap_or(user.read_only.unwrap_or_default()),
.unwrap_or(database.read_only.unwrap_or_default()),
prepared_statements_limit: general.prepared_statements_limit,
stats_period: Duration::from_millis(general.stats_period),
bannable: !is_only_replica,
Expand All @@ -164,6 +160,7 @@ impl Default for Config {
#[cfg(test)]
mod test {
use super::*;
use pgdog_config::PoolerMode;

fn create_database(role: Role) -> Database {
Database {
Expand All @@ -186,6 +183,42 @@ mod test {
assert!(config.role_detection);
}

#[test]
fn test_user_takes_precedence_over_database() {
Copy link
Collaborator

@levkk levkk Feb 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a terrible idea to do the other configs too. Only the paranoid survive, something something

Copy link
Contributor Author

@mijoharas mijoharas Feb 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good call, let me do that.

Copy link
Contributor Author

@mijoharas mijoharas Feb 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok had a meeting but just got back to it. Have pushed the extra test commit.

let general = General::default();
let user = User {
pool_size: Some(5),
min_pool_size: Some(5),
server_lifetime: Some(5),
statement_timeout: Some(5),
pooler_mode: Some(PoolerMode::Session),
idle_timeout: Some(5),
read_only: Some(true),
..Default::default()
};

let database = Database {
pool_size: Some(10),
min_pool_size: Some(10),
server_lifetime: Some(10),
statement_timeout: Some(10),
pooler_mode: Some(PoolerMode::Transaction),
idle_timeout: Some(10),
read_only: Some(false),
..Default::default()
};

let config = Config::new(&general, &database, &user, false);

assert_eq!(5, config.max);
assert_eq!(5, config.min);
assert_eq!(Duration::from_millis(5), config.max_age);
assert_eq!(Some(Duration::from_millis(5)), config.statement_timeout);
assert_eq!(PoolerMode::Session, config.pooler_mode);
assert_eq!(Duration::from_millis(5), config.idle_timeout);
assert_eq!(true, config.read_only);
}

#[test]
fn test_role_primary_disables_role_detection() {
let general = General::default();
Expand Down
Loading