wip

Closes tarantool#8539

src/box/box.cc

@@ -1326,7 +1326,7 @@ box_check_instance_uuid(struct tt_uuid *uuid)
 
 /** Fetch an optional node name from the config. */
 static int
-box_check_node_name(const char *cfg_name, char *out)
+box_check_node_name(const char *cfg_name, char *out, bool set_diag)
 {
 	const char *name = cfg_gets(cfg_name);
 	if (name == NULL) {
@@ -1335,8 +1335,10 @@ box_check_node_name(const char *cfg_name, char *out)
 	}
 	/* Nil name is allowed as Lua box.NULL or nil. Not as "". */
 	if (!node_name_is_valid(name)) {
-		diag_set(ClientError, ER_CFG, cfg_name,
-			 "expected a valid name");
+		if (set_diag) {
+			diag_set(ClientError, ER_CFG, cfg_name,
+				 "expected a valid name");
+		}
 		return -1;
 	}
 	strlcpy(out, name, NODE_NAME_SIZE_MAX);
@@ -1346,7 +1348,7 @@ box_check_node_name(const char *cfg_name, char *out)
 static int
 box_check_instance_name(char *out)
 {
-	return box_check_node_name("instance_name", out);
+	return box_check_node_name("instance_name", out, true);
 }
 
 static int
@@ -1383,21 +1385,23 @@ box_check_bootstrap_leader(struct uri *uri, struct tt_uuid *uuid)
 	/* Not a uri. Try uuid then. */
 	if (box_check_uuid(uuid, "bootstrap_leader", false) == 0)
 		return 0;
+	if (box_check_node_name("bootstrap_leader", name, false) == 0)
+		return 0;
 	diag_set(ClientError, ER_CFG, "bootstrap_leader",
-		 "the value must be either a uri or a uuid");
+		 "the value must be either a uri, a uuid or a name");
 	return -1;
 }
 
 static int
 box_check_replicaset_name(char *out)
 {
-	return box_check_node_name("replicaset_name", out);
+	return box_check_node_name("replicaset_name", out, true);
 }
 
 static int
 box_check_cluster_name(char *out)
 {
-	return box_check_node_name("cluster_name", out);
+	return box_check_node_name("cluster_name", out, true);
 }
 
 static enum wal_mode
@@ -1878,7 +1882,8 @@ static int
 box_set_bootstrap_leader(void)
 {
 	return box_check_bootstrap_leader(&cfg_bootstrap_leader_uri,
-					  &cfg_bootstrap_leader_uuid);
+					  &cfg_bootstrap_leader_uuid,
+					  cfg_bootstrap_leader_name);
 }
 
 /** Persist this instance as the bootstrap leader in _schema space. */

src/box/replication.cc

@@ -65,6 +65,7 @@ int replication_threads = 1;
 bool cfg_replication_anon = true;
 struct tt_uuid cfg_bootstrap_leader_uuid;
 struct uri cfg_bootstrap_leader_uri;
+char cfg_bootstrap_leader_name[NODE_NAME_SIZE_MAX];
 char cfg_instance_name[NODE_NAME_SIZE_MAX];
 
 struct replicaset replicaset;
@@ -956,6 +957,10 @@ applier_is_bootstrap_leader(const struct applier *applier)
 			return uri_addr_is_equal(&applier->uri,
 						 &cfg_bootstrap_leader_uri);
 		}
+		if (*cfg_bootstrap_leader_name != '\0') {
+			return strcmp(applier->ballot.instance_name,
+				      cfg_bootstrap_leader_name);
+		}
 	} else if (bootstrap_strategy == BOOTSTRAP_STRATEGY_SUPERVISED) {
 		return tt_uuid_is_equal(&applier->ballot.bootstrap_leader_uuid,
 					&applier->uuid);
@@ -1448,8 +1453,9 @@ replicaset_find_join_master_cfg(void)
 		if (applier_is_bootstrap_leader(applier))
 			leader = replica;
 	}
-	if (leader == NULL && !tt_uuid_is_equal(&cfg_bootstrap_leader_uuid,
-						&INSTANCE_UUID)) {
+	if (leader == NULL &&
+	    strcmp(cfg_bootstrap_leader_name, INSTANCE_NAME) != 0 &&
+	    !tt_uuid_is_equal(&cfg_bootstrap_leader_uuid, &INSTANCE_UUID)) {
 		tnt_raise(ClientError, ER_CFG, "bootstrap_leader",
 			  "failed to connect to the bootstrap leader");
 	}

src/box/replication.h

@@ -137,6 +137,12 @@ extern struct tt_uuid cfg_bootstrap_leader_uuid;
  */
 extern struct uri cfg_bootstrap_leader_uri;
 
+/**
+ * The name of the bootstrap leader configured via the bootstrap_leader
+ * configuration option.
+ */
+extern char cfg_botstrap_leader_name[];
+
 /**
  * Configured name of this instance. Might be different from the actual name if
  * the configuration is not fully applied yet.