From a90f2671ba6248140ca3e0430377c0b0c17b4c27 Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 29 May 2019 17:31:42 -0700 Subject: [PATCH] PeeringState: permit init_from_disk_state to return a value This way it can return a future. Signed-off-by: Samuel Just --- src/osd/PeeringState.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/osd/PeeringState.h b/src/osd/PeeringState.h index 251a1e73526..d2466187607 100644 --- a/src/osd/PeeringState.h +++ b/src/osd/PeeringState.h @@ -1503,15 +1503,16 @@ public: /// Init pg instance from disk state template - void init_from_disk_state( + auto init_from_disk_state( pg_info_t &&info_from_disk, PastIntervals &&past_intervals_from_disk, F &&pg_log_init) { info = std::move(info_from_disk); last_written_info = info; past_intervals = std::move(past_intervals_from_disk); - pg_log_init(pg_log); + auto ret = pg_log_init(pg_log); log_weirdness(); + return ret; } /// Set initial primary/acting -- 2.39.5