From 7634ed39ebb3fcf2ec0bdc80461ffd703d34a42a Mon Sep 17 00:00:00 2001 From: Amos Kong Date: Tue, 12 Dec 2017 09:57:29 +0000 Subject: [PATCH] Reset default cluster_name back to 'Test Cluster' for compatibility There are some users used original default cluster_name 'Test Cluster', they will fail to start the node for cluster_name change if they use new scylla.yaml. 'ScyllaDB Cluster' isn't more beautiful than 'Test Cluster', reset back to original old to avoid problem for users. Fixes #3060 Signed-off-by: Amos Kong Message-Id: <8c9dab8a64d0f4ab3a5d6910b87af696c60e5076.1513072453.git.amos@scylladb.com> (cherry picked from commit b07de93636804cae869fbc74cbf71fe5f0cb447b) --- conf/scylla.yaml | 2 +- main.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/scylla.yaml b/conf/scylla.yaml index a885f3c728..202ebd4927 100644 --- a/conf/scylla.yaml +++ b/conf/scylla.yaml @@ -14,7 +14,7 @@ # one logical cluster from joining another. # It is recommended to change the default value when creating a new cluster. # You can NOT modify this value for an existing cluster -#cluster_name: 'ScyllaDB Cluster' +#cluster_name: 'Test Cluster' # This defines the number of tokens randomly assigned to this node on the ring # The more tokens, relative to other nodes, the larger the proportion of data diff --git a/main.cc b/main.cc index 1976a757da..eaa6c6af98 100644 --- a/main.cc +++ b/main.cc @@ -499,7 +499,7 @@ int main(int ac, char** av) { auto prio = get_or_default(ssl_opts, "priority_string", sstring()); auto clauth = is_true(get_or_default(ssl_opts, "require_client_auth", "false")); if (cluster_name.empty()) { - cluster_name = "ScyllaDB Cluster"; + cluster_name = "Test Cluster"; startlog.warn("Using default cluster name is not recommended. Using a unique cluster name will reduce the chance of adding nodes to the wrong cluster by mistake"); } init_ms_fd_gossiper(listen_address