]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd: Give requested scrub work a higher priority 14735/head
authorDavid Zafman <dzafman@redhat.com>
Mon, 17 Apr 2017 21:58:02 +0000 (14:58 -0700)
committerNathan Cutler <ncutler@suse.com>
Mon, 3 Jul 2017 10:17:05 +0000 (12:17 +0200)
commit47a45441762e610eef548273c719cf70643bfeac
tree2d1ab9f44ecf9db61cec4e5e09ac5b2cddb60ac8
parentf31033cb5bc7764b44871c15717aed5a34921881
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 kraken, 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