From c2200622c714244c82711db7005acadcfaea5c3a Mon Sep 17 00:00:00 2001
From: landa <ostanevich.ilya@yandex.ru>
Date: Fri, 27 Feb 2026 16:02:54 +0300
Subject: [PATCH] deps: bump rocks

Bump rocks versions in Makefile up to the latest available version.
Updated `vshard_utils` because of newer vshard version.
---
 Makefile                               |  8 +--
 sharded_queue/storage/vshard_utils.lua | 76 ++++++++++++++++++++++++--
 2 files changed, 74 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 93dd5f0..75a0888 100644
--- a/Makefile
+++ b/Makefile
@@ -39,19 +39,19 @@ build:
 
 .PHONY: deps
 deps:
-	$(TTCTL) rocks install vshard 0.1.26
+	$(TTCTL) rocks install vshard 0.1.40
 	$(TTCTL) rocks install luacheck 0.26.0
 	$(TTCTL) rocks install luacov 0.13.0
 	$(TTCTL) rocks install luacov-coveralls 0.2.3-1 --server=http://luarocks.org
-	$(TTCTL) rocks install luatest 1.0.1
+	$(TTCTL) rocks install luatest 1.4.0
 
 .PHONY: deps-cartridge
 deps-cartridge: deps-cartridge
-	$(TTCTL) rocks install cartridge 2.9.0
+	$(TTCTL) rocks install cartridge 2.16.6
 
 .PHONY: deps-metrics
 deps-metrics: deps-metrics
-	$(TTCTL) rocks install metrics 1.0.0
+	$(TTCTL) rocks install metrics 1.6.2
 
 .PHONY: lint
 lint:
diff --git a/sharded_queue/storage/vshard_utils.lua b/sharded_queue/storage/vshard_utils.lua
index 98f359d..6bb16fe 100644
--- a/sharded_queue/storage/vshard_utils.lua
+++ b/sharded_queue/storage/vshard_utils.lua
@@ -1,5 +1,5 @@
 -- The source is copied from:
--- https://github.com/tarantool/crud/blob/99315a53ef75056ac057b63f5ce1bbadef6a1418/crud/common/vshard_utils.lua
+-- https://github.com/tarantool/crud/blob/bcff8066201b9e14d54230f3a74500e5eebd3695/crud/common/vshard_utils.lua
 
 local luri = require('uri')
 
@@ -7,15 +7,48 @@ local vshard = require('vshard')
 
 local vshard_utils = {}
 
+-- get_replicasets returns vshard replicasets from vshard.storage.internal
+-- copy pasted from https://github.com/tarantool/vshard/blob/9ad0e2726a5137398f50fe88ac105f53e446c3e2/vshard/storage/init.lua#L3962-L3984
+-- todo: remove after https://github.com/tarantool/vshard/issues/565 closed
+local function get_replicasets()
+    local ireplicasets = {}
+    local M = vshard.storage.internal
+    local is_named = M.this_replica.id == M.this_replica.name
+    for id, replicaset in pairs(M.replicasets) do
+        local master = replicaset.master
+        local master_info
+        if replicaset.is_master_auto then
+            master_info = 'auto'
+        elseif not master then
+            master_info = 'missing'
+        else
+            local uri = master:safe_uri()
+            local conn = master.conn
+            master_info = {
+                uri = uri, uuid = conn and conn.peer_uuid,
+                name = is_named and master.name or nil,
+                state = conn and conn.state, error = conn and conn.error,
+            }
+        end
+        ireplicasets[id] = {
+            uuid = replicaset.uuid,
+            name = is_named and replicaset.name or nil,
+            master = master_info,
+        }
+    end
+    return ireplicasets
+end
+
 function vshard_utils.get_self_vshard_replicaset()
-    local box_info = box.info()
+    local box_info = vshard_utils.__get_box_info()
 
-    local ok, storage_info = pcall(vshard.storage.info)
+    local ok, storage_info = vshard_utils.__get_storage_info()
     assert(ok, 'vshard.storage.cfg() must be called first')
 
-    if vshard_utils.get_vshard_identification_mode() == 'name_as_key' then
-        local replicaset_name = box_info.replicaset.name
+    local is_needs_upgrade_2_11 = vshard_utils.is_schema_needs_upgrade_from_2_11()
 
+    if vshard_utils.get_vshard_identification_mode() == 'name_as_key' and not is_needs_upgrade_2_11 then
+        local replicaset_name = box_info.replicaset.name
         return replicaset_name, storage_info.replicasets[replicaset_name]
     else
         local replicaset_uuid
@@ -25,7 +58,38 @@ function vshard_utils.get_self_vshard_replicaset()
             replicaset_uuid = box_info.cluster.uuid
         end
 
-        return replicaset_uuid, storage_info.replicasets[replicaset_uuid]
+        for _, rep in pairs(storage_info.replicasets) do
+            if rep.uuid == replicaset_uuid then
+                return replicaset_uuid, rep
+            end
+        end
+        error(('failed to find replicaset by uuid %s'):format(replicaset_uuid))
+    end
+end
+
+-- for unit tests
+function vshard_utils.__get_storage_info()
+    -- cartridge disable vshard.storage on the very first apply_config
+    -- here we check this and do not call vshard.storage.info
+    -- todo: remove after https://github.com/tarantool/vshard/issues/565 closed
+    if vshard.storage.internal.is_enabled == false then
+        return true, {
+            replicasets = get_replicasets(),
+        }
+    end
+    return pcall(vshard.storage.info)
+end
+
+-- for unit tests
+function vshard_utils.__get_box_info()
+    return box.info()
+end
+
+function vshard_utils.is_schema_needs_upgrade_from_2_11()
+    local version_tup = box.space._schema:get({'version'})
+    local version_str = ("%s.%s"):format(version_tup[2], version_tup[3])
+    if version_str == "2.11" and box.internal.schema_needs_upgrade() then
+        return true
     end
 end