postgresql-charms-single-kernel 16.3.12__tar.gz → 16.3.14__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.12 → postgresql_charms_single_kernel-16.3.14}/PKG-INFO +2 -1
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/pyproject.toml +2 -1
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/pyproject.toml.orig +2 -1
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/charms/abstract_charm.py +83 -5
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/charms/k8s_charm.py +45 -8
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/charms/vm_charm.py +45 -7
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/compat/postgresql.py +4 -2
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/config/literals.py +12 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/core/config.py +1 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/events/postgresql.py +13 -1
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/managers/config.py +4 -2
- postgresql_charms_single_kernel-16.3.14/single_kernel_postgresql/managers/refresh.py +692 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/templates/patroni.yml.j2 +8 -2
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/workload/vm.py +57 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/LICENSE +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/README.md +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/charmcraft.yaml +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/charms/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/compat/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/compat/pyproject.toml +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/config/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/config/enums.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/config/exceptions.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/config/locales.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/config/pyproject.toml +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/config/statuses.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/core/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/core/peer_relation.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/core/relation_state.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/core/s3.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/core/state.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/events/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/events/async_replication.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/events/backup.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/events/database.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/events/ldap.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/events/tls.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/events/tls_transfer.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/events/watcher.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/lib/charms/data_platform_libs/v0/data_interfaces.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/lib/charms/data_platform_libs/v0/s3.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/lib/charms/data_platform_libs/v1/data_models.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/lib/charms/glauth_k8s/v0/ldap.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/managers/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/managers/async_replication.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/managers/backup.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/managers/base.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/managers/cluster.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/managers/database.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/managers/k8s.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/managers/patroni.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/managers/restore.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/managers/tls.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/scripts/authorisation_rules_observer.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/scripts/cluster_topology_observer.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/scripts/raft_observer.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/scripts/rotate_logs.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/templates/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/templates/k8s/pgbackrest.conf.j2 +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/templates/k8s/pgbackrest.logrotate.j2 +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/templates/vm/pgbackrest.conf.j2 +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/templates/vm/pgbackrest.logrotate.j2 +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/utils/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/utils/arch.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/utils/backup.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/utils/filesystem.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/utils/postgresql.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/utils/s3.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/utils/secret.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/utils/status.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/workload/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/workload/base.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/workload/k8s.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/workload/paths/__init__.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/workload/paths/base.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/workload/paths/k8s.py +0 -0
- {postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/single_kernel_postgresql/workload/paths/vm.py +0 -0
{postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/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.14
|
|
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>
|
|
@@ -209,6 +209,7 @@ License:
|
|
|
209
209
|
Classifier: Development Status :: 3 - Alpha
|
|
210
210
|
Classifier: Intended Audience :: Developers
|
|
211
211
|
Classifier: Operating System :: POSIX :: Linux
|
|
212
|
+
Requires-Dist: cryptography>=42.0.0
|
|
212
213
|
Requires-Dist: ops>=2.0.0
|
|
213
214
|
Requires-Dist: tenacity>=9.0.0
|
|
214
215
|
Requires-Dist: psycopg2>=2.9.10 ; extra == 'db-driver'
|
{postgresql_charms_single_kernel-16.3.12 → postgresql_charms_single_kernel-16.3.14}/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.14"
|
|
5
5
|
readme = "README.md"
|
|
6
6
|
classifiers = [
|
|
7
7
|
"Development Status :: 3 - Alpha",
|
|
@@ -10,6 +10,7 @@ classifiers = [
|
|
|
10
10
|
]
|
|
11
11
|
requires-python = ">=3.8,<4.0"
|
|
12
12
|
dependencies = [
|
|
13
|
+
"cryptography>=42.0.0",
|
|
13
14
|
"ops>=2.0.0",
|
|
14
15
|
"tenacity>=9.0.0",
|
|
15
16
|
]
|
|
@@ -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.14"
|
|
8
8
|
readme = "README.md"
|
|
9
9
|
license = {file = "LICENSE"}
|
|
10
10
|
authors = [
|
|
@@ -17,6 +17,7 @@ classifiers = [
|
|
|
17
17
|
]
|
|
18
18
|
requires-python = ">=3.8,<4.0"
|
|
19
19
|
dependencies = [
|
|
20
|
+
"cryptography>=42.0.0",
|
|
20
21
|
"ops>=2.0.0",
|
|
21
22
|
"tenacity>=9.0.0",
|
|
22
23
|
]
|
|
@@ -9,6 +9,12 @@ from data_platform_helpers.advanced_statuses import StatusHandler
|
|
|
9
9
|
from ops import StatusBase
|
|
10
10
|
from ops.charm import CharmBase
|
|
11
11
|
|
|
12
|
+
if TYPE_CHECKING:
|
|
13
|
+
import charm_refresh
|
|
14
|
+
|
|
15
|
+
from single_kernel_postgresql.managers.k8s import K8sManager
|
|
16
|
+
|
|
17
|
+
|
|
12
18
|
from single_kernel_postgresql.core.state import CharmState
|
|
13
19
|
from single_kernel_postgresql.events.async_replication import PostgreSQLAsyncReplication
|
|
14
20
|
from single_kernel_postgresql.events.database import DatabaseEventsHandler
|
|
@@ -27,6 +33,7 @@ from single_kernel_postgresql.managers.cluster import ClusterManager
|
|
|
27
33
|
from single_kernel_postgresql.managers.config import ConfigManager
|
|
28
34
|
from single_kernel_postgresql.managers.database import DatabaseManager
|
|
29
35
|
from single_kernel_postgresql.managers.patroni import PatroniManager
|
|
36
|
+
from single_kernel_postgresql.managers.refresh import RefreshManager
|
|
30
37
|
from single_kernel_postgresql.managers.tls import TLSManager
|
|
31
38
|
from single_kernel_postgresql.workload.base import BaseWorkload, ResourceProvider
|
|
32
39
|
|
|
@@ -34,9 +41,6 @@ from ..config.enums import Substrates
|
|
|
34
41
|
from ..config.literals import DATABASE, S3_RELATION_NAME
|
|
35
42
|
from ..utils.postgresql import PostgreSQL
|
|
36
43
|
|
|
37
|
-
if TYPE_CHECKING:
|
|
38
|
-
from single_kernel_postgresql.managers.k8s import K8sManager
|
|
39
|
-
|
|
40
44
|
|
|
41
45
|
class AbstractPostgreSQLCharm(CharmBase, ABC):
|
|
42
46
|
"""An abstract PostgreSQL charm."""
|
|
@@ -125,6 +129,16 @@ class AbstractPostgreSQLCharm(CharmBase, ABC):
|
|
|
125
129
|
restart_services=self.restart_services,
|
|
126
130
|
)
|
|
127
131
|
|
|
132
|
+
# The refresh manager owns the charm_refresh integration and the priority gate
|
|
133
|
+
# every unit status write routes through. Constructed before the events handler
|
|
134
|
+
# so the K8s pebble-ready handler can consult the refresh state.
|
|
135
|
+
self.refresh_manager = RefreshManager(
|
|
136
|
+
state=self.state,
|
|
137
|
+
workload=self.workload,
|
|
138
|
+
charm=self,
|
|
139
|
+
set_default_status=self.set_default_unit_status,
|
|
140
|
+
)
|
|
141
|
+
|
|
128
142
|
# Events Handler
|
|
129
143
|
self.postgresql_events_handler = PostgreSQLEventsHandler(
|
|
130
144
|
self,
|
|
@@ -134,12 +148,17 @@ class AbstractPostgreSQLCharm(CharmBase, ABC):
|
|
|
134
148
|
self.tls_manager,
|
|
135
149
|
self.config_manager,
|
|
136
150
|
self.patroni_manager,
|
|
151
|
+
self.refresh_manager,
|
|
137
152
|
)
|
|
138
153
|
self.watcher_handler = WatcherEventsHandler(self, self.workload, self.state)
|
|
139
154
|
|
|
155
|
+
# Resume or prepare the refresh (the charms' post-construction resume block).
|
|
156
|
+
self.refresh_manager.on_init()
|
|
157
|
+
|
|
140
158
|
# Status Handler
|
|
141
159
|
self.status_handler = StatusHandler(
|
|
142
160
|
self,
|
|
161
|
+
self.refresh_manager,
|
|
143
162
|
self.cluster_manager,
|
|
144
163
|
self.tls_manager,
|
|
145
164
|
self.config_manager,
|
|
@@ -199,15 +218,55 @@ class AbstractPostgreSQLCharm(CharmBase, ABC):
|
|
|
199
218
|
pass
|
|
200
219
|
|
|
201
220
|
@abstractmethod
|
|
202
|
-
def set_unit_status(
|
|
221
|
+
def set_unit_status(
|
|
222
|
+
self,
|
|
223
|
+
status: StatusBase,
|
|
224
|
+
/,
|
|
225
|
+
*,
|
|
226
|
+
refresh: "charm_refresh.Machines | charm_refresh.Kubernetes | None" = None,
|
|
227
|
+
) -> None:
|
|
203
228
|
"""Set the unit status without overriding a higher-priority refresh status."""
|
|
204
229
|
pass
|
|
205
230
|
|
|
206
231
|
@abstractmethod
|
|
207
|
-
def
|
|
232
|
+
def set_default_unit_status(self) -> None:
|
|
233
|
+
"""Set the unit status that applies when no refresh status is active."""
|
|
234
|
+
pass
|
|
235
|
+
|
|
236
|
+
@abstractmethod
|
|
237
|
+
def update_config(
|
|
238
|
+
self, *, refresh: "charm_refresh.Machines | charm_refresh.Kubernetes | None" = None
|
|
239
|
+
) -> bool:
|
|
208
240
|
"""Re-render the Patroni configuration and apply it."""
|
|
209
241
|
pass
|
|
210
242
|
|
|
243
|
+
@abstractmethod
|
|
244
|
+
def post_refresh_side_effects(self) -> None:
|
|
245
|
+
"""Run the post-snap-refresh side effects owned by not-yet-migrated modules.
|
|
246
|
+
|
|
247
|
+
The VM charm sets up the exporter and pgBackRest exporter, starts/stops the
|
|
248
|
+
pgBackRest service and updates the watcher unit address here.
|
|
249
|
+
"""
|
|
250
|
+
pass
|
|
251
|
+
|
|
252
|
+
@abstractmethod
|
|
253
|
+
def has_async_replication_relation(self) -> bool:
|
|
254
|
+
"""Whether this unit is related to an async replication partner.
|
|
255
|
+
|
|
256
|
+
Owned by the async-replication module until that phase migrates; the temp
|
|
257
|
+
tablespace migration skips units inside an async cluster.
|
|
258
|
+
"""
|
|
259
|
+
pass
|
|
260
|
+
|
|
261
|
+
@abstractmethod
|
|
262
|
+
def update_relation_endpoints(self) -> None:
|
|
263
|
+
"""Refresh the client and async relation endpoints after a switchover.
|
|
264
|
+
|
|
265
|
+
Owned by the client-relation and async-replication modules until those
|
|
266
|
+
phases migrate; the VM pre-refresh checks call it after switching primary.
|
|
267
|
+
"""
|
|
268
|
+
pass
|
|
269
|
+
|
|
211
270
|
# Async-replication wiring helpers. The manager is constructed before the handler,
|
|
212
271
|
# so the framework-facing plumbing is re-exposed through these late-binding bridges;
|
|
213
272
|
# create_pgdata/fix_leader_annotation are K8s-only and default to no-ops the K8s
|
|
@@ -241,3 +300,22 @@ class AbstractPostgreSQLCharm(CharmBase, ABC):
|
|
|
241
300
|
def primary_endpoint(self) -> str | None:
|
|
242
301
|
"""Address of the cluster primary, or None when there is not one."""
|
|
243
302
|
pass
|
|
303
|
+
|
|
304
|
+
@abstractmethod
|
|
305
|
+
def get_async_primary_cluster_endpoint(self) -> str | None:
|
|
306
|
+
"""Endpoint of the primary cluster of the async replication partner, if any.
|
|
307
|
+
|
|
308
|
+
Owned by the async-replication module until that phase migrates; the refresh
|
|
309
|
+
pre-refresh checks need it to decide whether a switchover crosses clusters.
|
|
310
|
+
"""
|
|
311
|
+
pass
|
|
312
|
+
|
|
313
|
+
@abstractmethod
|
|
314
|
+
def update_pebble_layers(self) -> None:
|
|
315
|
+
"""Reconcile the workload's Pebble layers (K8s)."""
|
|
316
|
+
pass
|
|
317
|
+
|
|
318
|
+
@abstractmethod
|
|
319
|
+
def ensure_pgdata_dirs_and_symlinks(self) -> None:
|
|
320
|
+
"""Create the storage directories and symlinks for the PostgreSQL data paths (K8s)."""
|
|
321
|
+
pass
|
|
@@ -5,17 +5,20 @@
|
|
|
5
5
|
"""PostgreSQL Kubernetes Charm."""
|
|
6
6
|
|
|
7
7
|
import logging
|
|
8
|
-
from typing import cast
|
|
8
|
+
from typing import TYPE_CHECKING, cast
|
|
9
9
|
|
|
10
|
-
from ops import StatusBase
|
|
10
|
+
from ops import ActiveStatus, StatusBase
|
|
11
11
|
|
|
12
12
|
from single_kernel_postgresql.charms.abstract_charm import AbstractPostgreSQLCharm, PostgreSQL
|
|
13
13
|
from single_kernel_postgresql.config.enums import Substrates
|
|
14
14
|
from single_kernel_postgresql.config.literals import CONTAINER_NAME, SYSTEM_USERS, USER
|
|
15
15
|
from single_kernel_postgresql.managers.k8s import K8sManager
|
|
16
|
-
from single_kernel_postgresql.workload.base import BaseWorkload
|
|
16
|
+
from single_kernel_postgresql.workload.base import BaseWorkload, PebbleLayerSpec
|
|
17
17
|
from single_kernel_postgresql.workload.k8s import K8sWorkload
|
|
18
18
|
|
|
19
|
+
if TYPE_CHECKING:
|
|
20
|
+
import charm_refresh
|
|
21
|
+
|
|
19
22
|
logger = logging.getLogger(__name__)
|
|
20
23
|
|
|
21
24
|
|
|
@@ -80,8 +83,8 @@ class PostgreSQLK8sCharm(AbstractPostgreSQLCharm):
|
|
|
80
83
|
return Substrates.K8S
|
|
81
84
|
|
|
82
85
|
# The concrete production charm owns these bridges (update_scrape_job_spec +
|
|
83
|
-
# acquire_lock, pebble metrics/ldap restarts, the
|
|
84
|
-
#
|
|
86
|
+
# acquire_lock, pebble metrics/ldap restarts, the async app status and the config
|
|
87
|
+
# re-render), so they are minimal here.
|
|
85
88
|
def get_resource_provider(self) -> K8sManager:
|
|
86
89
|
"""Return the substrate's (cpu_cores, memory_bytes) introspector."""
|
|
87
90
|
return self.k8s_manager
|
|
@@ -92,11 +95,30 @@ class PostgreSQLK8sCharm(AbstractPostgreSQLCharm):
|
|
|
92
95
|
def restart_services(self) -> None:
|
|
93
96
|
"""Restart the monitoring and LDAP-sync sidecar services."""
|
|
94
97
|
|
|
95
|
-
def set_unit_status(
|
|
98
|
+
def set_unit_status(
|
|
99
|
+
self,
|
|
100
|
+
status: StatusBase,
|
|
101
|
+
/,
|
|
102
|
+
*,
|
|
103
|
+
refresh: "charm_refresh.Machines | charm_refresh.Kubernetes | None" = None,
|
|
104
|
+
) -> None:
|
|
96
105
|
"""Set the unit status without overriding a higher-priority refresh status."""
|
|
97
|
-
self.
|
|
106
|
+
self.refresh_manager.set_unit_status(status, refresh=refresh)
|
|
107
|
+
|
|
108
|
+
def set_default_unit_status(self) -> None:
|
|
109
|
+
"""Set the unit status that applies when no refresh status is active."""
|
|
110
|
+
self.unit.status = ActiveStatus()
|
|
111
|
+
|
|
112
|
+
def post_refresh_side_effects(self) -> None:
|
|
113
|
+
"""Run the post-snap-refresh side effects owned by not-yet-migrated modules."""
|
|
114
|
+
|
|
115
|
+
def has_async_replication_relation(self) -> bool:
|
|
116
|
+
"""Whether this unit is related to an async replication partner."""
|
|
117
|
+
return False
|
|
98
118
|
|
|
99
|
-
def update_config(
|
|
119
|
+
def update_config(
|
|
120
|
+
self, *, refresh: "charm_refresh.Machines | charm_refresh.Kubernetes | None" = None
|
|
121
|
+
) -> bool:
|
|
100
122
|
"""Re-render the Patroni configuration and apply it."""
|
|
101
123
|
return self.config_manager.update_config(self.postgresql)
|
|
102
124
|
|
|
@@ -119,3 +141,18 @@ class PostgreSQLK8sCharm(AbstractPostgreSQLCharm):
|
|
|
119
141
|
def primary_endpoint(self) -> str | None:
|
|
120
142
|
"""Address of the cluster primary's Service."""
|
|
121
143
|
return self.state.primary_endpoint
|
|
144
|
+
|
|
145
|
+
def get_async_primary_cluster_endpoint(self) -> str | None:
|
|
146
|
+
"""Endpoint of the primary cluster of the async replication partner, if any."""
|
|
147
|
+
return None
|
|
148
|
+
|
|
149
|
+
def update_relation_endpoints(self) -> None:
|
|
150
|
+
"""Refresh the client and async relation endpoints after a switchover."""
|
|
151
|
+
|
|
152
|
+
def update_pebble_layers(self) -> None:
|
|
153
|
+
"""Reconcile the workload's Pebble layers."""
|
|
154
|
+
self.workload.update_pebble_layers(PebbleLayerSpec.from_state(self.state))
|
|
155
|
+
|
|
156
|
+
def ensure_pgdata_dirs_and_symlinks(self) -> None:
|
|
157
|
+
"""Create the storage directories and symlinks for the PostgreSQL data paths."""
|
|
158
|
+
self.workload.init_storage()
|
|
@@ -5,14 +5,18 @@
|
|
|
5
5
|
"""PostgreSQL VM Charm."""
|
|
6
6
|
|
|
7
7
|
import logging
|
|
8
|
+
from typing import TYPE_CHECKING
|
|
8
9
|
|
|
9
|
-
from ops import StatusBase
|
|
10
|
+
from ops import ActiveStatus, StatusBase
|
|
10
11
|
|
|
11
12
|
from single_kernel_postgresql.charms.abstract_charm import AbstractPostgreSQLCharm, PostgreSQL
|
|
12
13
|
from single_kernel_postgresql.config.enums import Substrates
|
|
13
14
|
from single_kernel_postgresql.config.literals import SYSTEM_USERS, USER
|
|
14
15
|
from single_kernel_postgresql.workload.vm import VMWorkload
|
|
15
16
|
|
|
17
|
+
if TYPE_CHECKING:
|
|
18
|
+
import charm_refresh
|
|
19
|
+
|
|
16
20
|
logger = logging.getLogger(__name__)
|
|
17
21
|
|
|
18
22
|
|
|
@@ -59,8 +63,8 @@ class PostgreSQLVMCharm(AbstractPostgreSQLCharm):
|
|
|
59
63
|
return Substrates.VM
|
|
60
64
|
|
|
61
65
|
# The concrete production charm owns these bridges (pops postgresql_restarted +
|
|
62
|
-
# acquire_lock, snap metrics/ldap restarts, the
|
|
63
|
-
#
|
|
66
|
+
# acquire_lock, snap metrics/ldap restarts, the async app status, the Patroni-derived
|
|
67
|
+
# primary lookup and the config re-render), so they are minimal here.
|
|
64
68
|
def get_resource_provider(self) -> VMWorkload:
|
|
65
69
|
"""Return the substrate's (cpu_cores, memory_bytes) introspector."""
|
|
66
70
|
return self.workload
|
|
@@ -71,13 +75,34 @@ class PostgreSQLVMCharm(AbstractPostgreSQLCharm):
|
|
|
71
75
|
def restart_services(self) -> None:
|
|
72
76
|
"""Restart the monitoring and LDAP-sync sidecar services."""
|
|
73
77
|
|
|
74
|
-
def set_unit_status(
|
|
78
|
+
def set_unit_status(
|
|
79
|
+
self,
|
|
80
|
+
status: StatusBase,
|
|
81
|
+
/,
|
|
82
|
+
*,
|
|
83
|
+
refresh: "charm_refresh.Machines | charm_refresh.Kubernetes | None" = None,
|
|
84
|
+
) -> None:
|
|
75
85
|
"""Set the unit status without overriding a higher-priority refresh status."""
|
|
76
|
-
self.
|
|
86
|
+
self.refresh_manager.set_unit_status(status, refresh=refresh)
|
|
87
|
+
|
|
88
|
+
def set_default_unit_status(self) -> None:
|
|
89
|
+
"""Set the unit status that applies when no refresh status is active."""
|
|
90
|
+
self.unit.status = ActiveStatus()
|
|
91
|
+
|
|
92
|
+
def post_refresh_side_effects(self) -> None:
|
|
93
|
+
"""Set up the exporters, pgBackRest service, and watcher unit address."""
|
|
94
|
+
|
|
95
|
+
def has_async_replication_relation(self) -> bool:
|
|
96
|
+
"""Whether this unit is related to an async replication partner."""
|
|
97
|
+
return False
|
|
77
98
|
|
|
78
|
-
def update_config(
|
|
99
|
+
def update_config(
|
|
100
|
+
self, *, refresh: "charm_refresh.Machines | charm_refresh.Kubernetes | None" = None
|
|
101
|
+
) -> bool:
|
|
79
102
|
"""Re-render the Patroni configuration and apply it."""
|
|
80
|
-
|
|
103
|
+
if refresh is None:
|
|
104
|
+
refresh = self.refresh_manager.refresh
|
|
105
|
+
return self.config_manager.update_config(self.postgresql, refresh=refresh)
|
|
81
106
|
|
|
82
107
|
def set_app_status(self, status: StatusBase) -> None:
|
|
83
108
|
"""Set the application status; the production charm gates this on its own state."""
|
|
@@ -91,3 +116,16 @@ class PostgreSQLVMCharm(AbstractPostgreSQLCharm):
|
|
|
91
116
|
"""Address of the cluster primary, or None when there is not one."""
|
|
92
117
|
primary = self.patroni_manager.get_primary()
|
|
93
118
|
return self.patroni_manager.get_member_ip(primary) if primary else None
|
|
119
|
+
|
|
120
|
+
def get_async_primary_cluster_endpoint(self) -> str | None:
|
|
121
|
+
"""Endpoint of the primary cluster of the async replication partner, if any."""
|
|
122
|
+
return None
|
|
123
|
+
|
|
124
|
+
def update_relation_endpoints(self) -> None:
|
|
125
|
+
"""Refresh the client and async relation endpoints after a switchover."""
|
|
126
|
+
|
|
127
|
+
def update_pebble_layers(self) -> None:
|
|
128
|
+
"""Reconcile the workload's Pebble layers (K8s only)."""
|
|
129
|
+
|
|
130
|
+
def ensure_pgdata_dirs_and_symlinks(self) -> None:
|
|
131
|
+
"""Create the storage directories and symlinks for the PostgreSQL data paths (K8s only)."""
|
|
@@ -30,6 +30,7 @@ from psycopg2.sql import SQL, Identifier, Literal
|
|
|
30
30
|
|
|
31
31
|
from ..config.literals import (
|
|
32
32
|
BACKUP_USER,
|
|
33
|
+
PG_CRON_DATABASE,
|
|
33
34
|
SYSTEM_USERS,
|
|
34
35
|
)
|
|
35
36
|
|
|
@@ -473,8 +474,7 @@ class PostgreSQLBase:
|
|
|
473
474
|
ordered_extensions = OrderedDict()
|
|
474
475
|
for plugin in DEPENDENCY_PLUGINS:
|
|
475
476
|
ordered_extensions[plugin] = extensions.get(plugin, False)
|
|
476
|
-
|
|
477
|
-
ordered_extensions[extension] = enable
|
|
477
|
+
ordered_extensions.update(extensions)
|
|
478
478
|
|
|
479
479
|
self._configure_pgaudit(False)
|
|
480
480
|
|
|
@@ -484,6 +484,8 @@ class PostgreSQLBase:
|
|
|
484
484
|
database=database
|
|
485
485
|
) as connection, connection.cursor() as cursor:
|
|
486
486
|
for extension, enable in ordered_extensions.items():
|
|
487
|
+
if extension == "pg_cron" and database != PG_CRON_DATABASE:
|
|
488
|
+
continue
|
|
487
489
|
cursor.execute(
|
|
488
490
|
f"CREATE EXTENSION IF NOT EXISTS {extension};"
|
|
489
491
|
if enable
|
|
@@ -12,6 +12,9 @@ POSTGRESQL_STORAGE_PERMISSIONS = 0o700
|
|
|
12
12
|
|
|
13
13
|
# Snap
|
|
14
14
|
POSTGRESQL_SNAP_NAME = "charmed-postgresql"
|
|
15
|
+
SNAP_OOM_SCORE_ADJUST_MIN = -900
|
|
16
|
+
SNAP_VITALITY_HINT = "resilience.vitality-hint"
|
|
17
|
+
SNAP_VITALITY_MAX_SNAPS = 100
|
|
15
18
|
|
|
16
19
|
# Relations
|
|
17
20
|
PEER_RELATION = "database-peers"
|
|
@@ -27,6 +30,9 @@ SNAP_USER = "_daemon_"
|
|
|
27
30
|
USER = "operator"
|
|
28
31
|
SYSTEM_USERS = [BACKUP_USER, MONITORING_USER, REPLICATION_USER, REWIND_USER, USER]
|
|
29
32
|
|
|
33
|
+
# Extensions
|
|
34
|
+
PG_CRON_DATABASE = "postgres"
|
|
35
|
+
|
|
30
36
|
# Paths
|
|
31
37
|
## VM Paths
|
|
32
38
|
BASE_SNAP_DIR = f"/var/snap/{POSTGRESQL_SNAP_NAME}"
|
|
@@ -215,3 +221,9 @@ RESTORE_REPEAT_CAUSE = "restore-backup"
|
|
|
215
221
|
# Watcher relation
|
|
216
222
|
RAFT_PORT = 2222
|
|
217
223
|
RAFT_PARTNER_PREFIX = "partner_node_status_server_"
|
|
224
|
+
# Refresh (charm_refresh integration)
|
|
225
|
+
WORKLOAD_NAME = "PostgreSQL"
|
|
226
|
+
VM_CHARM_NAME = "postgresql"
|
|
227
|
+
K8S_CHARM_NAME = "postgresql-k8s"
|
|
228
|
+
K8S_OCI_RESOURCE_NAME = "postgresql-image"
|
|
229
|
+
LAST_REFRESH_UNIT_STATUS_FILE = ".last_refresh_unit_status.json"
|
|
@@ -155,6 +155,7 @@ class CharmConfig(BaseConfigModel):
|
|
|
155
155
|
plugin_ltree_enable: bool
|
|
156
156
|
plugin_old_snapshot_enable: bool
|
|
157
157
|
plugin_orafce_enable: bool
|
|
158
|
+
plugin_pg_cron_enable: bool
|
|
158
159
|
plugin_pg_freespacemap_enable: bool
|
|
159
160
|
plugin_pg_similarity_enable: bool
|
|
160
161
|
plugin_pg_trgm_enable: bool
|
|
@@ -29,6 +29,7 @@ from single_kernel_postgresql.core.state import CharmState
|
|
|
29
29
|
from single_kernel_postgresql.managers.cluster import ClusterManager
|
|
30
30
|
from single_kernel_postgresql.managers.config import ConfigManager
|
|
31
31
|
from single_kernel_postgresql.managers.patroni import PatroniManager
|
|
32
|
+
from single_kernel_postgresql.managers.refresh import RefreshManager
|
|
32
33
|
from single_kernel_postgresql.managers.tls import TLSManager
|
|
33
34
|
from single_kernel_postgresql.workload.base import BaseWorkload, PebbleLayerSpec
|
|
34
35
|
from single_kernel_postgresql.workload.vm import VMWorkload
|
|
@@ -51,6 +52,7 @@ class PostgreSQLEventsHandler(Object):
|
|
|
51
52
|
tls_manager: TLSManager,
|
|
52
53
|
config_manager: ConfigManager,
|
|
53
54
|
patroni_manager: PatroniManager,
|
|
55
|
+
refresh_manager: RefreshManager,
|
|
54
56
|
) -> None:
|
|
55
57
|
super().__init__(charm, key="postgresql_events")
|
|
56
58
|
self.charm = charm
|
|
@@ -60,6 +62,7 @@ class PostgreSQLEventsHandler(Object):
|
|
|
60
62
|
self.config_manager = config_manager
|
|
61
63
|
self.tls_manager = tls_manager
|
|
62
64
|
self.patroni_manager = patroni_manager
|
|
65
|
+
self.refresh_manager = refresh_manager
|
|
63
66
|
|
|
64
67
|
# Charm events
|
|
65
68
|
self.framework.observe(self.charm.on.install, self._on_install)
|
|
@@ -123,7 +126,16 @@ class PostgreSQLEventsHandler(Object):
|
|
|
123
126
|
|
|
124
127
|
def _on_postgresql_pebble_ready(self, event: WorkloadEvent) -> None:
|
|
125
128
|
"""Event handler for PostgreSQL container on PebbleReadyEvent."""
|
|
126
|
-
#
|
|
129
|
+
# Safeguard against starting while refreshing.
|
|
130
|
+
if self.refresh_manager.refresh is None:
|
|
131
|
+
logger.warning("Warning on_postgresql_pebble_ready: Refresh could be in progress")
|
|
132
|
+
elif (
|
|
133
|
+
self.refresh_manager.refresh.in_progress
|
|
134
|
+
and not self.refresh_manager.refresh.workload_allowed_to_start
|
|
135
|
+
):
|
|
136
|
+
logger.debug("Defer on_postgresql_pebble_ready: Refresh in progress")
|
|
137
|
+
event.defer()
|
|
138
|
+
return
|
|
127
139
|
if self.state.endpoint in self.state.endpoints:
|
|
128
140
|
# TODO: Fix pod by adding services
|
|
129
141
|
pass
|
|
@@ -24,6 +24,7 @@ from tenacity import RetryError, Retrying, stop_after_attempt, stop_after_delay,
|
|
|
24
24
|
from single_kernel_postgresql.config.enums import Substrates
|
|
25
25
|
from single_kernel_postgresql.config.exceptions import PostgreSQLCannotConnectError
|
|
26
26
|
from single_kernel_postgresql.config.literals import (
|
|
27
|
+
PG_CRON_DATABASE,
|
|
27
28
|
PGBACKREST_CONF_FILE,
|
|
28
29
|
POSTGRESQL_STORAGE_PERMISSIONS,
|
|
29
30
|
REWIND_USER,
|
|
@@ -480,7 +481,7 @@ class ConfigManager(BaseManager):
|
|
|
480
481
|
watcher_raft_address: str | None = None,
|
|
481
482
|
no_peers: bool = False,
|
|
482
483
|
*,
|
|
483
|
-
refresh: charm_refresh.Machines | None = None,
|
|
484
|
+
refresh: charm_refresh.Machines | charm_refresh.Kubernetes | None = None,
|
|
484
485
|
) -> bool:
|
|
485
486
|
"""Updates Patroni config file based on the existence of the TLS files.
|
|
486
487
|
|
|
@@ -579,7 +580,7 @@ class ConfigManager(BaseManager):
|
|
|
579
580
|
self.state.substrate == Substrates.VM
|
|
580
581
|
and refresh is not None
|
|
581
582
|
and cast("VMWorkload", self.workload).get_snap_revision()
|
|
582
|
-
!= refresh.pinned_snap_revision
|
|
583
|
+
!= cast("charm_refresh.Machines", refresh).pinned_snap_revision
|
|
583
584
|
):
|
|
584
585
|
logger.debug("Early exit: snap was not refreshed to the right version yet")
|
|
585
586
|
return True
|
|
@@ -688,6 +689,7 @@ class ConfigManager(BaseManager):
|
|
|
688
689
|
"synchronous_node_count": self.state.synchronous_node_count,
|
|
689
690
|
"maximum_lag_on_failover": self.state.config.durability_maximum_lag_on_failover,
|
|
690
691
|
"pg_parameters": parameters,
|
|
692
|
+
"pg_cron_database": PG_CRON_DATABASE,
|
|
691
693
|
"primary_cluster_endpoint": async_primary_cluster_endpoint,
|
|
692
694
|
"ldap_parameters": self._dict_to_hba_string(ldap_parameters),
|
|
693
695
|
"patroni_password": self.state.application.patroni_password,
|