postgresql-charms-single-kernel 16.3.16__tar.gz → 16.3.18__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/PKG-INFO +2 -2
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/pyproject.toml +2 -2
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/pyproject.toml.orig +2 -2
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/charms/abstract_charm.py +36 -1
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/charms/vm_charm.py +52 -6
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/config/exceptions.py +15 -15
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/config/literals.py +5 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/core/config.py +1 -1
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/core/state.py +27 -1
- postgresql_charms_single_kernel-16.3.18/single_kernel_postgresql/events/logical_replication.py +348 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/events/observer.py +53 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/events/postgresql.py +16 -3
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/events/watcher.py +4 -4
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/managers/config.py +18 -12
- postgresql_charms_single_kernel-16.3.18/single_kernel_postgresql/managers/logical_replication.py +1362 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/managers/observer.py +38 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/managers/patroni.py +2 -2
- postgresql_charms_single_kernel-16.3.18/single_kernel_postgresql/managers/raft.py +284 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/managers/restore.py +15 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/managers/tls.py +4 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/scripts/raft_observer.py +3 -1
- postgresql_charms_single_kernel-16.3.18/single_kernel_postgresql/templates/vm/raft-observer.service.j2 +13 -0
- postgresql_charms_single_kernel-16.3.18/single_kernel_postgresql/templates/vm/raft-observer.timer.j2 +10 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/utils/postgresql.py +178 -17
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/workload/vm.py +4 -3
- postgresql_charms_single_kernel-16.3.16/single_kernel_postgresql/charmcraft.yaml +0 -22
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/LICENSE +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/README.md +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/charms/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/charms/k8s_charm.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/compat/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/compat/postgresql.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/compat/pyproject.toml +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/config/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/config/enums.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/config/locales.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/config/pyproject.toml +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/config/statuses.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/core/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/core/peer_relation.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/core/relation_state.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/core/s3.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/events/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/events/async_replication.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/events/backup.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/events/database.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/events/ldap.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/events/tls.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/events/tls_transfer.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/lib/charms/data_platform_libs/v0/data_interfaces.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/lib/charms/data_platform_libs/v0/s3.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/lib/charms/data_platform_libs/v1/data_models.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/lib/charms/glauth_k8s/v0/ldap.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/managers/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/managers/async_replication.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/managers/backup.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/managers/base.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/managers/cluster.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/managers/database.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/managers/k8s.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/managers/refresh.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/scripts/authorisation_rules_observer.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/scripts/cluster_topology_observer.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/scripts/rotate_logs.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/templates/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/templates/k8s/pgbackrest.conf.j2 +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/templates/k8s/pgbackrest.logrotate.j2 +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/templates/patroni.yml.j2 +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/templates/vm/pgbackrest.conf.j2 +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/templates/vm/pgbackrest.logrotate.j2 +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/utils/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/utils/arch.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/utils/backup.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/utils/filesystem.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/utils/s3.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/utils/secret.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/utils/status.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/workload/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/workload/base.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/workload/k8s.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/workload/paths/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/workload/paths/base.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/workload/paths/k8s.py +0 -0
- {postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/single_kernel_postgresql/workload/paths/vm.py +0 -0
{postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/PKG-INFO
RENAMED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.3
|
|
2
2
|
Name: postgresql-charms-single-kernel
|
|
3
|
-
Version: 16.3.
|
|
3
|
+
Version: 16.3.18
|
|
4
4
|
Summary: Shared and reusable code for PostgreSQL-related charms
|
|
5
5
|
Author: Canonical Data Platform
|
|
6
6
|
Author-email: Canonical Data Platform <data-platform@lists.launchpad.net>
|
|
@@ -229,7 +229,7 @@ Requires-Dist: boto3>=1.43.85 ; python_full_version >= '3.12' and extra == 'post
|
|
|
229
229
|
Requires-Dist: botocore>=1.43.85 ; python_full_version >= '3.12' and extra == 'postgresql'
|
|
230
230
|
Requires-Dist: pysyncobj>=0.3.15 ; python_full_version >= '3.12' and extra == 'vm'
|
|
231
231
|
Requires-Dist: psutil>=7.2.2 ; python_full_version >= '3.12' and extra == 'vm'
|
|
232
|
-
Requires-Dist: charmlibs-snap>=1.0.1 ; python_full_version >= '3.12' and extra == 'vm'
|
|
232
|
+
Requires-Dist: charmlibs-snap>=1.0.1,<2 ; python_full_version >= '3.12' and extra == 'vm'
|
|
233
233
|
Requires-Dist: charmlibs-systemd>=1.0.0.post0 ; python_full_version >= '3.12' and extra == 'vm'
|
|
234
234
|
Requires-Python: >=3.8, <4.0
|
|
235
235
|
Provides-Extra: db-driver
|
{postgresql_charms_single_kernel-16.3.16 → postgresql_charms_single_kernel-16.3.18}/pyproject.toml
RENAMED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
[project]
|
|
2
2
|
name = "postgresql-charms-single-kernel"
|
|
3
3
|
description = "Shared and reusable code for PostgreSQL-related charms"
|
|
4
|
-
version = "16.3.
|
|
4
|
+
version = "16.3.18"
|
|
5
5
|
readme = "README.md"
|
|
6
6
|
classifiers = [
|
|
7
7
|
"Development Status :: 3 - Alpha",
|
|
@@ -40,7 +40,7 @@ postgresql = [
|
|
|
40
40
|
vm = [
|
|
41
41
|
"pysyncobj>=0.3.15; python_version >= '3.12'",
|
|
42
42
|
"psutil>=7.2.2; python_version >= '3.12'",
|
|
43
|
-
"charmlibs-snap>=1.0.1; python_version >= '3.12'",
|
|
43
|
+
"charmlibs-snap>=1.0.1,<2; python_version >= '3.12'",
|
|
44
44
|
"charmlibs-systemd>=1.0.0.post0; python_version >= '3.12'",
|
|
45
45
|
]
|
|
46
46
|
k8s = [
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
[project]
|
|
5
5
|
name = "postgresql-charms-single-kernel"
|
|
6
6
|
description = "Shared and reusable code for PostgreSQL-related charms"
|
|
7
|
-
version = "16.3.
|
|
7
|
+
version = "16.3.18"
|
|
8
8
|
readme = "README.md"
|
|
9
9
|
license = {file = "LICENSE"}
|
|
10
10
|
authors = [
|
|
@@ -40,7 +40,7 @@ postgresql = [
|
|
|
40
40
|
vm = [
|
|
41
41
|
"pysyncobj>=0.3.15; python_version >= '3.12'",
|
|
42
42
|
"psutil>=7.2.2; python_version >= '3.12'",
|
|
43
|
-
"charmlibs-snap>=1.0.1; python_version >= '3.12'",
|
|
43
|
+
"charmlibs-snap>=1.0.1,<2; python_version >= '3.12'",
|
|
44
44
|
"charmlibs-systemd>=1.0.0.post0; python_version >= '3.12'"
|
|
45
45
|
]
|
|
46
46
|
k8s = [
|
|
@@ -7,7 +7,7 @@ from typing import TYPE_CHECKING
|
|
|
7
7
|
|
|
8
8
|
from data_platform_helpers.advanced_statuses import StatusHandler
|
|
9
9
|
from ops import StatusBase
|
|
10
|
-
from ops.charm import CharmBase
|
|
10
|
+
from ops.charm import CharmBase, UpdateStatusEvent
|
|
11
11
|
|
|
12
12
|
if TYPE_CHECKING:
|
|
13
13
|
import charm_refresh
|
|
@@ -19,6 +19,7 @@ from single_kernel_postgresql.core.state import CharmState
|
|
|
19
19
|
from single_kernel_postgresql.events.async_replication import PostgreSQLAsyncReplication
|
|
20
20
|
from single_kernel_postgresql.events.database import DatabaseEventsHandler
|
|
21
21
|
from single_kernel_postgresql.events.ldap import LDAP
|
|
22
|
+
from single_kernel_postgresql.events.logical_replication import PostgreSQLLogicalReplication
|
|
22
23
|
from single_kernel_postgresql.events.postgresql import PostgreSQLEventsHandler
|
|
23
24
|
from single_kernel_postgresql.events.tls import TLS
|
|
24
25
|
from single_kernel_postgresql.events.watcher import WatcherEventsHandler
|
|
@@ -32,6 +33,7 @@ from single_kernel_postgresql.managers.async_replication import (
|
|
|
32
33
|
from single_kernel_postgresql.managers.cluster import ClusterManager
|
|
33
34
|
from single_kernel_postgresql.managers.config import ConfigManager
|
|
34
35
|
from single_kernel_postgresql.managers.database import DatabaseManager
|
|
36
|
+
from single_kernel_postgresql.managers.logical_replication import LogicalReplicationManager
|
|
35
37
|
from single_kernel_postgresql.managers.patroni import PatroniManager
|
|
36
38
|
from single_kernel_postgresql.managers.refresh import RefreshManager
|
|
37
39
|
from single_kernel_postgresql.managers.tls import TLSManager
|
|
@@ -117,6 +119,28 @@ class AbstractPostgreSQLCharm(CharmBase, ABC):
|
|
|
117
119
|
self, self.state, self.database_manager, self.patroni_manager, self.tls_manager
|
|
118
120
|
)
|
|
119
121
|
|
|
122
|
+
# Retry pending logical-replication validations on the update-status heartbeat;
|
|
123
|
+
# observed BEFORE StatusHandler so the charm-side checks run before the status
|
|
124
|
+
# recompute.
|
|
125
|
+
self.framework.observe(self.on.update_status, self._on_logical_replication_update_status)
|
|
126
|
+
|
|
127
|
+
# The manager owns the two logical-replication relations' data plane; the events
|
|
128
|
+
# handler owns the observers and event-flow guards. The config manager reads the
|
|
129
|
+
# manager's published slots for the Patroni render and API sync.
|
|
130
|
+
self.logical_replication_manager = LogicalReplicationManager(
|
|
131
|
+
state=self.state,
|
|
132
|
+
workload=self.workload,
|
|
133
|
+
# Per-call bridges: the client and the primary lookup are freshly
|
|
134
|
+
# constructed per access (Patroni primary lookup + app secret).
|
|
135
|
+
postgresql=lambda: self.postgresql,
|
|
136
|
+
primary_endpoint=lambda: self.primary_endpoint,
|
|
137
|
+
update_config=self.update_config,
|
|
138
|
+
set_unit_status=self.set_unit_status,
|
|
139
|
+
)
|
|
140
|
+
self.logical_replication = PostgreSQLLogicalReplication(
|
|
141
|
+
self, self.state, self.logical_replication_manager
|
|
142
|
+
)
|
|
143
|
+
|
|
120
144
|
self.config_manager = ConfigManager(
|
|
121
145
|
state=self.state,
|
|
122
146
|
workload=self.workload,
|
|
@@ -127,6 +151,7 @@ class AbstractPostgreSQLCharm(CharmBase, ABC):
|
|
|
127
151
|
resource_provider=self.get_resource_provider,
|
|
128
152
|
request_restart=self.request_restart,
|
|
129
153
|
restart_services=self.restart_services,
|
|
154
|
+
logical_replication_slots=self.logical_replication.replication_slots,
|
|
130
155
|
)
|
|
131
156
|
|
|
132
157
|
# The refresh manager owns the charm_refresh integration and the priority gate
|
|
@@ -163,6 +188,7 @@ class AbstractPostgreSQLCharm(CharmBase, ABC):
|
|
|
163
188
|
self.tls_manager,
|
|
164
189
|
self.config_manager,
|
|
165
190
|
self.patroni_manager,
|
|
191
|
+
self.logical_replication_manager,
|
|
166
192
|
)
|
|
167
193
|
|
|
168
194
|
# Postgresql Client
|
|
@@ -172,6 +198,15 @@ class AbstractPostgreSQLCharm(CharmBase, ABC):
|
|
|
172
198
|
"""Return a PostgreSQL client."""
|
|
173
199
|
pass
|
|
174
200
|
|
|
201
|
+
def _on_logical_replication_update_status(self, event: UpdateStatusEvent) -> None:
|
|
202
|
+
"""Retry pending logical-replication validations on the update-status heartbeat.
|
|
203
|
+
|
|
204
|
+
Runs BEFORE the StatusHandler's own update-status listener (constructed
|
|
205
|
+
later observes later), so the retry's validation results are part of the
|
|
206
|
+
status recompute that follows.
|
|
207
|
+
"""
|
|
208
|
+
self.logical_replication.retry_validations()
|
|
209
|
+
|
|
175
210
|
# Postgresql Workload
|
|
176
211
|
@property
|
|
177
212
|
@abstractmethod
|
|
@@ -32,13 +32,16 @@ class PostgreSQLVMCharm(AbstractPostgreSQLCharm):
|
|
|
32
32
|
"""Return a PostgreSQL client."""
|
|
33
33
|
return PostgreSQL(
|
|
34
34
|
substrate=Substrates.VM,
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
# Test-charm-only bridge mirroring the real charm's construction: the unit-test
|
|
36
|
+
# hardcoded credentials cannot authenticate against a real cluster; the primary
|
|
37
|
+
# endpoint comes from Patroni and the operator password from the app secret.
|
|
38
|
+
primary_host=self.primary_endpoint,
|
|
39
|
+
# The snap's own runtime tmp dir (not a tempfile): bandit's S108
|
|
40
|
+
# shared-temp-dir rule doesn't model snap runtime dirs.
|
|
41
|
+
current_host="/tmp/snap-private-tmp/snap.charmed-postgresql/tmp/", # noqa: S108
|
|
37
42
|
user=USER,
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
password="test-password", # noqa S106
|
|
41
|
-
database="test-database",
|
|
43
|
+
password=str(self.state.application.user_password or ""),
|
|
44
|
+
database="postgres",
|
|
42
45
|
system_users=SYSTEM_USERS,
|
|
43
46
|
)
|
|
44
47
|
|
|
@@ -103,6 +106,49 @@ class PostgreSQLVMCharm(AbstractPostgreSQLCharm):
|
|
|
103
106
|
if refresh is None:
|
|
104
107
|
refresh = self.refresh_manager.refresh
|
|
105
108
|
return self.config_manager.update_config(self.postgresql, refresh=refresh)
|
|
109
|
+
# NOTE: unreachable while the early return above exists — this is the per-user
|
|
110
|
+
# hba map wiring (the real charm passes the map on every render).
|
|
111
|
+
return self.config_manager.update_config(
|
|
112
|
+
self.postgresql,
|
|
113
|
+
relations_user_databases_map=self.relations_user_databases_map(),
|
|
114
|
+
)
|
|
115
|
+
|
|
116
|
+
def relations_user_databases_map(self) -> dict[str, str]:
|
|
117
|
+
"""Build the user -> accessible-databases map for the pg_hba render.
|
|
118
|
+
|
|
119
|
+
Mirrors the real charm's charm.py relations_user_databases_map: non-system
|
|
120
|
+
users get a per-user hba rule for the databases they can access, and the
|
|
121
|
+
internal users fall back to "all" while the access groups are missing.
|
|
122
|
+
"""
|
|
123
|
+
postgresql = self.postgresql
|
|
124
|
+
user_database_map: dict[str, str] = {}
|
|
125
|
+
skip = {
|
|
126
|
+
"backup",
|
|
127
|
+
"monitoring",
|
|
128
|
+
USER,
|
|
129
|
+
"postgres",
|
|
130
|
+
"replication",
|
|
131
|
+
"rewind",
|
|
132
|
+
"charmed_databases_owner",
|
|
133
|
+
}
|
|
134
|
+
try:
|
|
135
|
+
for user in postgresql.list_users(current_host=True):
|
|
136
|
+
if user in skip:
|
|
137
|
+
continue
|
|
138
|
+
if databases := ",".join(
|
|
139
|
+
sorted(postgresql.list_accessible_databases_for_user(user, current_host=True))
|
|
140
|
+
):
|
|
141
|
+
user_database_map[user] = databases
|
|
142
|
+
if postgresql.list_access_groups(current_host=True) != {
|
|
143
|
+
"identity_access",
|
|
144
|
+
"internal_access",
|
|
145
|
+
"relation_access",
|
|
146
|
+
}:
|
|
147
|
+
user_database_map.update({USER: "all", "replication": "all", "rewind": "all"})
|
|
148
|
+
except Exception as e:
|
|
149
|
+
logger.debug(f"Failed to build the relations user databases map: {e}")
|
|
150
|
+
user_database_map.update({USER: "all", "replication": "all", "rewind": "all"})
|
|
151
|
+
return user_database_map
|
|
106
152
|
|
|
107
153
|
def set_app_status(self, status: StatusBase) -> None:
|
|
108
154
|
"""Set the application status; the production charm gates this on its own state."""
|
|
@@ -11,7 +11,7 @@ class PostgreSQLFileOperationError(PostgreSQLBaseError):
|
|
|
11
11
|
"""Exception thrown when file operations related to PostgreSQL fail."""
|
|
12
12
|
|
|
13
13
|
|
|
14
|
-
class StorageUnavailableError(
|
|
14
|
+
class StorageUnavailableError(PostgreSQLBaseError):
|
|
15
15
|
"""Cannot find storage mountpoint."""
|
|
16
16
|
|
|
17
17
|
|
|
@@ -19,51 +19,51 @@ class SettingSystemPasswordError(PostgreSQLBaseError):
|
|
|
19
19
|
"""Exception thrown when setting the system password fails."""
|
|
20
20
|
|
|
21
21
|
|
|
22
|
-
class PostgreSQLCannotConnectError(
|
|
22
|
+
class PostgreSQLCannotConnectError(PostgreSQLBaseError):
|
|
23
23
|
"""Cannot run smoke check on connected Database."""
|
|
24
24
|
|
|
25
25
|
|
|
26
|
-
class TlsError(
|
|
26
|
+
class TlsError(PostgreSQLBaseError):
|
|
27
27
|
"""TLS implementation internal exception."""
|
|
28
28
|
|
|
29
29
|
|
|
30
|
-
class RaftPostgresqlNotUpError(
|
|
30
|
+
class RaftPostgresqlNotUpError(PostgreSQLBaseError):
|
|
31
31
|
"""Postgresql not yet started."""
|
|
32
32
|
|
|
33
33
|
|
|
34
|
-
class RaftPostgresqlStillUpError(
|
|
34
|
+
class RaftPostgresqlStillUpError(PostgreSQLBaseError):
|
|
35
35
|
"""Postgresql not yet down."""
|
|
36
36
|
|
|
37
37
|
|
|
38
|
-
class RaftNotPromotedError(
|
|
38
|
+
class RaftNotPromotedError(PostgreSQLBaseError):
|
|
39
39
|
"""Leader not yet set when reinitialising raft."""
|
|
40
40
|
|
|
41
41
|
|
|
42
|
-
class ClusterNotPromotedError(
|
|
42
|
+
class ClusterNotPromotedError(PostgreSQLBaseError):
|
|
43
43
|
"""Raised when a cluster is not promoted."""
|
|
44
44
|
|
|
45
45
|
|
|
46
|
-
class NotReadyError(
|
|
46
|
+
class NotReadyError(PostgreSQLBaseError):
|
|
47
47
|
"""Raised when not all cluster members healthy or finished initial sync."""
|
|
48
48
|
|
|
49
49
|
|
|
50
|
-
class EndpointNotReadyError(
|
|
50
|
+
class EndpointNotReadyError(PostgreSQLBaseError):
|
|
51
51
|
"""Raised when an endpoint is not ready."""
|
|
52
52
|
|
|
53
53
|
|
|
54
|
-
class StandbyClusterAlreadyPromotedError(
|
|
54
|
+
class StandbyClusterAlreadyPromotedError(PostgreSQLBaseError):
|
|
55
55
|
"""Raised when a standby cluster is already promoted."""
|
|
56
56
|
|
|
57
57
|
|
|
58
|
-
class RemoveRaftMemberFailedError(
|
|
58
|
+
class RemoveRaftMemberFailedError(PostgreSQLBaseError):
|
|
59
59
|
"""Raised when a remove raft member failed for some reason."""
|
|
60
60
|
|
|
61
61
|
|
|
62
|
-
class AddRaftMemberFailedError(
|
|
62
|
+
class AddRaftMemberFailedError(PostgreSQLBaseError):
|
|
63
63
|
"""Raised when adding raft member failed for some reason."""
|
|
64
64
|
|
|
65
65
|
|
|
66
|
-
class SwitchoverFailedError(
|
|
66
|
+
class SwitchoverFailedError(PostgreSQLBaseError):
|
|
67
67
|
"""Raised when a switchover failed for some reason."""
|
|
68
68
|
|
|
69
69
|
|
|
@@ -71,11 +71,11 @@ class SwitchoverNotSyncError(SwitchoverFailedError):
|
|
|
71
71
|
"""Raised when a switchover failed because node is not sync."""
|
|
72
72
|
|
|
73
73
|
|
|
74
|
-
class UpdateSyncNodeCountError(
|
|
74
|
+
class UpdateSyncNodeCountError(PostgreSQLBaseError):
|
|
75
75
|
"""Raised when updating synchronous_node_count failed for some reason."""
|
|
76
76
|
|
|
77
77
|
|
|
78
|
-
class DeployedWithoutTrustError(
|
|
78
|
+
class DeployedWithoutTrustError(PostgreSQLBaseError):
|
|
79
79
|
"""Raised when the K8s API denies access because the app wasn't deployed with --trust."""
|
|
80
80
|
|
|
81
81
|
|
|
@@ -153,6 +153,11 @@ ALL_CLIENT_RELATIONS = [DATABASE]
|
|
|
153
153
|
REPLICATION_CONSUMER_RELATION = "replication"
|
|
154
154
|
REPLICATION_OFFER_RELATION = "replication-offer"
|
|
155
155
|
|
|
156
|
+
# Logical replication relations
|
|
157
|
+
LOGICAL_REPLICATION_OFFER_RELATION = "logical-replication-offer"
|
|
158
|
+
LOGICAL_REPLICATION_RELATION = "logical-replication"
|
|
159
|
+
LOGICAL_REPLICATION_VALIDATION_ERROR_STATUS = "Logical replication setup is invalid. Check logs"
|
|
160
|
+
SECRET_LABEL = "logical-replication-relation" # noqa: S105
|
|
156
161
|
# Async replication peer-data key holding the id of the labelless shared cluster-credentials
|
|
157
162
|
# secret the owner persists: referenced by id everywhere, never by label (DPE-10203).
|
|
158
163
|
ASYNC_SHARED_SECRET_ID_KEY = "async-replication-secret-id" # noqa: S105 — a databag key name, not a credential
|
|
@@ -72,7 +72,7 @@ class CharmConfig(BaseConfigModel):
|
|
|
72
72
|
logging_log_lock_waits: bool | None = Field(default=None)
|
|
73
73
|
logging_log_min_duration_statement: int | None = Field(ge=-1, le=2147483647, default=None)
|
|
74
74
|
logging_track_functions: Literal["none", "pl", "all"] | None = Field(default=None)
|
|
75
|
-
|
|
75
|
+
logical_replication_subscription_request: str | None = Field(default=None)
|
|
76
76
|
memory_maintenance_work_mem: int | None = Field(ge=1024, le=2147483647, default=None)
|
|
77
77
|
memory_max_prepared_transactions: int | None = Field(ge=0, le=262143, default=None)
|
|
78
78
|
memory_shared_buffers: int | None = Field(ge=16, le=1073741823, default=None)
|
|
@@ -556,7 +556,12 @@ class CharmState(Object):
|
|
|
556
556
|
# Try to update synchronous_node_count.
|
|
557
557
|
return {
|
|
558
558
|
"synchronous_node_count": self.synchronous_node_count,
|
|
559
|
-
|
|
559
|
+
# Strict mode pins synchronous_standby_names even when no standby can ever
|
|
560
|
+
# ACK: before cluster_initialised that would block bootstrap forever on a
|
|
561
|
+
# nonexistent synchronous standby, so enable strict only once members have
|
|
562
|
+
# actually joined the cluster.
|
|
563
|
+
"synchronous_mode_strict": self.application.is_cluster_initialised
|
|
564
|
+
and len(self.application.members_ips) > 1
|
|
560
565
|
and self.config.synchronous_mode_strict
|
|
561
566
|
and self.synchronous_node_count > 0,
|
|
562
567
|
}
|
|
@@ -574,3 +579,24 @@ class CharmState(Object):
|
|
|
574
579
|
def replicas_endpoint(self) -> str:
|
|
575
580
|
"""Returns the endpoint of the replicas instances' service."""
|
|
576
581
|
return self._build_service_name("replicas")
|
|
582
|
+
|
|
583
|
+
def has_raft_keys(self) -> bool:
|
|
584
|
+
"""Checks for the presence of raft recovery keys in peer data."""
|
|
585
|
+
for key in self.application.data:
|
|
586
|
+
if key.startswith("raft_"):
|
|
587
|
+
return True
|
|
588
|
+
|
|
589
|
+
return any(key.startswith("raft_") for key in self.peer.data)
|
|
590
|
+
|
|
591
|
+
@property
|
|
592
|
+
def units_ips(self) -> set[str]:
|
|
593
|
+
"""Fetch current list of peers IPs."""
|
|
594
|
+
addresses = set()
|
|
595
|
+
|
|
596
|
+
if self.unit_ip:
|
|
597
|
+
addresses.add(self.unit_ip)
|
|
598
|
+
if self.peer_relation:
|
|
599
|
+
for unit in self.peer_relation.units:
|
|
600
|
+
if ip := self.peer_relation.data[unit].get(f"{PEER_RELATION}-address"):
|
|
601
|
+
addresses.add(ip)
|
|
602
|
+
return addresses
|