Skip to content
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
8 changes: 7 additions & 1 deletion src/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -1107,7 +1107,13 @@ def bulk_update_parameters_controller_by_patroni(self, parameters: dict[str, Any
r = requests.patch(
f"{self._patroni_url}/config",
verify=self.verify,
json={"postgresql": {"parameters": parameters}},
json={
"postgresql": {
"remove_data_directory_on_rewind_failure": False,
"remove_data_directory_on_diverged_timelines": False,
"parameters": parameters,
}
},
auth=self._patroni_auth,
timeout=PATRONI_TIMEOUT,
)
Expand Down
4 changes: 2 additions & 2 deletions templates/patroni.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ bootstrap:
synchronous_node_count: {{ synchronous_node_count }}
postgresql:
use_pg_rewind: true
remove_data_directory_on_rewind_failure: true
remove_data_directory_on_diverged_timelines: true
remove_data_directory_on_rewind_failure: false
remove_data_directory_on_diverged_timelines: false
parameters:
synchronous_standby_names: "*"
{%- if enable_pgbackrest_archiving %}
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ async def test_settings_are_correct(ops_test: OpsTest, unit_id: int):

# Validate each configuration related to Patroni
assert settings["postgresql"]["use_pg_rewind"] is True
assert settings["postgresql"]["remove_data_directory_on_rewind_failure"] is True
assert settings["postgresql"]["remove_data_directory_on_diverged_timelines"] is True
assert settings["postgresql"]["remove_data_directory_on_rewind_failure"] is False
assert settings["postgresql"]["remove_data_directory_on_diverged_timelines"] is False
assert settings["loop_wait"] == 10
assert settings["retry_timeout"] == 10
assert settings["maximum_lag_on_failover"] == 1048576
Expand Down