diff --git a/charms/neutron-k8s/src/charm.py b/charms/neutron-k8s/src/charm.py index 3c468da3..4d4d4d6c 100755 --- a/charms/neutron-k8s/src/charm.py +++ b/charms/neutron-k8s/src/charm.py @@ -174,6 +174,7 @@ class NeutronOperatorCharm(sunbeam_charm.OSBaseOperatorAPICharm): "head", ] ] + db_sync_timeout = 480 def check_configuration(self, event: ops.EventBase): """Check a configuration key is correct.""" diff --git a/ops-sunbeam/ops_sunbeam/charm.py b/ops-sunbeam/ops_sunbeam/charm.py index 192258b2..ed5e2d23 100644 --- a/ops-sunbeam/ops_sunbeam/charm.py +++ b/ops-sunbeam/ops_sunbeam/charm.py @@ -631,6 +631,8 @@ class OSBaseOperatorCharm( class OSBaseOperatorCharmK8S(OSBaseOperatorCharm): """Base charm class for k8s based charms.""" + db_sync_timeout = 300 + def __post_init__(self): """Post init hook.""" super().__post_init__() @@ -810,7 +812,7 @@ class OSBaseOperatorCharmK8S(OSBaseOperatorCharm): container = self.unit.get_container(self.db_sync_container_name) logging.debug("Running sync: \n%s", cmd) try: - process = container.exec(cmd, timeout=5 * 60) + process = container.exec(cmd, timeout=self.db_sync_timeout) out, err = process.wait_output() except ops.pebble.TimeoutError as e: logger.warning(f"DB Sync command timed out: {e}")