RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 17:08:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #33216 into master

Browse Source 
* refs/pull/33216/head:
	cephadm: avoid trigger old podman bug
	qa/workunits/cephadm/test_cephadm.sh: wait longer for grafana

Reviewed-by: Michael Fritch <mfritch@suse.com>
This commit is contained in:
Sage Weil 2020-02-12 19:09:05 -06:00
commit 81bad666e0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qa/workunits/cephadm/test_cephadm.sh
View File

@ -259,7 +259,7 @@ while true; do
break
fi
TRIES=$(($TRIES + 1))
if [ "$TRIES" -eq 5 ]; then
if [ "$TRIES" -eq 30 ]; then
echo "grafana did not come up"
exit 1
fi
@ -313,7 +313,8 @@ $CEPHADM enter --fsid $FSID --name mgr.x -- test -d /var/lib/ceph/mgr/ceph-x
$CEPHADM enter --fsid $FSID --name mon.a -- pidof ceph-mon
expect_false $CEPHADM enter --fsid $FSID --name mgr.x -- pidof ceph-mon
$CEPHADM enter --fsid $FSID --name mgr.x -- pidof ceph-mgr
expect_false $CEPHADM --timeout 1 enter --fsid $FSID --name mon.a -- sleep 10
# this triggers a bug in older versions of podman, including 18.04's 1.6.2
#expect_false $CEPHADM --timeout 1 enter --fsid $FSID --name mon.a -- sleep 10
$CEPHADM --timeout 10 enter --fsid $FSID --name mon.a -- sleep 1
## ceph-volume