bump: vshard 0.1.34, cartridge 2.16.0

(cherry picked from commit 47631804f3f19b1b85bc32908dbba6e4f520df36)

Author: Александр Вахов

Makefile

@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 
 S3_TARANTOOL_SDK_3_PATH := s3://packages/enterprise/release/linux/x86_64/3.3/tarantool-enterprise-sdk-gc64-3.3.1-0-r55.linux.x86_64.tar.gz
-S3_TARANTOOL_SDK_2_PATH := s3://packages/enterprise/release/linux/x86_64/2.11/tarantool-enterprise-sdk-gc64-2.11.6-0-r677.linux.x86_64.tar.gz
+S3_TARANTOOL_SDK_2_PATH := s3://packages/enterprise/release/linux/x86_64/2.11/tarantool-enterprise-sdk-gc64-2.11.7-0-r689.linux.x86_64.tar.gz
 S3_ENDPOINT_URL := $(if $(S3_ENDPOINT_URL),$(S3_ENDPOINT_URL),https://hb.vkcs.cloud)
 
 SDK_TEST := $(if $(SDK_TEST),$(SDK_TEST),sdk-3)
@@ -14,8 +14,8 @@ SDK_TEST := $(if $(SDK_TEST),$(SDK_TEST),sdk-3)
 	tt rocks install luacov-reporters 0.1.0 --only-server=sdk-2/rocks && \
 	tt rocks install metrics  1.1.0 --only-server=sdk-2/rocks && \
 	tt rocks install ddl-ee 1.8.0 --only-server=sdk-2/rocks && \
-	tt rocks install cartridge 2.15.1 --only-server=sdk-2/rocks && \
-	tt rocks install migrations-ee 1.3.1 --only-server=sdk-2/rocks && \
+	tt rocks install cartridge 2.16.0 --only-server=sdk-2/rocks && \
+	tt rocks install migrations-ee 1.3.2 --only-server=sdk-2/rocks && \
 	tt rocks make
 
 sdk-2:

crud/common/vshard_utils.lua

@@ -4,18 +4,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 = vshard_utils.__get_box_info()
 
     local ok, storage_info = vshard_utils.__get_storage_info()
     assert(ok, 'vshard.storage.cfg() must be called first')
 
-
     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
@@ -36,6 +66,14 @@ 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