From 587fd9b6c0e7892aa3e12233df4cb95f2fac9cc2 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@scylladb.com>
Date: Mon, 3 Dec 2018 01:19:33 +0200
Subject: [PATCH] gossiper: maybe enable features after start_gossiping()

Since we may now start with features already registered, we need to enable
features immediately after gossip is started. This case happens in a cluster
that already is fully upgraded on startup. Before this series, features were
only added after this point.
---
 gms/gossiper.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gms/gossiper.cc b/gms/gossiper.cc
index 6ff95fb66e..2460c3a087 100644
--- a/gms/gossiper.cc
+++ b/gms/gossiper.cc
@@ -1601,6 +1601,10 @@ future<> gossiper::start_gossiping(int generation_nbr, std::map<application_stat
         return replicate(get_broadcast_address(), local_state).then([] {
             //notify snitches that Gossiper is about to start
             return locator::i_endpoint_snitch::get_local_snitch_ptr()->gossiper_starting();
+        }).then([this] {
+            return async([this] {
+                maybe_enable_features();
+            });
         }).then([this, generation] {
             logger.trace("gossip started with generation {}", generation);
             _enabled = true;