From: Dan Mick Date: Thu, 10 Dec 2020 19:36:25 +0000 (+0000) Subject: orchestra/daemon/cephadmunit.py: reset-failed as well as start X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b0ade4335f42d53a0b3c00e386e6bd8c1c67c6a8;p=teuthology.git orchestra/daemon/cephadmunit.py: reset-failed as well as start In case a dead service is in a failed state, reset that state before starting it. Fixes: https://tracker.ceph.com/issues/48469 Signed-off-by: Dan Mick --- diff --git a/teuthology/orchestra/daemon/cephadmunit.py b/teuthology/orchestra/daemon/cephadmunit.py index 421fd2c9c..60a031581 100644 --- a/teuthology/orchestra/daemon/cephadmunit.py +++ b/teuthology/orchestra/daemon/cephadmunit.py @@ -29,6 +29,7 @@ class CephadmUnit(DaemonState): def _set_commands(self): self.start_cmd = self._get_systemd_cmd('start') self.stop_cmd = self._get_systemd_cmd('stop') + self.reset_failed_cmd = self._get_systemd_cmd('reset-failed') self.restart_cmd = self._get_systemd_cmd('restart') self.show_cmd = self._get_systemd_cmd('show') self.status_cmd = self._get_systemd_cmd('status') @@ -90,8 +91,9 @@ class CephadmUnit(DaemonState): :param kwargs: keyword arguments passed to remote.run """ if not self.running(): - self.log.info('Restarting %s (starting--it wasn\'t running)...' % self.name()) + self.log.info('Reset-failed/starting %s (it wasn\'t running)...' % self.name()) self._start_logger() + self.remote.sh(self.reset_failed_cmd) self.remote.sh(self.start_cmd) self.is_started = True else: