TNTP-2109: Implement slow mode for single calls

Author: ita-sammann

crud/common/call.lua

@@ -18,8 +18,49 @@ local CRUD_CALL_FUNC_NAME = utils.get_storage_call(CALL_FUNC_NAME)
 
 local call = {}
 
-local function call_on_storage(run_as_user, func_name, ...)
-    return box.session.su(run_as_user, call_cache.func_name_to_func(func_name), ...)
+local bucket_ref_many
+local bucket_unref_many
+
+bucket_ref_many = function(bucket_ids, mode)
+    local reffed = {}
+    for _, bucket_id in pairs(bucket_ids) do
+        local ok, err = vshard.storage.bucket_ref(bucket_id, mode)
+        if not ok then
+            bucket_unref_many(reffed, mode)
+            return nil, err
+        end
+        table.insert(reffed, bucket_id)
+    end
+    return true, nil
+end
+
+bucket_unref_many = function(bucket_ids, mode)
+    local all_ok = true
+    local last_err = nil
+    for _, bucket_id in pairs(bucket_ids) do
+        local ok, err = vshard.storage.bucket_unref(bucket_id, mode)
+        if not ok then
+            all_ok = nil
+            last_err = err
+        end
+    end
+    return all_ok, last_err
+end
+
+local function call_on_storage(run_as_user, bucket_ids, mode, func_name, ...)
+    local ok, ref_err = bucket_ref_many(bucket_ids, mode)
+    if not ok then
+        return nil, ref_err
+    end
+
+    local res = {box.session.su(run_as_user, call_cache.func_name_to_func(func_name), ...)}
+
+    ok, ref_err = bucket_unref_many(bucket_ids, mode)
+    if not ok then
+        return nil, ref_err
+    end
+
+    return unpack(res, 1, table.maxn(res))
 end
 
 call.storage_api = {[CALL_FUNC_NAME] = call_on_storage}
@@ -82,8 +123,8 @@ local function wrap_vshard_err(vshard_router, err, func_name, replicaset_id, buc
     ))
 end
 
-local function retry_call_with_master_discovery(replicaset, method, func_name, func_args, call_opts)
-    local func_args_ext = utils.append_array({ box.session.effective_user(), func_name }, func_args)
+local function retry_call_with_master_discovery(replicaset, method, func_name, func_args, call_opts, mode, bucket_ids)
+    local func_args_ext = utils.append_array({ box.session.effective_user(), bucket_ids, mode, func_name }, func_args)
 
     -- In case cluster was just bootstrapped with auto master discovery,
     -- replicaset may miss master.
@@ -148,7 +189,7 @@ function call.map(vshard_router, func_name, func_args, opts)
         local args, replicaset, replicaset_id = iter:get()
 
         local future, err = retry_call_with_master_discovery(replicaset, vshard_call_name,
-            func_name, args, call_opts)
+            func_name, args, call_opts, opts.mode, {}) -- TODO: provide bucket_ids
 
         if err ~= nil then
             local result_info = {
@@ -222,8 +263,8 @@ function call.single(vshard_router, bucket_id, func_name, func_args, opts)
     local request_timeout = opts.mode == 'read' and opts.request_timeout or nil
 
     local res, err = retry_call_with_master_discovery(replicaset, vshard_call_name,
-        func_name, func_args, {timeout = timeout,
-                               request_timeout = request_timeout})
+        func_name, func_args, {timeout = timeout, request_timeout = request_timeout},
+        opts.mode, {bucket_id})
     if err ~= nil then
         return nil, wrap_vshard_err(vshard_router, err, func_name, nil, bucket_id)
     end
@@ -249,7 +290,8 @@ function call.any(vshard_router, func_name, func_args, opts)
     local replicaset_id, replicaset = next(replicasets)
 
     local res, err = retry_call_with_master_discovery(replicaset, 'call',
-        func_name, func_args, {timeout = timeout})
+        func_name, func_args, {timeout = timeout},
+    'read', {})
     if err ~= nil then
         return nil, wrap_vshard_err(vshard_router, err, func_name, replicaset_id)
     end

crud/select/merger.lua

@@ -171,7 +171,9 @@ local function fetch_chunk(context, state)
 
     -- change context.func_args too, but it does not matter
     next_func_args[4].after_tuple = cursor.after_tuple
-    local func_args_ext = utils.append_array({ box.session.effective_user(), func_name }, next_func_args)
+    local mode = "read"
+    local bucket_ids = {}
+    local func_args_ext = utils.append_array({ box.session.effective_user(), bucket_ids, mode, func_name }, next_func_args)
 
     if context.readview then
         next_state = {future = context.future_replica.conn:call("_crud.call_on_storage",
@@ -203,7 +205,8 @@ local function new(vshard_router, replicasets, space, index_id, func_name, func_
         local buf = buffer.ibuf()
         local net_box_opts = {is_async = true, buffer = buf,
                               skip_header = utils.tarantool_supports_netbox_skip_header_option() or nil}
-        local func_args_ext = utils.append_array({ box.session.effective_user(), func_name }, func_args)
+        local bucket_ids = {}
+        local func_args_ext = utils.append_array({ box.session.effective_user(), bucket_ids, mode, func_name }, func_args)
         local future = replicaset[vshard_call_name](replicaset, "_crud.call_on_storage",
                 func_args_ext, net_box_opts)
 
@@ -279,8 +282,11 @@ local function new_readview(vshard_router, replicasets, readview_info, space, in
             local net_box_opts = {is_async = true, buffer = buf,
                                   skip_header = utils.tarantool_supports_netbox_skip_header_option() or nil}
             func_args[4].readview_id = replicaset_info.id
-            local func_args_ext = utils.append_array({ box.session.effective_user(), func_name }, func_args)
-            local future = replica.conn:call("_crud.call_on_storage", func_args_ext, net_box_opts)
+            local mode = "read"
+            local bucket_ids = {}
+            local func_args_ext = utils.append_array({ box.session.effective_user(), bucket_ids, mode, func_name }, func_args)
+            local future = replica.conn:call("_crud.call_on_storage",
+                    func_args_ext, net_box_opts)
 
             -- Create a source.
             local context = {

test/unit/privileges_test.lua

@@ -17,13 +17,13 @@ g.before_all(function()
 end)
 
 g.test_prepend_current_user_smoke = function()
-    local res = call.storage_api.call_on_storage(box.session.effective_user(), "unittestfunc", {"too", "foo"})
+    local res = call.storage_api.call_on_storage(box.session.effective_user(), {}, "read", "unittestfunc", {"too", "foo"})
     t.assert_equals(res, {"too", "foo"})
 end
 
 g.test_non_existent_user = function()
     t.assert_error_msg_contains("User 'non_existent_user' is not found",
-        call.storage_api.call_on_storage, "non_existent_user", "unittestfunc")
+        call.storage_api.call_on_storage, "non_existent_user", {}, "read", "unittestfunc")
 end
 
 g.test_that_the_session_switches_back = function()
@@ -34,7 +34,7 @@ g.test_that_the_session_switches_back = function()
     local reference_user = box.session.effective_user()
     t.assert_not_equals(reference_user, "unittestuser")
 
-    local res = call.storage_api.call_on_storage("unittestuser", "unittestfunc2")
+    local res = call.storage_api.call_on_storage("unittestuser", {}, "read", "unittestfunc2")
     t.assert_equals(res, "unittestuser")
     t.assert_equals(box.session.effective_user(), reference_user)
 end