sync: port EE changes (code, tests, docs) into CE branch

vakhov · vakhov · commit b7841547b799 · 2025-09-09T13:34:07.000+05:00
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,9 @@ luacov.stats.out
 build/*.cmake
 build/Makefile
 .idea
+sdk
+sdk-2
+sdk-3
 
 # Vim Swap files.
 .*.s[a-w][a-z]
diff --git a/.luacheckrc b/.luacheckrc
@@ -1,6 +1,6 @@
 redefined = false
 globals = {'box', 'utf8', 'checkers', '_TARANTOOL'}
 include_files = {'**/*.lua', '*.luacheckrc', '*.rockspec'}
-exclude_files = {'**/*.rocks/', 'tmp/', 'tarantool-enterprise/'}
+exclude_files = {'**/*.rocks/', 'tmp/', 'sdk-*'}
 max_line_length = 120
 max_comment_line_length = 150
diff --git a/.luacov b/.luacov
@@ -1,4 +1,12 @@
+local ci_node_index = os.getenv("CI_NODE_INDEX") or ""
+
+statsfile = "luacov.stats" .. ci_node_index .. ".out"
 exclude = {
-    '/test/',
-    '/.rocks/',
+    "test"
+}
+include = {
+    "crud%/.+$",
+    "crud.lua",
+    "roles%/.+$",
+    "cartridge%/.+$",
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,24 +8,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased]
 
 ### Changed
-* bumped: metrics version in rockspec
-* bumped: cartridge version in rockspec
-* bumped: vshard version in rockspec
-* Role model support in CRUD is provided (https://jira.vk.team/browse/TNTP-2177)
+* bumped: vshard version in rockspec.
+* Role model support in CRUD is provided ([commit](https://github.com/tarantool/crud/pull/453/commits/379f7e0a133b3ad8763885b51626e7d30b2920ee)).
 
 ### Added
 * Validation of `bucket_id`. Invalid values now raise `BucketIDError`
-  before routing. [TNTP-3536](https://jira.vk.team/browse/TNTP-3536)
+  before routing ([commit](https://github.com/tarantool/crud/pull/453/commits/3019e76a09200b0c12523b0b5221350ae8a0a8b4)).
 
 ### Fixed
-* Fixed compatibility with cartridge `2.16.0` ([TNTP-3598](https://jira.vk.team/browse/TNTP-3598))
+* Fixed compatibility with cartridge `2.16.0`.
 * `crud.schema` no longer returns TCF system space `_cdc_state`.
 * `crud.schema` no longer returns system space `_gc_consumers` with Tarantool 3.2+.
 * `crud.schema` no longer returns `tt` system space `_tt_migrations`.
 * Tests of `schema` with Tarantool 3.2+.
 * Fixed bad error handling for method `call.single`
 * Added support for working in 3.1 with data from 2.11, previously there was an error
-due to the inability to find the replicasets by name https://github.com/tarantool/crud-ee/issues/16
+due to the inability to find the replicasets by name ([commit](https://github.com/tarantool/crud/pull/453/commits/fdce364254a234fb8db9ed1bab9bbe0d3c9d3e17)).
 
 ## [1.5.2] - 20-05-24
 
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2020-2024 crud AUTHORS: please see the AUTHORS file.
+Copyright 2020-2025 crud AUTHORS: please see the AUTHORS file.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
diff --git a/Makefile b/Makefile
@@ -5,15 +5,13 @@ S3_TARANTOOL_SDK_2_PATH := s3://packages/enterprise/release/linux/x86_64/2.11/ta
 S3_ENDPOINT_URL := $(if $(S3_ENDPOINT_URL),$(S3_ENDPOINT_URL),https://hb.vkcs.cloud)
 
 .rocks: sdk
-	# в sdk-2 есть все нужные роки, в sdk-3 нет
 	source ./sdk-2/env.sh && \
 	tt rocks install luacheck 0.26.0 --only-server=sdk-2/rocks && \
 	tt rocks install luacov 0.13.0 --only-server=sdk-2/rocks && \
 	tt rocks install luacov-reporters 0.1.0 --only-server=sdk-2/rocks && \
-	tt rocks install metrics  1.4.0 --only-server=sdk-2/rocks && \
-	tt rocks install ddl-ee 1.8.0 --only-server=sdk-2/rocks && \
-	tt rocks install cartridge 2.16.2 --only-server=sdk-2/rocks && \
-	tt rocks install migrations-ee 1.3.2 --only-server=sdk-2/rocks && \
+	tt rocks install metrics  1.5.0 && \
+	tt rocks install cartridge 2.16.3 && \
+	tt rocks install migrations 1.1.0 && \
 	tt rocks make
 
 sdk-2:
@@ -25,7 +23,6 @@ sdk-3:
 	mkdir sdk-3 && tar -xvzf tarantool-enterprise-*.tar.gz -C ./sdk-3 --strip-components=1 && rm tarantool-enterprise-*.tar.gz
 
 sdk: sdk-2 sdk-3
-	# в sdk-3 нет luatest
 	source sdk-3/env.sh && \
 	cp sdk-2/rocks/luatest-1.0.1-1.all.rock sdk-3/rocks/ && \
 	chmod 644 sdk-3/rocks/* && \
diff --git a/README.md b/README.md
@@ -66,7 +66,7 @@ First, [install Tarantool](https://www.tarantool.io/en/download).
 
 #### Manual install
 
-To try `crud` in your application, you may install it manually fron web
+To try `crud` in your application, you may install it manually from web
 with `tt rocks` rock management tool.
 
 ```bash
@@ -156,6 +156,12 @@ tarantool> crud.select('developers', nil, {first = 6})
 
 The CRUD operations should be called from router.
 
+Assuming that:
+
+```lua
+local crud = require('crud')
+```
+
 All VShard storages should call `crud.init_storage()` after
 `vshard.storage.cfg()` (or enable the `roles.crud-storage` role for Tarantool 3
 or the `crud-storage` role for Cartridge)
@@ -1968,7 +1974,6 @@ issues.
 
     <details>
       <summary>Full configuration example</summary>
-      
       ```yaml
       credentials:
         users:
diff --git a/crud-scm-1.rockspec b/crud-scm-1.rockspec
@@ -11,9 +11,9 @@ description = {
 
 dependencies = {
     'lua ~> 5.1',
-    'checks >= 3.1.0-1',
+    'checks >= 3.3.0-1',
     'errors >= 2.2.1-1',
-    'vshard >= 0.1.18-1',
+    'vshard >= 0.1.36-1',
 }
 
 build = {
diff --git a/crud/common/sharding/sharding_func.lua b/crud/common/sharding/sharding_func.lua
@@ -10,7 +10,7 @@ local ShardingFuncError = errors.new_class('ShardingFuncError',  {capture_stack
 local sharding_func_module = {}
 
 local sharding_module_names = {
-    ['vshard'] = true,
+    ['vshard'] = 'vshard',
 }
 
 local function is_callable(object)
@@ -50,8 +50,9 @@ local function get_function_from_G(func_name)
     local sharding_module = false
     local ok
 
-    if sharding_module_names[chunks[1]] then
-        ok, sharding_func = pcall(require, chunks[1])
+    if sharding_module_names[chunks[1]] ~= nil then
+        local module_name = sharding_module_names[chunks[1]]
+        ok, sharding_func = pcall(require, module_name)
         if not ok then
             return nil
         end
diff --git a/crud/select/merger.lua b/crud/select/merger.lua
@@ -12,7 +12,7 @@ local merger_lib = compat.require('tuple.merger', 'merger')
 
 local Keydef = require('crud.compare.keydef')
 local stats = require('crud.stats')
-local utils = require("crud.common.utils")
+local utils = require('crud.common.utils')
 
 local function bswap_u16(num)
     return bit.rshift(bit.bswap(tonumber(num)), 16)
diff --git a/crud/stats/metrics_registry.lua b/crud/stats/metrics_registry.lua
@@ -375,4 +375,4 @@ end
 
 workaround_role_reload()
 
-return registry
+return registry
diff --git a/deps.sh b/deps.sh
@@ -11,9 +11,10 @@ then
 fi
 
 # Test dependencies:
-$TTCTL rocks install luatest 1.0.1
-$TTCTL rocks install luacheck 0.25.0
-$TTCTL rocks install luacov 0.13.0
+${TTCTL} rocks install luatest 1.0.1
+${TTCTL} rocks install luacheck 0.26.0
+${TTCTL} rocks install luacov 0.13.0
+${TTCTL} rocks install luacov-reporters 0.1.0
 
 # cluacov, luacov-coveralls and dependencies
 $TTCTL rocks install https://raw.githubusercontent.com/luarocks/cluacov/master/cluacov-dev-1.rockspec
@@ -33,15 +34,16 @@ $TTCTL rocks install "${LUACOV_COVERALLS_ROCKSPEC_FILE}"
 rm "${LUACOV_COVERALLS_ROCKSPEC_FILE}"
 rmdir "${TMPDIR}"
 
-if [[ -n "$CARTRIDGE_VERSION" ]]
-then
-	$TTCTL rocks install cartridge "$CARTRIDGE_VERSION"
-	$TTCTL rocks install migrations 0.4.2
-else
-	VSHARD_VERSION="${VSHARD_VERSION:-0.1.24}"
-	$TTCTL rocks install vshard "$VSHARD_VERSION"
-fi
+CARTRIDGE_VERSION="${CARTRIDGE_VERSION:-2.16.3}"
+VSHARD_VERSION="${VSHARD_VERSION:-0.1.36}"
+METRICS_VERSION="${METRICS_VERSION:-1.5.0}"
+DDL_VERSION="${METRICS_VERSION:-1.7.1}"
+MIGRATIONS_VERSION="${MIGRATIONS_VERSION:-1.1.0}"
 
-$TTCTL rocks install ddl 1.6.2
+${TTCTL} rocks install cartridge "${CARTRIDGE_VERSION}"
+${TTCTL} rocks install vshard "${VSHARD_VERSION}"
+${TTCTL} rocks install metrics "${METRICS_VERSION}"
+${TTCTL} rocks install ddl "${DDL_VERSION}"
+${TTCTL} rocks install migrations "${MIGRATIONS_VERSION}"
 
-$TTCTL rocks make
+${TTCTL} rocks make
diff --git a/test/entrypoint/srv_not_initialized/cartridge_init.lua b/test/entrypoint/srv_not_initialized/cartridge_init.lua
@@ -17,6 +17,9 @@ end
 local root = fio.dirname(fio.dirname(fio.dirname(debug.sourcedir())))
 package.path = package.path .. root .. "/?.lua;" .. root .. "/?/init.lua;"
 
+local root = fio.dirname(fio.dirname(fio.dirname(debug.sourcedir())))
+package.path = package.path .. root .. "/?.lua;"
+
 package.preload['customers-storage'] = function()
     return {
         role_name = 'customers-storage',
diff --git a/test/helper.lua b/test/helper.lua
@@ -957,6 +957,7 @@ function helpers.start_cluster(g, cartridge_cfg, vshard_cfg, tarantool3_cluster_
             helpers.start_vshard_cluster(g, vshard_cfg)
         elseif opts.backend == helpers.backend.CONFIG then
             helpers.skip_if_tarantool3_crud_roles_unsupported()
+            helpers.skip_tarantool3_vshard_unsupported()
 
             helpers.start_tarantool3_cluster(g, tarantool3_cluster_cfg)
         end
@@ -1522,6 +1523,11 @@ function helpers.skip_if_tarantool3_crud_roles_unsupported()
               ("Tarantool %s does not support crud roles"):format(version))
 end
 
+function helpers.skip_tarantool3_vshard_unsupported()
+    t.skip("vshard is not supported in config yet: " ..
+           "https://github.com/tarantool/tarantool-ee/issues/815")
+end
+
 function helpers.skip_if_not_config_backend(backend)
     t.skip_if(backend ~= helpers.backend.CONFIG, "The test is for Tarantool 3 with config only")
 end
diff --git a/test/integration/cfg_test.lua b/test/integration/cfg_test.lua
@@ -157,7 +157,7 @@ group.test_role_cfg = function(g)
         stats_quantile_max_age_time = 180,
     }
 
-    g.router:upload_config({crud = cfg})
+    g.router:upload_config({["crud"] = cfg})
 
     local actual_cfg = g.router:eval("return require('crud').cfg")
     t.assert_equals(cfg, actual_cfg)
@@ -172,7 +172,7 @@ group.test_role_partial_cfg = function(g)
     local cfg_after = table.deepcopy(cfg_before)
     cfg_after.stats = not cfg_before.stats
 
-    g.router:upload_config({crud = {stats = cfg_after.stats}})
+    g.router:upload_config({["crud"] = {stats = cfg_after.stats}})
 
     local actual_cfg = g.router:eval("return require('crud').cfg")
     t.assert_equals(cfg_after, actual_cfg, "Only requested field were updated")
@@ -212,7 +212,7 @@ for name, case in pairs(role_cfg_error_cases) do
         helpers.skip_not_cartridge_backend(g.params.backend)
         local success, error = pcall(function()
             g.router:upload_config({
-                crud = case.args,
+                ["crud"] = case.args,
             })
         end)
 
diff --git a/test/integration/privileges_test.lua b/test/integration/privileges_test.lua
@@ -35,6 +35,10 @@ local ORIGINAL_ROWS = {
 }
 
 group_of_tests.before_all(function(g)
+    if (not helpers.tarantool_version_at_least(2, 11, 0))
+    or (not require('luatest.tarantool').is_enterprise_package()) then
+        t.skip('Readview is supported only for Tarantool Enterprise starting from v2.11.0')
+    end
     helpers.start_default_cluster(g, 'srv_select')
 
     g.space_format = g.cluster:server('s1-master').net_box.space.customers:format()
diff --git a/test/integration/stats_test.lua b/test/integration/stats_test.lua
@@ -62,7 +62,7 @@ local call_cfg = function(g, way, cfg)
         ]], { cfg })
     elseif way == 'role' then
         if g.params.backend == helpers.backend.CARTRIDGE then
-            g.router:upload_config{crud = cfg}
+            g.router:upload_config{["crud"] = cfg}
         elseif g.params.backend == helpers.backend.CONFIG then
             local cluster_cfg = g.cluster:cfg()
 
diff --git a/test/integration/storages_state_test.lua b/test/integration/storages_state_test.lua
@@ -83,33 +83,54 @@ local function build_storage_info(g, array_info)
     return res
 end
 
+local function ordered_keys_for_results(g)
+    local is_vshard = g.params.backend == 'vshard'
+    local is_config = g.params.backend == 'config'
+
+    local name_as_key = is_vshard and (
+        type(g.params.backend_cfg) == 'table'
+        and g.params.backend_cfg.identification_mode == 'name_as_key'
+    ) or is_config
+
+    if name_as_key then
+        return {
+            's1-master',
+            's1-replica',
+            's2-master',
+            's2-replica',
+        }
+    end
+
+    return {
+        helpers.uuid('b', 1),
+        helpers.uuid('b', 10),
+        helpers.uuid('c', 1),
+        helpers.uuid('c', 10),
+    }
+end
+
 pgroup.test_crud_storage_status_of_stopped_servers = function(g)
     g.cluster:server("s2-replica"):stop()
 
     local results, err = g.router:call("crud.storage_info", {})
     t.assert_equals(err, nil, "Error getting storages info")
 
-    t.assert_equals(results, build_storage_info(g, {
-        {
-            status = "running",
-            is_master = true
-        },
-        {
-            status = "running",
-            is_master = false
-        },
-        {
-            status = "running",
-            is_master = true
-        },
-        {
-            status = "error",
-            is_master = false,
-            message = "Peer closed"
-        },
-    }))
-end
+    local keys = ordered_keys_for_results(g)
+
+    local expected = {
+        [keys[1]] = { status = "running", is_master = true  },
+        [keys[2]] = { status = "running", is_master = false },
+        [keys[3]] = { status = "running", is_master = true  },
+        [keys[4]] = { status = "error",   is_master = false },
+    }
 
+    for _, k in ipairs(keys) do
+        local got = results[k]
+        t.assert_not_equals(got, nil, ("No result for key %s"):format(k))
+        t.assert_equals(got.status,   expected[k].status,   ("status mismatch for %s"):format(k))
+        t.assert_equals(got.is_master, expected[k].is_master, ("is_master mismatch for %s"):format(k))
+    end
+end
 pgroup.after_test('test_crud_storage_status_of_stopped_servers', function(g)
     helpers.stop_cluster(g.cluster, g.params.backend)
     g.cluster = nil
diff --git a/test/luacov-merger.lua b/test/luacov-merger.lua
diff --git a/test/tarantool3_helpers/cluster_test.lua b/test/tarantool3_helpers/cluster_test.lua

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright 2020-2024 crud AUTHORS: please see the AUTHORS file.`
	`1`	`+Copyright 2020-2025 crud AUTHORS: please see the AUTHORS file.`
`2`	`2`
`3`	`3`	`Redistribution and use in source and binary forms, with or without modification,`
`4`	`4`	`are permitted provided that the following conditions are met:`