storage: preserve original error on function fail #629
Conversation
| local err_msg = tostring(err) | ||
| t.assert_str_contains(err_msg, 'test_error') | ||
| t.assert_not_str_contains(err_msg, 'Transaction is active') | ||
| end) |
There was a problem hiding this comment.
The cluster should be in the same state, as it was before test start, so, please, drop the func at the end:
box.schema.func.drop('test_fail')We should also drop the variables from _G at the end
| test_group.test_error_msg_is_preserved = function(g) | ||
| g.replica_1_a:exec(function() | ||
| local vshard = require('vshard') | ||
| local t = require('luatest') |
There was a problem hiding this comment.
We need neither vshard nor luatest, they're already defined in the https://github.com/tarantool/vshard/blob/master/test/instances/storage.lua and can be accessed via ivshard and ilt accordingly
| test_alerts_for_non_vshard_config_template(g, non_config_replica) | ||
| end | ||
|
|
||
| test_group.test_error_msg_is_preserved = function(g) |
There was a problem hiding this comment.
Let's make sure, that plain function, defined in the _G (and not defined in the box.schema.func) is also not affected by this problem (it always returns the original error, not Transaction is active...
P.S. You can use "templates" in order avoid code duplication, e.g:
vshard/test/router-luatest/router_2_2_test.lua
Lines 982 to 983 in 0c564c3
| instance_name = 'named_replica' | ||
| } | ||
| }) | ||
|
|
There was a problem hiding this comment.
Nit: the commit msg is a little bit misleading, I didn't manage to understand the problem from it:
For older Tarantool versions vshard uses func.call to execute functions.
Nah, we use custom local_call function for older versions, which uses func.call for functions defined in the box.schema.func and net.box.self.call for everything else
So, at the end only box.schema.func are affected by this problem?
| -- its original error will be masked by the 'Transaction is active...' | ||
| -- error, so we check function result manually and rollback the transaction | ||
| -- in case of an error. | ||
| local count, results = (function(...) |
There was a problem hiding this comment.
This one is really difficult to read, can we just copy-paste the handle_eval_result and use it as follows:
kamenkremen
force-pushed
the
gh-614
branch
2 times, most recently
from
bc5d7d5 to
3b9b8c7
Compare
For older Tarantool versions vshard uses func.call to execute functions registered in schema. If such a function raises an error during an uncommitted transaction, 'Transaction is active...' error is going to be raised, which will mask the original error. This patch fixes that bug by checking the function call result. If the function returns an error and a transaction is still active, vshard now explicitly rolls back the transaction. Additionally, this patch fixes inconsistent return types. Previously, functions registered in the schema returned raw cdata (such as tuples), while other functions returned data converted via msgpack. This patch ensures consistency by performing a msgpack conversion for registered functions as well. Fixes tarantool#614 Fixes tarantool#630 NO_DOC=bugfix
2 participants
For older Tarantool versions vshard uses func.call to execute functions.
If such a function raises an error during an uncommitted transaction, 'Transaction is active...' error is going to be raised, which will mask the original error.
This patch fixes that bug by checking the function call result. If the function returns an error and a transaction is still active, vshard now explicitly rolls back the transaction.
Fixes #614
Fixes #630
NO_DOC=bugfix