From ef20d4ee592368c0dc03346fd0f2f0b5ed1bb4bd Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Fri, 23 Apr 2021 11:33:04 +0300 Subject: [PATCH] migration_manager: Turn do_announce_new_type non-static It's the only place that calls recently patched .announce() method, so instead of grabbing global migration manager, use 'this'. Signed-off-by: Pavel Emelyanov --- service/migration_manager.cc | 8 ++++---- service/migration_manager.hh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/service/migration_manager.cc b/service/migration_manager.cc index 03b5ff3920..689cd30e8c 100644 --- a/service/migration_manager.cc +++ b/service/migration_manager.cc @@ -637,9 +637,9 @@ future<> migration_manager::include_keyspace_and_announce( const keyspace_metadata& keyspace, std::vector mutations) { // Include the serialized keyspace in case the target node missed a CREATE KEYSPACE migration (see CASSANDRA-5631). return db::schema_tables::read_keyspace_mutation(service::get_storage_proxy(), keyspace.name()) - .then([mutations = std::move(mutations)] (mutation m) mutable { + .then([this, mutations = std::move(mutations)] (mutation m) mutable { mutations.push_back(std::move(m)); - return get_local_migration_manager().announce(std::move(mutations)); + return announce(std::move(mutations)); }); } @@ -664,7 +664,7 @@ future<> migration_manager::announce_new_column_family(schema_ptr cfm, api::time auto mutations = db::schema_tables::make_create_table_mutations(ksm, cfm, timestamp); get_notifier().before_create_column_family(*cfm, mutations, timestamp); return mutations; - }).then([ksm](std::vector mutations) { + }).then([this, ksm](std::vector mutations) { return include_keyspace_and_announce(*ksm, std::move(mutations)); }); } catch (const no_such_keyspace& e) { @@ -702,7 +702,7 @@ future<> migration_manager::announce_column_family_update(schema_ptr cfm, bool f get_notifier().before_update_column_family(*cfm, *old_schema, mutations, ts); return mutations; - }).then([keyspace] (auto&& mutations) { + }).then([this, keyspace] (auto&& mutations) { return include_keyspace_and_announce(*keyspace, std::move(mutations)); }); } catch (const no_such_column_family& e) { diff --git a/service/migration_manager.hh b/service/migration_manager.hh index 69fdbb0917..89bcc0e3ad 100644 --- a/service/migration_manager.hh +++ b/service/migration_manager.hh @@ -169,10 +169,10 @@ public: private: future<> uninit_messaging_service(); - static future<> include_keyspace_and_announce( + future<> include_keyspace_and_announce( const keyspace_metadata& keyspace, std::vector mutations); - static future<> do_announce_new_type(user_type new_type); + future<> do_announce_new_type(user_type new_type); future<> push_schema_mutation(const gms::inet_address& endpoint, const std::vector& schema); };