]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd: unlock osd_lock when tweaking osd settings 25833/head
authorKefu Chai <kchai@redhat.com>
Sun, 30 Dec 2018 13:57:04 +0000 (21:57 +0800)
committerVenky Shankar <vshankar@redhat.com>
Tue, 8 Jan 2019 08:50:17 +0000 (03:50 -0500)
commitf615944a6fc507f9c3b953125ba0c6280ab37f69
tree09230cd6a796516fc60cb5c53beb8be66a9a9c80
parentab57fc80317c2d1fb3ac111190b56b7a8eec816a
osd: unlock osd_lock when tweaking osd settings

unlock osd_lock when serving "debug kick_recovery_wq" command

we need to unlock osd_lock temporarily when updating the osd settings,
otherwise we will run into assert failure. because
OSD::handle_conf_change() acquires the osd_lock which is not a recursive
lock.

Fixes: http://tracker.ceph.com/issues/37762
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 8e94b081506fa9fbdbea09113f1549772bb6ec04)

 Conflicts:
src/osd/OSD.cc
src/osd/OSD.cc