catch timeout and ops exceptions for failed bootstrap cleanup (#592)

Author: paulomach

src/charm.py

@@ -50,7 +50,7 @@
 from charms.rolling_ops.v0.rollingops import RollingOpsManager
 from charms.tempo_coordinator_k8s.v0.charm_tracing import trace_charm
 from charms.tempo_coordinator_k8s.v0.tracing import TracingEndpointRequirer
-from ops import EventBase, RelationBrokenEvent, RelationCreatedEvent
+from ops import EventBase, ModelError, RelationBrokenEvent, RelationCreatedEvent
 from ops.charm import RelationChangedEvent, UpdateStatusEvent
 from ops.model import (
     ActiveStatus,
@@ -60,7 +60,7 @@
     Unit,
     WaitingStatus,
 )
-from ops.pebble import Layer
+from ops.pebble import ChangeError, Layer
 from tenacity import RetryError, Retrying, stop_after_attempt, wait_fixed
 
 from config import CharmConfig, MySQLConfig
@@ -703,6 +703,9 @@ def _configure_instance(self, container) -> None:
             MySQLServiceNotRunningError,
             MySQLConfigureMySQLUsersError,
             MySQLConfigureInstanceError,
+            ChangeError,
+            TimeoutError,
+            ModelError,
         ):
             # On any error, reset the data directory so hook is retried
             # on empty data directory