Skip to content

Fix and test script timeout #840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alonre24 merged 3 commits into from
Aug 30, 2021
Merged

Fix and test script timeout #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcb67d8
fix and test timeout for script execute
alonre24 Aug 30, 2021
7a4ce17
Merge branch 'master' into fix_and_test_script_timeout
alonre24 Aug 30, 2021
7367b8e
fix and test timeout for script execute
alonre24 Aug 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/execution/parsing/script_commands_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,16 +171,15 @@ static int _ScriptExecuteCommand_ParseCommand(RedisModuleCtx *ctx, RedisModuleSt
}

while (argpos < argc) {
const char *arg_string = RedisModule_StringPtrLen(argv[argpos], NULL);
const char *arg_string = RedisModule_StringPtrLen(argv[argpos++], NULL);
// Parse timeout arg if given and store it in timeout.
if (!strcasecmp(arg_string, "TIMEOUT")) {
argpos++;
if (argpos >= argc) {
RAI_SetError(error, RAI_ESCRIPTRUN,
"ERR No value provided for TIMEOUT in AI.SCRIPTEXECUTE");
return REDISMODULE_ERR;
}
if (ParseTimeout(argv[argpos], error, timeout) == REDISMODULE_ERR)
if (ParseTimeout(argv[argpos++], error, timeout) == REDISMODULE_ERR)
return REDISMODULE_ERR;
// No other arguments expected after timeout.
break;
Expand All @@ -192,7 +191,6 @@ static int _ScriptExecuteCommand_ParseCommand(RedisModuleCtx *ctx, RedisModuleSt
"ERR Already Encountered KEYS scope in AI.SCRIPTEXECUTE command");
return REDISMODULE_ERR;
}
argpos++;
keysDone = true;
if (_ScriptExecuteCommand_ParseKeys(ctx, argv, argc, &argpos, error, sctx) ==
REDISMODULE_ERR) {
Expand All @@ -207,7 +205,6 @@ static int _ScriptExecuteCommand_ParseCommand(RedisModuleCtx *ctx, RedisModuleSt
"ERR Already Encountered ARGS scope in AI.SCRIPTEXECUTE command");
return REDISMODULE_ERR;
}
argpos++;
argsDone = true;
if (_ScriptExecuteCommand_ParseArgs(ctx, argv, argc, &argpos, error, sctx) ==
REDISMODULE_ERR) {
Expand All @@ -223,7 +220,6 @@ static int _ScriptExecuteCommand_ParseCommand(RedisModuleCtx *ctx, RedisModuleSt
"ERR Already Encountered INPUTS scope in AI.SCRIPTEXECUTE command");
return REDISMODULE_ERR;
}
argpos++;
inputsDone = true;
if (_ScriptExecuteCommand_ParseInputs(ctx, argv, argc, &argpos, error, inputs) ==
REDISMODULE_ERR) {
Expand All @@ -238,7 +234,6 @@ static int _ScriptExecuteCommand_ParseCommand(RedisModuleCtx *ctx, RedisModuleSt
"ERR Already Encountered OUTPUTS scope in AI.SCRIPTEXECUTE command");
return REDISMODULE_ERR;
}
argpos++;
outputsDone = true;
if (_ScriptExecuteCommand_ParseOutputs(ctx, argv, argc, &argpos, error, outputs) ==
REDISMODULE_ERR) {
Expand Down
5 changes: 5 additions & 0 deletions tests/flow/test_data/script.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@ def bar_variadic(tensors: List[Tensor], keys: List[str], args: List[str]):
a = tensors[0]
l = tensors[1:]
return a + l[0]

def long_func(tensors: List[Tensor], keys: List[str], args: List[str]):
sum=0
for i in range(10000000):
sum+=1
11 changes: 8 additions & 3 deletions tests/flow/tests_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,12 +296,17 @@ def test_pytorch_scriptexecute_errors(env):

check_error(env, con, 'AI.SCRIPTEXECUTE', 'ket{1}', 'bar', 'KEYS', 1 , '{1}', 'INPUTS', 'OUTPUTS')

check_error_message(env, con, "Invalid arguments provided to AI.SCRIPTEXECUTE", 'AI.SCRIPTEXECUTE', 'ket{1}', 'bar', 'KEYS', 1, '{1}', 'ARGS')
check_error_message(env, con, "Invalid arguments provided to AI.SCRIPTEXECUTE",
'AI.SCRIPTEXECUTE', 'ket{1}', 'bar', 'KEYS', 1, '{1}', 'ARGS')

check_error_message(env, con, "Invalid argument for inputs count in AI.SCRIPTEXECUTE", 'AI.SCRIPTEXECUTE', 'ket{1}', 'bar', 'INPUTS', 'OUTPUTS')
check_error_message(env, con, "Invalid argument for inputs count in AI.SCRIPTEXECUTE",
'AI.SCRIPTEXECUTE', 'ket{1}', 'bar', 'INPUTS', 'OUTPUTS')

check_error_message(env, con, "Invalid value for TIMEOUT",'AI.SCRIPTEXECUTE', 'ket{1}', 'bar', 'KEYS', 1, '{1}', 'INPUTS', 2, 'a{1}', 'b{1}', 'OUTPUTS', 1, 'c{1}', 'TIMEOUT', 'TIMEOUT')
check_error_message(env, con, "Invalid value for TIMEOUT",
'AI.SCRIPTEXECUTE', 'ket{1}', 'bar', 'INPUTS', 2, 'a{1}', 'b{1}', 'OUTPUTS', 1, 'c{1}', 'TIMEOUT', 'TIMEOUT')

check_error_message(env, con, "No value provided for TIMEOUT in AI.SCRIPTEXECUTE",
'AI.SCRIPTEXECUTE', 'ket{1}', 'bar', 'INPUTS', 2, 'a{1}', 'b{1}', 'OUTPUTS', 1, 'c{1}', 'TIMEOUT')

if env.isCluster():
# cross shard
Expand Down
34 changes: 31 additions & 3 deletions tests/flow/tests_pytorch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import redis
import time

from includes import *
from RLTest import Env
Expand Down Expand Up @@ -389,13 +390,40 @@ def test_pytorch_scriptexecute_list_input(env):
env.assertEqual(values2, values)


def test_pytorch_scriptinfo(env):
def test_pytorch_scriptexecute_with_timeout(env):
if not TEST_PT:
env.debugPrint("skipping {} since TEST_PT=0".format(sys._getframe().f_code.co_name), force=True)
return

# env.debugPrint("skipping this tests for now", force=True)
# return
con = get_connection(env, '{$}')
script = load_file_content('script.txt')
ret = con.execute_command('AI.SCRIPTSTORE', 'my_script{$}', DEVICE,
'ENTRY_POINTS', 2, 'bar', 'long_func', 'SOURCE', script)
env.assertEqual(ret, b'OK')

con.execute_command('AI.TENSORSET', 'a{$}', 'FLOAT', 2, 2, 'VALUES', 2, 3, 2, 3)
con.execute_command('AI.TENSORSET', 'b{$}', 'FLOAT', 2, 2, 'VALUES', 2, 3, 2, 3)

def run():
con2 = get_connection(env, '{$}')
con2.execute_command('AI.SCRIPTEXECUTE', 'my_script{$}', 'long_func', 'KEYS', 1, '{$}')

t = threading.Thread(target=run)
t.start()

# make sure that we have a long operation that RedisAI will run upon sending the following
# command, to assure that timeout will occur.
time.sleep(0.1)
ret = con.execute_command('AI.SCRIPTEXECUTE', 'my_script{$}', 'bar',
'INPUTS', 2, 'a{$}', 'b{$}', 'OUTPUTS', 1, 'c{$}', 'TIMEOUT', 1)
env.assertEqual(ret, b'TIMEDOUT')
t.join()


def test_pytorch_scriptinfo(env):
if not TEST_PT:
env.debugPrint("skipping {} since TEST_PT=0".format(sys._getframe().f_code.co_name), force=True)
return

con = get_connection(env, '{1}')

Expand Down