Fix wrong wording #85
Conversation
| master_start_timeout = configuration_info.json().get("master_start_timeout") | ||
| return int(master_start_timeout) if master_start_timeout is not None else None | ||
| primary_start_timeout = configuration_info.json().get("primary_start_timeout") | ||
| return int(primary_start_timeout) if primary_start_timeout is not None else None |
There was a problem hiding this comment.
This depends on patroni/patroni#2541 (and later on updating the Patroni version in this repo).
| async def get_primary_start_timeout(ops_test: OpsTest) -> Optional[int]: | ||
| """Get the primary start timeout configuration. |
There was a problem hiding this comment.
I think it's better to update the name when the configuration name is changed on Patroni (patroni/patroni#2541).
| @@ -48,12 +48,12 @@ async def app_name(ops_test: OpsTest, application_name: str = "postgresql-k8s") | |||
| return None | |||
|
|
|||
|
|
|||
| async def change_master_start_timeout(ops_test: OpsTest, seconds: Optional[int]) -> None: | |||
| """Change master start timeout configuration. | |||
| async def change_primary_start_timeout(ops_test: OpsTest, seconds: Optional[int]) -> None: | |||
There was a problem hiding this comment.
I think it's better to update the name when the configuration name is changed on Patroni (patroni/patroni#2541).
| @@ -62,7 +62,7 @@ async def change_master_start_timeout(ops_test: OpsTest, seconds: Optional[int]) | |||
| unit_ip = await get_unit_address(ops_test, primary_name) | |||
| requests.patch( | |||
| f"http://{unit_ip}:8008/config", | |||
| json={"master_start_timeout": seconds}, | |||
| json={"primary_start_timeout": seconds}, | |||
There was a problem hiding this comment.
This depends on patroni/patroni#2541.
| @@ -2,7 +2,7 @@ kind: Service | |||
| apiVersion: v1 | |||
| metadata: | |||
| labels: | |||
| role: master | |||
| role: primary | |||
There was a problem hiding this comment.
This will need more work on Patroni even after patroni/patroni#2541 is merged and published, as per patroni/patroni#2541 (comment).
| postmaster_start_time = datetime.strptime( | ||
| health_info["postmaster_start_time"], "%Y-%m-%d %H:%M:%S.%f%z" | ||
| postprimary_start_time = datetime.strptime( | ||
| health_info["postprimary_start_time"], "%Y-%m-%d %H:%M:%S.%f%z" | ||
| ).timestamp() | ||
| return postmaster_start_time > restart_time and health_info["state"] == "running" | ||
| return postprimary_start_time > restart_time and health_info["state"] == "running" |
There was a problem hiding this comment.
postmaster is a deprecated alias to postgres since PostgreSQL 8.2, but it still has a function called pg_postmaster_start_time, which is used by Patroni. However, we can change the name of our variable.
| "master": primary, | ||
| "primary": primary, |
There was a problem hiding this comment.
This probably will break legacy relations, as charms expect this field in the relation.
| return "master" | ||
| return "primary" |
There was a problem hiding this comment.
This probably will break legacy relations, as charms expect this value in this specific field from the relation.
|
This PR cannot be merged AS IS and requires changes on Patroni first. |
Done. Created #101. |
Issue
Solution
Context
Testing
Release Notes