From ff453d80ffa57097a7da436ff94e6551b45be8aa Mon Sep 17 00:00:00 2001 From: Piotr Dulikowski Date: Thu, 27 May 2021 16:12:45 +0200 Subject: [PATCH] Revert "config: add wait_for_hint_replay_before_repair option" This reverts commit 86d831b319c487dbf6da5f3f04935b397b018de0. This commit removes the wait_for_hints_before_repair option. Because a previous commit in this series removes the logic from repair which caused it to wait for hints to be replayed, this option is now useless. We can safely remove this option because it is not present in any release yet. --- db/config.cc | 1 - db/config.hh | 1 - 2 files changed, 2 deletions(-) diff --git a/db/config.cc b/db/config.cc index 00897e100a..883edf0e04 100644 --- a/db/config.cc +++ b/db/config.cc @@ -738,7 +738,6 @@ db::config::config(std::shared_ptr exts) , replace_address_first_boot(this, "replace_address_first_boot", value_status::Used, "", "Like replace_address option, but if the node has been bootstrapped successfully it will be ignored. Same as -Dcassandra.replace_address_first_boot.") , override_decommission(this, "override_decommission", value_status::Used, false, "Set true to force a decommissioned node to join the cluster") , enable_repair_based_node_ops(this, "enable_repair_based_node_ops", liveness::LiveUpdate, value_status::Used, false, "Set true to use enable repair based node operations instead of streaming based") - , wait_for_hint_replay_before_repair(this, "wait_for_hint_replay_before_repair", liveness::LiveUpdate, value_status::Used, true, "If set to true, the cluster will first wait until the cluster sends its hints towards the nodes participating in repair before proceeding with the repair itself. This reduces the amount of data needed to be transferred during repair.") , ring_delay_ms(this, "ring_delay_ms", value_status::Used, 30 * 1000, "Time a node waits to hear from other nodes before joining the ring in milliseconds. Same as -Dcassandra.ring_delay_ms in cassandra.") , shadow_round_ms(this, "shadow_round_ms", value_status::Used, 300 * 1000, "The maximum gossip shadow round time. Can be used to reduce the gossip feature check time during node boot up.") , fd_max_interval_ms(this, "fd_max_interval_ms", value_status::Used, 2 * 1000, "The maximum failure_detector interval time in milliseconds. Interval larger than the maximum will be ignored. Larger cluster may need to increase the default.") diff --git a/db/config.hh b/db/config.hh index c87b813f9b..555cab4989 100644 --- a/db/config.hh +++ b/db/config.hh @@ -291,7 +291,6 @@ public: named_value replace_address_first_boot; named_value override_decommission; named_value enable_repair_based_node_ops; - named_value wait_for_hint_replay_before_repair; named_value ring_delay_ms; named_value shadow_round_ms; named_value fd_max_interval_ms;