]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osdc/Objecter: no need null pointer check for op->session anymore 25230/head
authorrunsisi <luo.runbing@zte.com.cn>
Fri, 23 Nov 2018 08:54:45 +0000 (16:54 +0800)
committerrunsisi <luo.runbing@zte.com.cn>
Tue, 27 Nov 2018 11:34:25 +0000 (19:34 +0800)
9a5651b refactored the resend logic for linger op, op->session should be
assigned by _recalc_linger_op_target if resend is needed

Signed-off-by: runsisi <luo.runbing@zte.com.cn>
src/osdc/Objecter.cc

index 9f5610770cf7ca036a7ce75b34c127045a3c3780..5781c4ba0ffce69c6db398803002db0a67e4c714 100644 (file)
@@ -1328,15 +1328,7 @@ void Objecter::handle_osd_map(MOSDMap *m)
   for (list<LingerOp*>::iterator p = need_resend_linger.begin();
        p != need_resend_linger.end(); ++p) {
     LingerOp *op = *p;
-    if (!op->session) {
-      _calc_target(&op->target, nullptr);
-      OSDSession *s = NULL;
-      const int r = _get_session(op->target.osd, &s, sul);
-      ceph_assert(r == 0);
-      ceph_assert(s != NULL);
-      op->session = s;
-      put_session(s);
-    }
+    ceph_assert(op->session);
     if (!op->session->is_homeless()) {
       logger->inc(l_osdc_linger_resend);
       _send_linger(op, sul);