]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
crimson/osd: correct the order of parameters passed to OSD::_preboot()
authorchunmei Liu <chunmei.liu@intel.com>
Wed, 6 Mar 2019 01:34:28 +0000 (17:34 -0800)
committerchunmei Liu <chunmei.liu@intel.com>
Wed, 6 Mar 2019 01:34:28 +0000 (17:34 -0800)
Signed-off-by: chunmei Liu <chunmei.liu@intel.com>
src/crimson/osd/osd.cc
src/crimson/osd/osd.h

index 3133b591ca41a8d4b33ce66e01b8416d1ce1a43d..1d0dbf89d702862f1b7f5e1e763f386646bd8448 100644 (file)
@@ -222,11 +222,11 @@ seastar::future<> OSD::start_boot()
 {
   state.set_preboot();
   return monc->get_version("osdmap").then([this](version_t newest, version_t oldest) {
-    return _preboot(newest, oldest);
+    return _preboot(oldest, newest);
   });
 }
 
-seastar::future<> OSD::_preboot(version_t newest, version_t oldest)
+seastar::future<> OSD::_preboot(version_t oldest, version_t newest)
 {
   logger().info("osd.{}: _preboot", whoami);
   if (osdmap->get_epoch() == 0) {
index 6052c8406e34dd3075a91df6ec7936980c15e3ac..c5aff5e2dd35de4ea00a01b0e16a26dc89c8baef 100644 (file)
@@ -91,7 +91,7 @@ public:
 
 private:
   seastar::future<> start_boot();
-  seastar::future<> _preboot(version_t newest_osdmap, version_t oldest_osdmap);
+  seastar::future<> _preboot(version_t oldest_osdmap, version_t newest_osdmap);
   seastar::future<> _send_boot();
 
   seastar::future<Ref<PG>> load_pg(spg_t pgid);