]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osdc/Objecter: release message if it is not handled 16293/head
authorKefu Chai <kchai@redhat.com>
Fri, 23 Jun 2017 16:50:40 +0000 (00:50 +0800)
committerNathan Cutler <ncutler@suse.com>
Wed, 6 Sep 2017 04:18:28 +0000 (06:18 +0200)
Fixes: http://tracker.ceph.com/issues/19741
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 5c2774234c20d809d56d005b4db34070f3029684)

Conflicts:
   src/osdc/Objecter.h (in master, ms_fast_dispatch function declaration has an
                       "override" specifier; in jewel, this specifier is missing)

src/osdc/Objecter.h

index 8167306dd8517c02da6596d1748cd14440a15883..2955a071e7d897fb61051764930c8ca8ec6fa037 100644 (file)
@@ -2057,7 +2057,9 @@ private:
     }
   }
   void ms_fast_dispatch(Message *m) {
-    ms_dispatch(m);
+    if (!ms_dispatch(m)) {
+      m->put();
+    }
   }
 
   void handle_osd_op_reply(class MOSDOpReply *m);