Skip to content

Setting workload version to snap in rock version #128

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 1 commit into from
Apr 6, 2023
Merged

Setting workload version to snap in rock version #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,8 @@ def _on_postgresql_pebble_ready(self, event: WorkloadEvent) -> None:
# Create a new config layer.
new_layer = self._postgresql_layer()

self.unit.set_workload_version(self._patroni.rock_postgresql_version)

# Defer the initialization of the workload in the replicas
# if the cluster hasn't been bootstrap on the primary yet.
# Otherwise, each unit will create a different cluster and
Expand Down
9 changes: 8 additions & 1 deletion tests/unit/test_charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ def test_on_leader_elected(self, _, __, _render_postgresql_conf_file, ___):
replication_password,
)

@patch("charm.Patroni.rock_postgresql_version", new_callable=PropertyMock)
@patch("charm.Patroni.primary_endpoint_ready", new_callable=PropertyMock)
@patch("charm.PostgresqlOperatorCharm.update_config")
@patch("charm.PostgresqlOperatorCharm.postgresql")
Expand All @@ -120,7 +121,10 @@ def test_on_postgresql_pebble_ready(
_postgresql,
___,
_primary_endpoint_ready,
_rock_postgresql_version,
):
_rock_postgresql_version.return_value = "14.7"

# Mock the primary endpoint ready property values.
_primary_endpoint_ready.side_effect = [False, True]

Expand Down Expand Up @@ -157,10 +161,13 @@ def test_on_postgresql_pebble_ready(
self.assertEqual(container.get_service(self._postgresql_service).is_running(), True)
_push_tls_files_to_workload.assert_called_once()

@patch("charm.Patroni.rock_postgresql_version", new_callable=PropertyMock)
@patch("charm.PostgresqlOperatorCharm._create_pgdata")
def test_on_postgresql_pebble_ready_no_connection(self, _):
def test_on_postgresql_pebble_ready_no_connection(self, _, _rock_postgresql_version):
mock_event = MagicMock()
mock_event.workload = self.harness.model.unit.get_container(self._postgresql_container)
_rock_postgresql_version.return_value = "14.7"

self.charm._on_postgresql_pebble_ready(mock_event)

# Event was deferred and status is still maintenance
Expand Down