]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #41125 from sseshasa/wip-50606-pacific
authorYuri Weinstein <yweinste@redhat.com>
Wed, 2 Jun 2021 18:53:01 +0000 (11:53 -0700)
committerGitHub <noreply@github.com>
Wed, 2 Jun 2021 18:53:01 +0000 (11:53 -0700)
pacific: osd: Override recovery, backfill and sleep related config options during OSD and mclock scheduler initialization.

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/common/options.cc
src/osd/OSD.cc
src/osd/OSD.h

Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge