From: Greg Farnum <greg@inktank.com>
Date: Fri, 20 Sep 2013 00:11:04 +0000 (-0700)
Subject: OpTracker: demand that a TrackedOp gets to own its Message for life.
X-Git-Tag: v0.72-rc1~93^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2d633bb209f0ba85d581783fec9bd10fb280e4f;p=ceph.git

OpTracker: demand that a TrackedOp gets to own its Message for life.

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

diff --git a/src/common/TrackedOp.h b/src/common/TrackedOp.h
index 5d2abf591c4..94eb4e3f71e 100644
--- a/src/common/TrackedOp.h
+++ b/src/common/TrackedOp.h
@@ -140,7 +140,7 @@ protected:
   virtual void init_from_message() {};
 
 public:
-  virtual ~TrackedOp() { if (request) request->put(); }
+  virtual ~TrackedOp() { assert(request); request->put(); }
 
   utime_t get_arrived() const {
     return received_time;
diff --git a/src/osd/OpRequest.h b/src/osd/OpRequest.h
index 9a40c1be219..88c4e7d4bc2 100644
--- a/src/osd/OpRequest.h
+++ b/src/osd/OpRequest.h
@@ -75,10 +75,6 @@ private:
   OpRequest(Message *req, OpTracker *tracker);
 
 public:
-  ~OpRequest() {
-    assert(request);
-  }
-
   bool been_queued_for_pg() { return hit_flag_points & flag_queued_for_pg; }
   bool been_reached_pg() { return hit_flag_points & flag_reached_pg; }
   bool been_delayed() { return hit_flag_points & flag_delayed; }