Skip to content
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.

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

[MISC] Add experimental max_connections config #472

Merged
merged 3 commits into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -402,3 +402,7 @@ options:
Allowed values are: from 0 to 2000000000.
type: int
default: 150000000
experimental_max_connections:
type: int
description: |
[EXPERIMENTAL] Force set max_connections.
Comment on lines +405 to +408
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should we add some kind of validation here?

Copy link
Member

Choose a reason for hiding this comment

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

should we maybe enforce an upper limit?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's a footgun config.

10 changes: 8 additions & 2 deletions src/charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -1468,7 +1468,7 @@ def _restart(self, event: RunWithLock) -> None:
return

try:
for attempt in Retrying(wait=wait_fixed(3), stop_after_delay=stop_after_delay(300)):
for attempt in Retrying(wait=wait_fixed(3), stop=stop_after_delay(300)):
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Typo™

with attempt:
if not self._can_connect_to_postgresql:
assert False
Expand Down Expand Up @@ -1547,8 +1547,14 @@ def update_config(self, is_creating_backup: bool = False) -> bool:
logger.warning("Early exit update_config: Cannot connect to Postgresql")
return False

# Use config value if set, calculate otherwise
if self.config.experimental_max_connections:
max_connections = self.config.experimental_max_connections
else:
max_connections = max(4 * os.cpu_count(), 100)

Comment on lines +1550 to +1555
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Doing this only here would trigger a restart on deploy with experimental_max_connections. I can also inject it in the config file, by changing the internal library, but I would rather keep it KISS.

self._patroni.bulk_update_parameters_controller_by_patroni({
"max_connections": max(4 * os.cpu_count(), 100),
"max_connections": max_connections,
"max_prepared_transactions": self.config.memory_max_prepared_transactions,
})

Expand Down
1 change: 1 addition & 0 deletions src/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ class CharmConfig(BaseConfigModel):
vacuum_autovacuum_vacuum_cost_delay: Optional[float]
vacuum_autovacuum_vacuum_scale_factor: Optional[float]
vacuum_vacuum_freeze_table_age: Optional[int]
experimental_max_connections: Optional[int]

@classmethod
def keys(cls) -> list[str]:
Expand Down
9 changes: 8 additions & 1 deletion tests/integration/test_charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ async def test_postgresql_parameters_change(ops_test: OpsTest) -> None:
"memory_max_prepared_transactions": "100",
"memory_shared_buffers": "128",
"response_lc_monetary": "en_GB.utf8",
"experimental_max_connections": "200",
})
await ops_test.model.wait_for_idle(apps=[DATABASE_APP_NAME], status="active", idle_period=30)
any_unit_name = ops_test.model.applications[DATABASE_APP_NAME].units[0].name
Expand All @@ -186,7 +187,12 @@ async def test_postgresql_parameters_change(ops_test: OpsTest) -> None:
with psycopg2.connect(
f"dbname='postgres' user='operator' host='{host}' password='{password}' connect_timeout=1"
) as connection, connection.cursor() as cursor:
settings_names = ["max_prepared_transactions", "shared_buffers", "lc_monetary"]
settings_names = [
"max_prepared_transactions",
"shared_buffers",
"lc_monetary",
"max_connections",
]
cursor.execute(
sql.SQL("SELECT name,setting FROM pg_settings WHERE name IN ({});").format(
sql.SQL(", ").join(sql.Placeholder() * len(settings_names))
Expand All @@ -200,6 +206,7 @@ async def test_postgresql_parameters_change(ops_test: OpsTest) -> None:
assert settings["max_prepared_transactions"] == "100"
assert settings["shared_buffers"] == "128"
assert settings["lc_monetary"] == "en_GB.utf8"
assert settings["max_connections"] == "200"
finally:
connection.close()

Expand Down
1 change: 1 addition & 0 deletions tests/unit/test_charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -1135,6 +1135,7 @@ def test_restart(harness):
with (
patch("charm.Patroni.restart_postgresql") as _restart_postgresql,
patch("charm.Patroni.are_all_members_ready") as _are_all_members_ready,
patch("charm.PostgresqlOperatorCharm._can_connect_to_postgresql", return_value=True),
):
_are_all_members_ready.side_effect = [False, True, True]

Expand Down
Loading