]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
qa: Fix races with waiting for scrubs
authorDavid Zafman <dzafman@redhat.com>
Wed, 9 Aug 2017 15:43:57 +0000 (08:43 -0700)
committerDavid Zafman <dzafman@redhat.com>
Thu, 10 Aug 2017 23:03:35 +0000 (16:03 -0700)
commit7f2c6cb64240268eaeb3f893d83b389e5c34c608
treeede81b56d47471e3646e9e21429257ec724a9685
parentf3a18b3b09e30802f3072abb461c55315a1e91ec
qa: Fix races with waiting for scrubs

The trigger_scrub sets the last_scrub_stamp backwards to
force a scheduled scrub.  In a small window this stamp could get propagated
to the mgr.  A test failure occurred because wait_for_scrub() was confused
by seeing a backward moving date.

The most critical change is having wait_for_scrub() make sure that the
date advances past the previous in value.

A test failed because the random backoff kept delayed triggered scrub, so
set osd_scrub_backoff throughout.

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit ae2c5331fb5ec3b2c81724d19259302903aabdf5)
qa/standalone/ceph-helpers.sh
qa/standalone/scrub/osd-scrub-repair.sh