objecter: Objecter::Op is refcounted

Cancellation of lingerin ops collided with ops that we sent osdmap on,
needed to add a refcount for correct object delete.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index ff151b05e65ff51e63d03e7490544994c3b77e4c..5f53176c89633a2087a9c690437239dd5c3befc5 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -388,6 +388,8 @@ void Objecter::unregister_linger(uint64_t linger_id)
 
 void Objecter::_unregister_linger(uint64_t linger_id)
 {
+  assert(rwlock.is_wlocked());
+
   map<uint64_t, LingerOp*>::iterator iter = linger_ops.find(linger_id);
   if (iter != linger_ops.end()) {
     LingerOp *info = iter->second;
@@ -848,6 +850,8 @@ void Objecter::C_Op_Map_Latest::finish(int r)
     op->map_dne_bound = latest;
 
   objecter->_check_op_pool_dne(op, false);
+
+  op->put();
 }
 
 int Objecter::pool_snap_by_name(int64_t poolid, const char *snap_name, snapid_t *snap)
@@ -941,6 +945,7 @@ void Objecter::_send_op_map_check(Op *op)
   assert(rwlock.is_wlocked());
   // ask the monitor
   if (check_latest_map_ops.count(op->tid) == 0) {
+    op->get();
     check_latest_map_ops[op->tid] = op;
     C_Op_Map_Latest *c = new C_Op_Map_Latest(this, op->tid);
     monc->get_version("osdmap", &c->latest, NULL, c);
@@ -953,6 +958,8 @@ void Objecter::_op_cancel_map_check(Op *op)
   map<ceph_tid_t, Op*>::iterator iter =
     check_latest_map_ops.find(op->tid);
   if (iter != check_latest_map_ops.end()) {
+    Op *op = iter->second;
+    op->put();
     check_latest_map_ops.erase(iter);
   }
 }
@@ -1536,7 +1543,7 @@ ceph_tid_t Objecter::_op_submit(Op *op, RWLock::Context& lc)
     r = _calc_target(&op->target);
     check_for_latest_map = (r == RECALC_OP_TARGET_POOL_DNE);
     if (_get_session(op->target.osd, &s, lc) == -EAGAIN ||
-        check_for_latest_map) {
+        (check_for_latest_map && lc.is_rlocked())) {
       lc.promote();
       continue;
     }
@@ -2026,11 +2033,11 @@ void Objecter::_finish_op(Op *op)
 {
   ldout(cct, 15) << "finish_op " << op->tid << dendl;
 
+  assert(op->session->lock.is_wlocked());
+
   if (op->budgeted)
     put_op_budget(op);
 
-  assert(op->session->lock.is_wlocked());
-
   op->session->ops.erase(op->tid);
 
   logger->dec(l_osdc_op_active);
@@ -2045,7 +2052,7 @@ void Objecter::_finish_op(Op *op)
 
   inflight_ops.dec();
 
-  delete op;
+  op->put();
 }
 
 void Objecter::finish_op(OSDSession *session, ceph_tid_t tid)

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 7111d3387dff1cfd77ac2df5368bed3b3135981d..1a14aa73c370951aae8ac653c3c8820e7e7d2f7f 100644 (file)
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -1097,7 +1097,7 @@ public:
     void dump(Formatter *f) const;
   };
 
-  struct Op {
+  struct Op : public RefCountedObject {
     OSDSession *session;
     int incarnation;
 
@@ -1164,16 +1164,18 @@ public:
       if (target.base_oloc.key == o)
        target.base_oloc.key.clear();
     }
+
+    bool operator<(const Op& other) const {
+      return tid < other.tid;
+    }
+
+  private:
     ~Op() {
       while (!out_handler.empty()) {
        delete out_handler.back();
        out_handler.pop_back();
       }
     }
-
-    bool operator<(const Op& other) const {
-      return tid < other.tid;
-    }
   };
 
   struct C_Op_Map_Latest : public Context {