]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
osd: Give requested scrub work a higher priority 14686/head
authorDavid Zafman <dzafman@redhat.com>
Mon, 17 Apr 2017 21:58:02 +0000 (14:58 -0700)
committerNathan Cutler <ncutler@suse.com>
Thu, 20 Apr 2017 13:45:33 +0000 (15:45 +0200)
commitc2efeb4b62e6dc4e6975561eb8b20cfca66f7237
tree701faa4bbef2db97cca496ee4b4cafde0fd10551
parent8df896055366d777ca309dd4a7840f2a2a5a72cc
osd: Give requested scrub work a higher priority

Once started we now queue scrub work at higher priority than
scheduled scrubs.

Fixes: http://tracker.ceph.com/issues/15789
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit ebab8b1f4f67fbdec1e147c580329c1e2b5cf7cd)

Conflicts:
        src/osd/OSD.h - in jewel, the PGScrub() call is enclosed within
            op_wq.queue(make_pair(...)) instead of enqueue_back()
src/common/config_opts.h
src/osd/OSD.h
src/osd/PG.cc
src/osd/PG.h