Skip to content

stop.sh: do not block script when there is no running cluster#35637

Merged
sebastian-philipp merged 1 commit intoceph:masterfrom
bk201:wip-46067
Jun 18, 2020
Merged

stop.sh: do not block script when there is no running cluster#35637
sebastian-philipp merged 1 commit intoceph:masterfrom
bk201:wip-46067

Conversation

@bk201
Copy link
Contributor

@bk201 bk201 commented Jun 18, 2020

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

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug

Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard backend
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

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>
@sebastian-philipp
Copy link
Contributor

jenkins test dashboard backend

@sebastian-philipp
Copy link
Contributor

jenkins test make check

@sebastian-philipp sebastian-philipp merged commit 3f7b7b6 into ceph:master Jun 18, 2020
@bk201 bk201 deleted the wip-46067 branch July 10, 2020 04:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants