From c30fa85f1d256306fb5bafd7863bbcec98c43ddc Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Wed, 18 Sep 2019 12:17:56 -0700 Subject: [PATCH] crimson/osd: suppress warnings about unused future<> return values These are dropped on purpose, suppress warnings. Signed-off-by: Samuel Just --- src/crimson/osd/heartbeat.cc | 3 ++- src/crimson/osd/osd.cc | 8 +++++--- src/crimson/osd/pg.cc | 2 +- src/crimson/osd/pg.h | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/crimson/osd/heartbeat.cc b/src/crimson/osd/heartbeat.cc index 374d2e3e73f44..b778c08dd26b7 100644 --- a/src/crimson/osd/heartbeat.cc +++ b/src/crimson/osd/heartbeat.cc @@ -29,7 +29,8 @@ Heartbeat::Heartbeat(const ceph::osd::ShardServices& service, monc{monc}, front_msgr{front_msgr}, back_msgr{back_msgr}, - timer{[this] {send_heartbeats();}} + // do this in background + timer{[this] { (void)send_heartbeats(); }} {} seastar::future<> Heartbeat::start(entity_addrvec_t front_addrs, diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc index 7d2a5ad497574..ddd8742d1a74d 100644 --- a/src/crimson/osd/osd.cc +++ b/src/crimson/osd/osd.cc @@ -60,7 +60,8 @@ OSD::OSD(int id, uint32_t nonce, ceph::net::Messenger& hb_back_msgr) : whoami{id}, nonce{nonce}, - beacon_timer{[this] { send_beacon(); }}, + // do this in background + beacon_timer{[this] { (void)send_beacon(); }}, cluster_msgr{cluster_msgr}, public_msgr{public_msgr}, monc{new ceph::mon::Client{public_msgr, *this}}, @@ -70,7 +71,8 @@ OSD::OSD(int id, uint32_t nonce, local_conf().get_val("osd_data"))}, shard_services{*this, cluster_msgr, public_msgr, *monc, *mgrc, *store}, heartbeat{new Heartbeat{shard_services, *monc, hb_front_msgr, hb_back_msgr}}, - heartbeat_timer{[this] { update_heartbeat_peers(); }}, + // do this in background + heartbeat_timer{[this] { (void)update_heartbeat_peers(); }}, osdmap_gate("OSD::osdmap_gate", std::make_optional(std::ref(shard_services))) { osdmaps[0] = boost::make_local_shared(); @@ -1034,7 +1036,7 @@ OSD::get_or_create_pg( auto [fut, creating] = pg_map.get_pg(pgid, bool(info)); if (!creating && info) { pg_map.set_creating(pgid); - handle_pg_create_info(std::move(info)); + (void)handle_pg_create_info(std::move(info)); } return std::move(fut); } diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc index d9814108b797b..42a7688c3778a 100644 --- a/src/crimson/osd/pg.cc +++ b/src/crimson/osd/pg.cc @@ -113,7 +113,7 @@ PG::PG( PG::~PG() {} bool PG::try_flush_or_schedule_async() { - shard_services.get_store().do_transaction( + (void)shard_services.get_store().do_transaction( coll_ref, ObjectStore::Transaction()).then( [this, epoch=get_osdmap_epoch()]() { diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h index 689d78dd251f6..25d4a3b909808 100644 --- a/src/crimson/osd/pg.h +++ b/src/crimson/osd/pg.h @@ -158,11 +158,11 @@ public: void send_cluster_message( int osd, Message *m, epoch_t epoch, bool share_map_update=false) final { - shard_services.send_to_osd(osd, m, epoch); + (void)shard_services.send_to_osd(osd, m, epoch); } void send_pg_created(pg_t pgid) final { - shard_services.send_pg_created(pgid); + (void)shard_services.send_pg_created(pgid); } bool try_flush_or_schedule_async() final; -- 2.39.5