Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Turbo码先生
redis
提交
643bc48a
R
redis
项目概览
Turbo码先生
/
redis
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
redis
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
643bc48a
编写于
3月 25, 2020
作者:
S
Salvatore Sanfilippo
提交者:
GitHub
3月 25, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7022 from oranagra/multi-busy-script
MULTI/EXEC during LUA script timeout are messed up
上级
c80d81c8
ec007559
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
73 addition
and
0 deletion
+73
-0
src/server.c
src/server.c
+1
-0
tests/unit/multi.tcl
tests/unit/multi.tcl
+72
-0
未找到文件。
src/server.c
浏览文件 @
643bc48a
...
...
@@ -3553,6 +3553,7 @@ int processCommand(client *c) {
c
->
cmd
->
proc
!=
authCommand
&&
c
->
cmd
->
proc
!=
helloCommand
&&
c
->
cmd
->
proc
!=
replconfCommand
&&
c
->
cmd
->
proc
!=
multiCommand
&&
c
->
cmd
->
proc
!=
execCommand
&&
c
->
cmd
->
proc
!=
discardCommand
&&
!
(
c
->
cmd
->
proc
==
shutdownCommand
&&
c
->
argc
==
2
&&
tolower
(((
char
*
)
c
->
argv
[
1
]
->
ptr
)[
0
])
==
'n'
)
&&
...
...
tests/unit/multi.tcl
浏览文件 @
643bc48a
...
...
@@ -320,4 +320,76 @@ start_server {tags {"multi"}} {
$rd close
r ping
}
{
PONG
}
test
{
MULTI and script timeout
}
{
# check that if MULTI arrives during timeout, it is either refused, or
# allowed to pass, and we don't end up executing half of the transaction
set rd1
[
redis_deferring_client
]
set rd2
[
redis_deferring_client
]
r config set lua-time-limit 10
r set xx 1
$rd1 eval
{
while true do end
}
0
after 200
catch
{
$rd2 multi
;
$rd2 read
}
e
catch
{
$rd2 incr xx
;
$rd2 read
}
e
r script kill
after 200
;
# Give some time to Lua to call the hook again...
catch
{
$rd2 incr xx
;
$rd2 read
}
e
catch
{
$rd2 exec
;
$rd2 read
}
e
set xx
[
r get xx
]
# make sure that either the whole transcation passed or none of it
(
we actually expect none
)
assert
{
$xx == 1 || $xx == 3
}
# check that the connection is no longer in multi state
$rd2 ping asdf
set pong
[
$rd2
read
]
assert_equal $pong
"asdf"
}
test
{
EXEC and script timeout
}
{
# check that if EXEC arrives during timeout, we don't end up executing
# half of the transaction, and also that we exit the multi state
set rd1
[
redis_deferring_client
]
set rd2
[
redis_deferring_client
]
r config set lua-time-limit 10
r set xx 1
catch
{
$rd2 multi
;
$rd2 read
}
e
catch
{
$rd2 incr xx
;
$rd2 read
}
e
$rd1 eval
{
while true do end
}
0
after 200
catch
{
$rd2 incr xx
;
$rd2 read
}
e
catch
{
$rd2 exec
;
$rd2 read
}
e
r script kill
after 200
;
# Give some time to Lua to call the hook again...
set xx
[
r get xx
]
# make sure that either the whole transcation passed or none of it
(
we actually expect none
)
assert
{
$xx == 1 || $xx == 3
}
# check that the connection is no longer in multi state
$rd2 ping asdf
set pong
[
$rd2
read
]
assert_equal $pong
"asdf"
}
test
{
MULTI-EXEC body and script timeout
}
{
# check that we don't run an imcomplete transaction due to some commands
# arriving during busy script
set rd1
[
redis_deferring_client
]
set rd2
[
redis_deferring_client
]
r config set lua-time-limit 10
r set xx 1
catch
{
$rd2 multi
;
$rd2 read
}
e
catch
{
$rd2 incr xx
;
$rd2 read
}
e
$rd1 eval
{
while true do end
}
0
after 200
catch
{
$rd2 incr xx
;
$rd2 read
}
e
r script kill
after 200
;
# Give some time to Lua to call the hook again...
catch
{
$rd2 exec
;
$rd2 read
}
e
set xx
[
r get xx
]
# make sure that either the whole transcation passed or none of it
(
we actually expect none
)
assert
{
$xx == 1 || $xx == 3
}
# check that the connection is no longer in multi state
$rd2 ping asdf
set pong
[
$rd2
read
]
assert_equal $pong
"asdf"
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录