From: Sage Weil <sage@redhat.com>
Date: Thu, 12 Oct 2017 20:49:00 +0000 (-0500)
Subject: osdc/Objecter: rename _scan_requests force_resend -> skipped_map
X-Git-Tag: v13.0.2~844^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b1b8fc67388e1b28d8adabcf241bfbca51db2dfd;p=ceph.git

osdc/Objecter: rename _scan_requests force_resend -> skipped_map

This is what the caller is passing.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 2dad8238cb11..df3d2f5a8855 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -1022,7 +1022,7 @@ bool Objecter::ms_dispatch(Message *m)
 }
 
 void Objecter::_scan_requests(OSDSession *s,
-			      bool force_resend,
+			      bool skipped_map,
 			      bool cluster_full,
 			      map<int64_t, bool> *pool_full_map,
 			      map<ceph_tid_t, Op*>& need_resend,
@@ -1052,7 +1052,7 @@ void Objecter::_scan_requests(OSDSession *s,
 	(*pool_full_map)[op->target.base_oloc.pool];
     switch (r) {
     case RECALC_OP_TARGET_NO_ACTION:
-      if (!force_resend && !force_resend_writes)
+      if (!skipped_map && !force_resend_writes)
 	break;
       // -- fall-thru --
     case RECALC_OP_TARGET_NEED_RESEND:
@@ -1086,7 +1086,7 @@ void Objecter::_scan_requests(OSDSession *s,
 			 op->session ? op->session->con.get() : nullptr);
     switch (r) {
     case RECALC_OP_TARGET_NO_ACTION:
-      if (!force_resend && !(force_resend_writes && op->respects_full()))
+      if (!skipped_map && !(force_resend_writes && op->respects_full()))
 	break;
       // -- fall-thru --
     case RECALC_OP_TARGET_NEED_RESEND:
@@ -1116,7 +1116,7 @@ void Objecter::_scan_requests(OSDSession *s,
     switch (r) {
     case RECALC_OP_TARGET_NO_ACTION:
       // resend if skipped map; otherwise do nothing.
-      if (!force_resend && !force_resend_writes)
+      if (!skipped_map && !force_resend_writes)
 	break;
       // -- fall-thru --
     case RECALC_OP_TARGET_NEED_RESEND:
diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 110055a7feb3..f50af90cebb3 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -2082,7 +2082,7 @@ private:
   void unset_osdmap_full_try() { osdmap_full_try = false; }
 
   void _scan_requests(OSDSession *s,
-		      bool force_resend,
+		      bool skipped_map,
 		      bool cluster_full,
 		      map<int64_t, bool> *pool_full_map,
 		      map<ceph_tid_t, Op*>& need_resend,