Skip to content

Commit 55ff54d

Browse files
authored
[DPE-3039] Update rock (#336)
* Update rock * Check for streaming status
1 parent 1cfe3c4 commit 55ff54d

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

metadata.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ resources:
2828
postgresql-image:
2929
type: oci-image
3030
description: OCI image for PostgreSQL
31-
upstream-source: ghcr.io/canonical/charmed-postgresql@sha256:a6aa592506aa4cda85b63f66e1c9d079088ca7c9d84ed4bba9442dea36ec3f17
31+
upstream-source: ghcr.io/canonical/charmed-postgresql@sha256:d3041e50c0d2f613db72228df912e510786644e57c9d2c22cde99db8ce83a5a9
3232

3333
peers:
3434
database-peers:

src/patroni.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
from constants import REWIND_USER, TLS_CA_FILE
2727

28+
RUNNING_STATES = ["running", "streaming"]
29+
2830
logger = logging.getLogger(__name__)
2931

3032

@@ -162,7 +164,7 @@ def are_all_members_ready(self) -> bool:
162164
except RetryError:
163165
return False
164166

165-
return all(member["state"] == "running" for member in r.json()["members"])
167+
return all(member["state"] in RUNNING_STATES for member in r.json()["members"])
166168

167169
@property
168170
def is_creating_backup(self) -> bool:
@@ -222,7 +224,7 @@ def primary_endpoint_ready(self) -> bool:
222224
f"{'https' if self._tls_enabled else 'http'}://{self._primary_endpoint}:8008/health",
223225
verify=self._verify,
224226
)
225-
if r.json()["state"] != "running":
227+
if r.json()["state"] not in RUNNING_STATES:
226228
raise EndpointNotReadyError
227229
except RetryError:
228230
return False
@@ -264,7 +266,7 @@ def member_started(self) -> bool:
264266
except RetryError:
265267
return False
266268

267-
return r.json()["state"] == "running"
269+
return r.json()["state"] in RUNNING_STATES
268270

269271
@property
270272
def is_database_running(self) -> bool:

0 commit comments

Comments
 (0)