From 7fd0d2a5db962c3daca8c3c5f99738c71d952ae8 Mon Sep 17 00:00:00 2001
From: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Date: Fri, 24 Mar 2023 12:08:14 +0100
Subject: [PATCH] box: validate global ids after boot in one func
The new function check_global_ids_integrity() checks that the
replicaset UUID specified in the config and found in the data
match. Instance UUID is created at bootstrap and validated at the
beginning of recovery, not in the end. Hence not checked here.
For now this function is not very useful, but soon there will be
more global IDs stored in WAL which will need validation.
Needed for #5029
NO_DOC=refactoring
NO_CHANGELOG=refactoring
NO_TEST=already covered
---
src/box/box.cc | 47 +++++++++++++++++++++++------------------------
1 file changed, 23 insertions(+), 24 deletions(-)
diff --git a/src/box/box.cc b/src/box/box.cc
index 315f489bb8..81b947a846 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -4315,6 +4315,24 @@ check_bootstrap_unanimity(void)
}
}
+/** Ensure the configured and stored global identifiers (UUID) match. */
+static int
+check_global_ids_integrity(void)
+{
+ struct tt_uuid replicaset_uuid;
+ if (box_check_replicaset_uuid(&replicaset_uuid) != 0)
+ return -1;
+
+ if (!tt_uuid_is_nil(&replicaset_uuid) &&
+ !tt_uuid_is_equal(&replicaset_uuid, &REPLICASET_UUID)) {
+ diag_set(ClientError, ER_REPLICASET_UUID_MISMATCH,
+ tt_uuid_str(&replicaset_uuid),
+ tt_uuid_str(&REPLICASET_UUID));
+ return -1;
+ }
+ return 0;
+}
+
/**
* Initialize the first replica of a new replica set.
*/
@@ -4458,9 +4476,6 @@ bootstrap(bool *is_bootstrap_leader)
struct tt_uuid instance_uuid;
if (box_check_instance_uuid(&instance_uuid) != 0)
diag_raise();
- struct tt_uuid replicaset_uuid;
- if (box_check_replicaset_uuid(&replicaset_uuid) != 0)
- diag_raise();
assert(tt_uuid_is_nil(&INSTANCE_UUID));
if (!tt_uuid_is_nil(&instance_uuid))
@@ -4517,15 +4532,9 @@ bootstrap(bool *is_bootstrap_leader)
*is_bootstrap_leader = true;
break;
}
-
- bool is_bootstrapped = bootstrap_from_master(master);
- if (is_bootstrapped && !tt_uuid_is_nil(&replicaset_uuid) &&
- !tt_uuid_is_equal(&replicaset_uuid, &REPLICASET_UUID)) {
- tnt_raise(ClientError, ER_REPLICASET_UUID_MISMATCH,
- tt_uuid_str(&replicaset_uuid),
- tt_uuid_str(&REPLICASET_UUID));
- }
- if (is_bootstrapped) {
+ if (bootstrap_from_master(master)) {
+ if (check_global_ids_integrity() != 0)
+ diag_raise();
*is_bootstrap_leader = false;
break;
}
@@ -4553,9 +4562,6 @@ local_recovery(const struct vclock *checkpoint_vclock)
struct tt_uuid instance_uuid;
if (box_check_instance_uuid(&instance_uuid) != 0)
diag_raise();
- struct tt_uuid replicaset_uuid;
- if (box_check_replicaset_uuid(&replicaset_uuid) != 0)
- diag_raise();
replicaset_state = REPLICASET_RECOVERY;
if (!tt_uuid_is_nil(&instance_uuid) &&
@@ -4748,15 +4754,8 @@ local_recovery(const struct vclock *checkpoint_vclock)
diag_raise();
engine_end_recovery_xc();
-
- /* Check replica set UUID. */
- if (!tt_uuid_is_nil(&replicaset_uuid) &&
- !tt_uuid_is_equal(&replicaset_uuid, &REPLICASET_UUID)) {
- tnt_raise(ClientError, ER_REPLICASET_UUID_MISMATCH,
- tt_uuid_str(&replicaset_uuid),
- tt_uuid_str(&REPLICASET_UUID));
- }
-
+ if (check_global_ids_integrity() != 0)
+ diag_raise();
box_run_on_recovery_state(RECOVERY_STATE_WAL_RECOVERED);
}
--
GitLab