From 1ebbddca1c81d6e913972d3deb29b122e9d7ddc4 Mon Sep 17 00:00:00 2001 From: chunmei Liu Date: Tue, 5 Mar 2019 17:34:28 -0800 Subject: [PATCH] crimson/osd: correct the order of parameters passed to OSD::_preboot() Signed-off-by: chunmei Liu --- src/crimson/osd/osd.cc | 4 ++-- src/crimson/osd/osd.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc index 3133b591ca41a..1d0dbf89d7028 100644 --- a/src/crimson/osd/osd.cc +++ b/src/crimson/osd/osd.cc @@ -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) { diff --git a/src/crimson/osd/osd.h b/src/crimson/osd/osd.h index 6052c8406e34d..c5aff5e2dd35d 100644 --- a/src/crimson/osd/osd.h +++ b/src/crimson/osd/osd.h @@ -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> load_pg(spg_t pgid); -- 2.39.5