From: Sage Weil <sage@redhat.com>
Date: Tue, 5 Apr 2016 13:45:04 +0000 (-0400)
Subject: osd: create rerequest_full_maps() helper
X-Git-Tag: v10.1.2~36^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2e22f54c5f7dfc4bec8c7a1bb2f0ca838ba20024;p=ceph.git

osd: create rerequest_full_maps() helper

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 1ed664fcb193..ce4276e88001 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4615,11 +4615,7 @@ void OSD::ms_handle_connect(Connection *con)
 
     // full map requests may happen while active or pre-boot
     if (requested_full_first) {
-      epoch_t first = requested_full_first;
-      epoch_t last = requested_full_last;
-      requested_full_first = 0;
-      requested_full_last = 0;
-      request_full_map(first, last);
+      rerequest_full_maps();
     }
   }
 }
diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 9c4d68c9812f..1ff5e468a7d0 100644
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -2050,6 +2050,13 @@ protected:
   epoch_t requested_full_first, requested_full_last;
 
   void request_full_map(epoch_t first, epoch_t last);
+  void rerequest_full_maps() {
+    epoch_t first = requested_full_first;
+    epoch_t last = requested_full_last;
+    requested_full_first = 0;
+    requested_full_last = 0;
+    request_full_map(first, last);
+  }
   void finish_full_map_request();
   void got_full_map(epoch_t e);