Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xindoo
redis
提交
44aa22c6
R
redis
项目概览
xindoo
/
redis
通知
2
Star
2
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,体验更适合开发者的 AI 搜索 >>
提交
44aa22c6
编写于
10月 28, 2019
作者:
M
Madelyn Olson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added better exception handling around scripting and module
上级
c95a582a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
21 addition
and
6 deletion
+21
-6
src/module.c
src/module.c
+9
-2
src/scripting.c
src/scripting.c
+12
-4
未找到文件。
src/module.c
浏览文件 @
44aa22c6
...
...
@@ -3174,6 +3174,8 @@ fmterr:
* EINVAL: wrong command arity.
* ENOENT: command does not exist.
* EPERM: operation in Cluster instance with key in non local slot.
* EROFS: operation in Cluster instance when a write command is sent
* in a readonly state.
*
* This API is documented here: https://redis.io/topics/modules-intro
*/
...
...
@@ -3231,13 +3233,18 @@ RedisModuleCallReply *RM_Call(RedisModuleCtx *ctx, const char *cmdname, const ch
* trying to access non-local keys, with the exception of commands
* received from our master. */
if
(
server
.
cluster_enabled
&&
!
(
ctx
->
client
->
flags
&
CLIENT_MASTER
))
{
int
error_code
;
/* Duplicate relevant flags in the module client. */
c
->
flags
&=
~
(
CLIENT_READONLY
|
CLIENT_ASKING
);
c
->
flags
|=
ctx
->
client
->
flags
&
(
CLIENT_READONLY
|
CLIENT_ASKING
);
if
(
getNodeByQuery
(
c
,
c
->
cmd
,
c
->
argv
,
c
->
argc
,
NULL
,
NULL
)
!=
if
(
getNodeByQuery
(
c
,
c
->
cmd
,
c
->
argv
,
c
->
argc
,
NULL
,
&
error_code
)
!=
server
.
cluster
->
myself
)
{
errno
=
EPERM
;
if
(
error_code
==
CLUSTER_REDIR_DOWN_STATE
)
{
errno
=
EROFS
;
}
else
{
errno
=
EPERM
;
}
goto
cleanup
;
}
}
...
...
src/scripting.c
浏览文件 @
44aa22c6
...
...
@@ -679,15 +679,23 @@ int luaRedisGenericCommand(lua_State *lua, int raise_error) {
if
(
server
.
cluster_enabled
&&
!
server
.
loading
&&
!
(
server
.
lua_caller
->
flags
&
CLIENT_MASTER
))
{
int
error_code
;
/* Duplicate relevant flags in the lua client. */
c
->
flags
&=
~
(
CLIENT_READONLY
|
CLIENT_ASKING
);
c
->
flags
|=
server
.
lua_caller
->
flags
&
(
CLIENT_READONLY
|
CLIENT_ASKING
);
if
(
getNodeByQuery
(
c
,
c
->
cmd
,
c
->
argv
,
c
->
argc
,
NULL
,
NULL
)
!=
if
(
getNodeByQuery
(
c
,
c
->
cmd
,
c
->
argv
,
c
->
argc
,
NULL
,
&
error_code
)
!=
server
.
cluster
->
myself
)
{
luaPushError
(
lua
,
"Lua script attempted to access a non local key in a "
"cluster node"
);
if
(
error_code
==
CLUSTER_REDIR_DOWN_STATE
)
{
luaPushError
(
lua
,
"Lua script attempted execute a write command while "
"cluster is down"
);
}
else
{
luaPushError
(
lua
,
"Lua script attempted to access a non local key in a "
"cluster node"
);
}
goto
cleanup
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录