]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
FileStore: don't lock op_tp in queue_op
authorSamuel Just <sam.just@inktank.com>
Wed, 10 Oct 2012 16:43:57 +0000 (09:43 -0700)
committerSamuel Just <sam.just@inktank.com>
Tue, 30 Oct 2012 20:31:10 +0000 (13:31 -0700)
Neither caller of queue_op can race.
1) in queue_transactions, already under submit lock
2) in _journaled_ahead, journal finisher is single threaded

Signed-off-by: Samuel Just <sam.just@inktank.com>
src/os/FileStore.cc

index 3f2b2bc0e71fff19647d9fa88ccf82c22e050062..4c713a01c519219ed11ce5d4c89c6ba8346bc13d 100644 (file)
@@ -2223,15 +2223,12 @@ void FileStore::queue_op(OpSequencer *osr, Op *o)
   // queue during commit in order to put the store in a consistent
   // state.
   apply_manager.op_apply_start(o->op);
-  op_tp.lock();
 
   osr->queue(o);
 
   logger->inc(l_os_ops);
   logger->inc(l_os_bytes, o->bytes);
 
-  op_tp.unlock();
-
   dout(5) << "queue_op " << o << " seq " << o->op
          << " " << *osr
          << " " << o->bytes << " bytes"