osd: change how we work around an interface limitation.

If this had ever actually been triggered we would have hit an assert
in the OpRequest destructor that op->request is non-NULL.

Signed-off-by: Greg Farnum <greg@inktank.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 5b448a5ccb9..da7e138227d 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5927,11 +5927,16 @@ void OSD::handle_pg_create(OpRequestRef op)
     }
   }
 
-  if (!require_mon_peer(op->request)) {
-    // we have to hack around require_mon_peer's interface limits
-    op->request = NULL;
+  /* we have to hack around require_mon_peer's interface limits, so
+   * grab an extra reference before going in. If the peer isn't
+   * a Monitor, the reference is put for us (and then cleared
+   * up automatically by our OpTracker infrastructure). Otherwise,
+   * we put the extra ref ourself.
+   */
+  if (!require_mon_peer(op->request->get())) {
     return;
   }
+  op->request->put();
 
   if (!require_same_or_newer_map(op, m->epoch)) return;