Revert "Objecter: add op->resend_on_any_change"

This reverts commit c53194d75390dd6d5aa4a9a33f741cbd106e3338.

recalc_linger_op_target is used for linger_ops

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 8f6e9f218135699bd1108f56cc8a70295ad2103c..bc3ccececca7688d68d38f3dc6ecf447acfead66 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -257,7 +257,6 @@ void Objecter::send_linger(LingerOp *info)
                   onack, oncommit,
                   info->pobjver);
     o->snapid = info->snap;
-    o->resend_on_any_change = true;
 
     if (info->session) {
       int r = recalc_op_target(o);
@@ -982,9 +981,7 @@ int Objecter::recalc_op_target(Op *op)
   }
   osdmap->pg_to_acting_osds(pgid, acting);
 
-  if (op->pgid != pgid || is_pg_changed(op->acting, acting,
-                                       (op->resend_on_any_change ||
-                                        op->used_replica))) {
+  if (op->pgid != pgid || is_pg_changed(op->acting, acting, op->used_replica)) {
     op->pgid = pgid;
     op->acting = acting;
     ldout(cct, 10) << "recalc_op_target tid " << op->tid

diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index b2ad2e33c28ca266d8101749bbeedd88796d97b6..5ab242ca80f18145dbc871c5f9d9507ba6b02c4e 100644 (file)
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -570,7 +570,6 @@ public:
     pg_t pgid;
     vector<int> acting;
     bool used_replica;
-    bool resend_on_any_change;
 
     Connection *con;  // for rx buffer only
 
@@ -603,7 +602,7 @@ public:
        int f, Context *ac, Context *co, eversion_t *ov) :
       session(NULL), session_item(this), incarnation(0),
       oid(o), oloc(ol),
-      used_replica(false), resend_on_any_change(false), con(NULL),
+      used_replica(false), con(NULL),
       snapid(CEPH_NOSNAP),
       outbl(NULL),
       flags(f), priority(0), onack(ac), oncommit(co),