Skip to content

Commit 868d5b0

Browse files
sync workload.py with vm
1 parent b621000 commit 868d5b0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/workload.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -240,16 +240,16 @@ def _router_id(self) -> str:
240240
# MySQL Router is bootstrapped without `--directory`—there is one system-wide instance.
241241
return f"{socket.getfqdn()}::system"
242242

243-
def _cleanup_after_upgrade_or_potential_container_restart(self) -> None:
244-
"""Remove Router user after upgrade or (potential) container restart.
243+
def _cleanup_after_refresh_or_potential_container_restart(self) -> None:
244+
"""Remove Router user after refresh or (potential) container restart.
245245
246246
(On Kubernetes, storage is not persisted on container restart—MySQL Router's config file is
247247
deleted. Therefore, MySQL Router needs to be bootstrapped again.)
248248
"""
249249
if user_info := self.shell.get_mysql_router_user_for_unit(self._charm.unit.name):
250-
logger.debug("Cleaning up after upgrade or container restart")
250+
logger.debug("Cleaning up after refresh or container restart")
251251
self.shell.delete_user(user_info.username)
252-
logger.debug("Cleaned up after upgrade or container restart")
252+
logger.debug("Cleaned up after refresh or container restart")
253253

254254
# TODO python3.10 min version: Use `list` instead of `typing.List`
255255
def _get_bootstrap_command(
@@ -358,7 +358,7 @@ def _restart(self, *, event, tls: bool) -> None:
358358
def _enable_router(self, *, event, tls: bool, unit_name: str) -> None:
359359
"""Enable router after setting up all the necessary prerequisites."""
360360
logger.info("Enabling MySQL Router service")
361-
self._cleanup_after_upgrade_or_potential_container_restart()
361+
self._cleanup_after_refresh_or_potential_container_restart()
362362
# create an empty credentials file, if the file does not exist
363363
self._container.create_router_rest_api_credentials_file()
364364
self._bootstrap_router(event=event, tls=tls)
@@ -466,7 +466,7 @@ def refresh(
466466
if exporter_enabled:
467467
self._disable_exporter()
468468
if enabled:
469-
logger.debug("Disabling MySQL Router service before upgrade")
469+
logger.debug("Disabling MySQL Router service before refresh")
470470
self._disable_router()
471471
try:
472472
super().refresh(

0 commit comments

Comments
 (0)