]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
stop.sh: do not block script when there is no running cluster
authorKiefer Chang <kiefer.chang@suse.com>
Thu, 18 Jun 2020 07:42:50 +0000 (15:42 +0800)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 14 Jul 2020 09:39:06 +0000 (11:39 +0200)
commitae0cda39b1cdc1e0e59b5069789aaf0c2f3ea67d
tree4c85a888ccc59bf07bf89c285dad5376d57077a6
parent7fca416cd80705855ace1bbade275170f6cb777a
stop.sh: do not block script when there is no running cluster

A query for current fsid is called inside `do_killcephadm`. This blocks
the script when there is no running cluster. The fix avoids entering the
function if cephadm command fails or returns no daemons.

The change also hides the following output for non-cephadm environments:

```
Unable to locate any of ['podman', 'docker']
```

Fixes: https://tracker.ceph.com/issues/46067
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
(cherry picked from commit 9884b9313db506a35b4e49d46c754965d90476ed)
src/stop.sh