diff options
| author | Sage Weil <sage@redhat.com> | 2018-09-10 14:45:58 +0200 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2018-09-10 14:45:58 +0200 |
| commit | 4d2a73c7f144fbd511fa3f72b2abd5237065cba8 (patch) | |
| tree | f0f7374e55ea430c6d1cf9a43b66919bf9f3d7f0 /qa/standalone | |
| parent | Merge PR #23949 into master (diff) | |
| parent | osd/OSDMap: include age in up and in counts for ceph status (diff) | |
| download | ceph-4d2a73c7f144fbd511fa3f72b2abd5237065cba8.tar.xz ceph-4d2a73c7f144fbd511fa3f72b2abd5237065cba8.zip | |
Merge PR #23845 into master
* refs/pull/23845/head:
osd/OSDMap: include age in up and in counts for ceph status
mon/OSDMonitor: set new_last_{up,in}_change
osd/OSDMap: store last_up_change and last_in_change
mgr/MgrMap: include mgr age in map printer
mon/MgrMap: track active_changed timestamp
mon: include mon quorum age in status
include/utime: add utimespan_str helper
Reviewed-by: John Spray <john.spray@redhat.com>
Diffstat (limited to 'qa/standalone')
| -rwxr-xr-x | qa/standalone/scrub/osd-scrub-repair.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh index a2a1333eb48..ee1833c6fdf 100755 --- a/qa/standalone/scrub/osd-scrub-repair.sh +++ b/qa/standalone/scrub/osd-scrub-repair.sh @@ -385,7 +385,8 @@ function unfound_erasure_coded() { ceph -s | grep "1/1 objects unfound" && break sleep 1 done - ceph -s|grep "4 osds: 4 up, 4 in" || return 1 + ceph -s|grep "4 up" || return 1 + ceph -s|grep "4 in" || return 1 ceph -s|grep "1/1 objects unfound" || return 1 teardown $dir || return 1 |