Merge pull request ceph#63425 from NitzanMordhai/wip-nitzan-osdmap-incremental-process-idle

objecter: request OSDMap after idle ticks

Author: NitzanMordhai

qa/tasks/mgr/dashboard/test_rgw.py

@@ -10,8 +10,7 @@
 from cryptography.hazmat.primitives.hashes import SHA1
 from cryptography.hazmat.primitives.twofactor.totp import TOTP
 
-from .helper import (DashboardTestCase, JLeaf, JList, JObj,
-                     skip_unless_dashboard_pr)
+from .helper import DashboardTestCase, JLeaf, JList, JObj
 
 logger = logging.getLogger(__name__)
 
@@ -67,7 +66,6 @@ def get_rgw_user(self, uid, stats=True):
         return self._get('/api/rgw/user/{}?stats={}'.format(uid, stats))
 
 
-@skip_unless_dashboard_pr
 class RgwSiteTest(RgwTestCase):
 
     AUTH_ROLES = ['rgw-manager']

src/osdc/Objecter.cc

@@ -2052,6 +2052,7 @@ void Objecter::maybe_request_map()
 
 void Objecter::_maybe_request_map()
 {
+  last_osdmap_request_time = ceph::coarse_mono_clock::now();
   // rwlock is locked
   int flag = 0;
   if (_osdmap_full_flag()
@@ -2238,8 +2239,20 @@ void Objecter::tick()
     if (found)
       toping.insert(s);
   }
+
   if (num_homeless_ops || !toping.empty()) {
     _maybe_request_map();
+  } else if (last_osdmap_request_time != ceph::coarse_mono_clock::time_point()) {
+    auto now = ceph::coarse_mono_clock::now();
+    auto elapsed = now - last_osdmap_request_time;
+    auto stale_window = ceph::make_timespan(cct->_conf->objecter_tick_interval) * 2;
+    if (elapsed > stale_window) {
+      double elapsed_s = std::chrono::duration<double>(elapsed).count();
+      double thresh_s  = std::chrono::duration<double>(stale_window).count();
+      ldout(cct, 10) << __func__ << ": osdmap stale: " << elapsed_s 
+        << "s > " << thresh_s << "s, maybe requesting map" << dendl;
+      _maybe_request_map();
+    }
   }
 
   logger->set(l_osdc_op_laggy, laggy_ops);

src/osdc/Objecter.h

@@ -2519,6 +2519,9 @@ class Objecter : public md_config_obs_t, public Dispatcher {
   ceph::timespan mon_timeout;
   ceph::timespan osd_timeout;
 
+  // last time osdmap was requested
+  ceph::coarse_mono_time last_osdmap_request_time;
+
   MOSDOp *_prepare_osd_op(Op *op);
   void _send_op(Op *op);
   void _send_op_account(Op *op);