Merge pull request ceph#15891 from minggr/wip-sdata_op_ordering_lock

osd: unlock sdata_op_ordering_lock with sdata_lock hold to avoid miss… Reviewed-by: Sage Weil <[email protected]> Reviewed-by: xie xingguo <[email protected]>
alanmeadows · Jun 25, 2017 · 4e6af85 · 4e6af85
2 parents f0ceefb + bc68338
commit 4e6af85
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
@@ -9853,10 +9853,10 @@ void OSD::ShardedOpWQ::_process(uint32_t thread_index, heartbeat_handle_d *hb)
   if (sdata->pqueue->empty()) {
     dout(20) << __func__ << " empty q, waiting" << dendl;
     // optimistically sleep a moment; maybe another work item will come along.
-    sdata->sdata_op_ordering_lock.Unlock();
     osd->cct->get_heartbeat_map()->reset_timeout(hb,
       osd->cct->_conf->threadpool_default_timeout, 0);
     sdata->sdata_lock.Lock();
+    sdata->sdata_op_ordering_lock.Unlock();
     sdata->sdata_cond.WaitInterval(sdata->sdata_lock,
       utime_t(osd->cct->_conf->threadpool_empty_queue_max_wait, 0));
     sdata->sdata_lock.Unlock();