Skip to content

Commit 083c33d

Browse files
authored
skip layer reconcile on non-initiated unit (#483)
1 parent a559318 commit 083c33d

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/charm.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,9 @@ def _reconcile_mysqld_exporter(
469469
logger.debug("Skip reconcile mysqld exporter: empty pebble layer")
470470
return
471471

472+
if not self._mysql.is_data_dir_initialised():
473+
logger.debug("Skip reconcile mysqld exporter: mysql not initialised")
474+
return
472475
self.current_event = event
473476
self._reconcile_pebble_layer(container)
474477

tests/unit/test_charm.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,11 @@ def test_mysql_pebble_ready(
156156
_wait_until_mysql_connection,
157157
_get_mysql_version,
158158
_initialize_juju_units_operations_table,
159-
_is_data_dir_initialised,
160159
_create_cluster_set,
160+
_is_data_dir_initialised,
161161
_write_content_to_file,
162-
_active_status_message,
163162
_upgrade_idle,
163+
_active_status_message,
164164
_rescan_cluster,
165165
_cluster_metadata_exists,
166166
_install_plugins,
@@ -186,6 +186,7 @@ def test_mysql_pebble_ready(
186186
self.layer_dict()["services"],
187187
)
188188

189+
_is_data_dir_initialised.return_value = True
189190
self.harness.add_relation("metrics-endpoint", "test-cos-app")
190191
plan = self.harness.get_container_pebble_plan("mysql")
191192
self.assertEqual(

0 commit comments

Comments
 (0)