commit 98a2ec27f281b1487f9b22f76706f8b74cd3e9ae
from: Alexander Turenko <alexander.turenko@tarantool.org>
via: Alexander Turenko <totktonada.ru@gmail.com>
date: Tue Oct 15 06:19:24 2024 UTC

config: simplify acquiring of configured UUIDs

No functional changes, just a little refactoring.

We don't need to spin a loop to look up instance/replicaset UUIDs for
the given instance.

In fact, these values are already acquired in the same function above,
reuse them.

NO_DOC=no functionality added or changed
NO_CHANGELOG=see NO_DOC
NO_TEST=see NO_DOC

(cherry picked from commit 4a237bc26c536c50c63fa859b4a279c1f5915f56)

commit - 94be5c18ae21d7d3577d7c48ceba4d924b893800
commit + 98a2ec27f281b1487f9b22f76706f8b74cd3e9ae
blob - cbc806d54ee006b6e01db27af83022218fa434c3
blob + b1c0901397346aa24867b4fdbe99375d7c5c24b0
--- src/box/lua/config/configdata.lua
+++ src/box/lua/config/configdata.lua
@@ -327,18 +327,6 @@ local function build_peers(instances, replicaset_name)
     end
 
     return res
-end
-
--- Returns instance_uuid and replicaset_uuid, saved in config.
-local function find_uuids_by_name(peers, instance_name)
-    for name, peer in pairs(peers) do
-        if name == instance_name then
-            local iconfig = peer.iconfig_def
-            return instance_config:get(iconfig, 'database.instance_uuid'),
-                   instance_config:get(iconfig, 'database.replicaset_uuid')
-        end
-    end
-    return nil
 end
 
 local function find_peer_name_by_uuid(peers, instance_uuid)
@@ -874,14 +862,12 @@ local function new(iconfig, cconfig, instance_name)
     -- and during config reload.
     local saved_names = find_saved_names(iconfig_def)
     if saved_names ~= nil then
-        local config_instance_uuid, config_replicaset_uuid =
-            find_uuids_by_name(peers, instance_name)
         validate_names(saved_names, {
             replicaset_name = found.replicaset_name,
             instance_name = instance_name,
             -- UUIDs from config, generated one should not be used here.
-            replicaset_uuid = config_replicaset_uuid,
-            instance_uuid = config_instance_uuid,
+            replicaset_uuid = replicaset_uuid,
+            instance_uuid = instance_uuid,
             peers = peers,
         }, iconfig_def)
     end