gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added better exception handling around scripting and module

Browse Source
This commit is contained in:
Madelyn Olson 2019-10-28 12:58:03 -07:00
parent c95a582a74
commit 44aa22c635
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/module.c
View File

@ -3174,6 +3174,8 @@ fmterr:
* EINVAL: wrong command arity. * EINVAL: wrong command arity.
* ENOENT: command does not exist. * ENOENT: command does not exist.
* EPERM: operation in Cluster instance with key in non local slot. * 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 * 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 * trying to access non-local keys, with the exception of commands
* received from our master. */ * received from our master. */
if (server.cluster_enabled && !(ctx->client->flags & CLIENT_MASTER)) { if (server.cluster_enabled && !(ctx->client->flags & CLIENT_MASTER)) {
int error_code;
/* Duplicate relevant flags in the module client. */ /* Duplicate relevant flags in the module client. */
c->flags &= ~(CLIENT_READONLY|CLIENT_ASKING); c->flags &= ~(CLIENT_READONLY|CLIENT_ASKING);
c->flags |= ctx->client->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) server.cluster->myself)
{ {
errno = EPERM; if (error_code == CLUSTER_REDIR_DOWN_STATE) {
errno = EROFS;
} else {
errno = EPERM;
}
goto cleanup; goto cleanup;
} }
} }

16
src/scripting.c
View File

@ -679,15 +679,23 @@ int luaRedisGenericCommand(lua_State *lua, int raise_error) {
if (server.cluster_enabled && !server.loading && if (server.cluster_enabled && !server.loading &&
!(server.lua_caller->flags & CLIENT_MASTER)) !(server.lua_caller->flags & CLIENT_MASTER))
{ {
int error_code;
/* Duplicate relevant flags in the lua client. */ /* Duplicate relevant flags in the lua client. */
c->flags &= ~(CLIENT_READONLY|CLIENT_ASKING); c->flags &= ~(CLIENT_READONLY|CLIENT_ASKING);
c->flags |= server.lua_caller->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) server.cluster->myself)
{ {
luaPushError(lua, if (error_code == CLUSTER_REDIR_DOWN_STATE) {
"Lua script attempted to access a non local key in a " luaPushError(lua,
"cluster node"); "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; goto cleanup;
} }
} }