From cd80d6ff656d51f563cb6524386a65ff67b36619 Mon Sep 17 00:00:00 2001 From: Vladimir Krivopalov Date: Mon, 10 Sep 2018 15:38:38 -0700 Subject: [PATCH] database: Honour enable_sstables_mc_format configuration option. Only enable SSTables 'mc' format if the entire cluster supports it and it is enabled in the configuration file. Signed-off-by: Vladimir Krivopalov --- database.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/database.cc b/database.cc index dca99ebfbf..d2566e60ff 100644 --- a/database.cc +++ b/database.cc @@ -88,7 +88,9 @@ logging::logger dblog("database"); namespace { sstables::sstable::version_types get_highest_supported_format() { - if (service::get_local_storage_service().cluster_supports_la_sstable()) { + if (service::get_local_storage_service().cluster_supports_mc_sstable()) { + return sstables::sstable::version_types::mc; + } else if (service::get_local_storage_service().cluster_supports_la_sstable()) { return sstables::sstable::version_types::la; } else { return sstables::sstable::version_types::ka;