Commits on Apr 30, 2018

1. osdc/Objecter: fix recursive locking in _finish_command …

   The path
   
   #9  Objecter::_finish_command (this=this@entry=0x7f76c00aeb30, c=c@entry=0x7f76b0000b10, r=<optimized out>, rs="osd down") at /build/ceph-13.0.2-1932-g458b4fb/src/osdc/Objecter.cc:4950
   #10 0x00007f76d26de106 in Objecter::_check_command_map_dne (this=this@entry=0x7f76c00aeb30, c=c@entry=0x7f76b0000b10) at /build/ceph-13.0.2-1932-g458b4fb/src/osdc/Objecter.cc:1726
   #11 0x00007f76d26e52e4 in Objecter::_scan_requests (this=this@entry=0x7f76c00aeb30, s=0x7f76c00af8a0, skipped_map=skipped_map@entry=false, cluster_full=cluster_full@entry=false, pool_full_map=0x7f76be7fb330, need_resend=..., need_resend_linger=..., need_resend_command=std::map with 0 elements, sul=...,
       gap_removed_snaps=0x7f76ac0016f8) at /build/ceph-13.0.2-1932-g458b4fb/src/osdc/Objecter.cc:1120
   #12 0x00007f76d26eded5 in Objecter::handle_osd_map (this=this@entry=0x7f76c00aeb30, m=m@entry=0x7f76ac0014a0) at /build/ceph-13.0.2-1932-g458b4fb/src/osdc/Objecter.cc:1228
   
   led to recursive lock of the session mutex (locked in _scan_requests,
   and again in _finish_command).
   
   Fix by making the callers for _finish_command (and
   _check_command_map_dne) take the session lock.
   
   Fixes: http://tracker.ceph.com/issues/23940
   Signed-off-by: Sage Weil <sage@redhat.com>

   

   liewegas committed Apr 30, 2018
   Configuration menu

   • View commit details
   • Copy full SHA for 891f519
   • Browse repository at this point

   Copy the full SHA

   891f519 View commit details

   Browse the repository at this point in the history