hiro/ray
1
0
Fork 0
mirror of https://github.com/vale981/ray synced 2025-03-08 19:41:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

More checking in redis.cc. (#1057)

Browse source
This commit is contained in:
Robert Nishihara 2017-11-08 23:25:19 -08:00 • committed by Philipp Moritz
parent 3a37d1cf7d
commit d3c082d325
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/common/state/redis.cc
View file

@ -233,7 +233,7 @@ void db_connect_shard(const std::string &db_address,
reply = (redisReply *) redisCommandArgv(sync_context, argc, argv, argvlen); reply = (redisReply *) redisCommandArgv(sync_context, argc, argv, argvlen);
CHECKM(reply != NULL, "db_connect failed on RAY.CONNECT"); CHECKM(reply != NULL, "db_connect failed on RAY.CONNECT");
CHECK(reply->type != REDIS_REPLY_ERROR); CHECK(reply->type != REDIS_REPLY_ERROR);
CHECK(strcmp(reply->str, "OK") == 0); CHECKM(strcmp(reply->str, "OK") == 0, "reply->str is %s", reply->str);
freeReplyObject(reply); freeReplyObject(reply);
free(argv); free(argv);
free(argvlen); free(argvlen);
@ -340,7 +340,8 @@ void db_disconnect(DBHandle *db) {
redisReply *reply = redisReply *reply =
(redisReply *) redisCommand(db->sync_context, "RAY.DISCONNECT %b", (redisReply *) redisCommand(db->sync_context, "RAY.DISCONNECT %b",
db->client.id, sizeof(db->client.id)); db->client.id, sizeof(db->client.id));
CHECK(strcmp(reply->str, "OK") == 0); CHECK(reply->type != REDIS_REPLY_ERROR);
CHECKM(strcmp(reply->str, "OK") == 0, "reply->str is %s", reply->str);
freeReplyObject(reply); freeReplyObject(reply);
DBHandle_free(db); DBHandle_free(db);
@ -396,7 +397,7 @@ void redis_object_table_add_callback(redisAsyncContext *c,
"reconstruction or for speculation."); "reconstruction or for speculation.");
} else { } else {
CHECK(reply->type != REDIS_REPLY_ERROR); CHECK(reply->type != REDIS_REPLY_ERROR);
CHECK(strcmp(reply->str, "OK") == 0); CHECKM(strcmp(reply->str, "OK") == 0, "reply->str is %s", reply->str);
} }
/* Call the done callback if there is one. */ /* Call the done callback if there is one. */
if (callback_data->done_callback != NULL) { if (callback_data->done_callback != NULL) {
@ -442,7 +443,7 @@ void redis_object_table_remove_callback(redisAsyncContext *c,
return; return;
} }
CHECK(reply->type != REDIS_REPLY_ERROR); CHECK(reply->type != REDIS_REPLY_ERROR);
CHECK(strcmp(reply->str, "OK") == 0); CHECKM(strcmp(reply->str, "OK") == 0, "reply->str is %s", reply->str);
/* Call the done callback if there is one. */ /* Call the done callback if there is one. */
if (callback_data->done_callback != NULL) { if (callback_data->done_callback != NULL) {
object_table_done_callback done_callback = object_table_done_callback done_callback =
@ -814,7 +815,8 @@ void redis_object_table_request_notifications_callback(redisAsyncContext *c,
/* Do some minimal checking. */ /* Do some minimal checking. */
redisReply *reply = (redisReply *) r; redisReply *reply = (redisReply *) r;
CHECK(strcmp(reply->str, "OK") == 0); CHECK(reply->type != REDIS_REPLY_ERROR);
CHECKM(strcmp(reply->str, "OK") == 0, "reply->str is %s", reply->str);
CHECK(callback_data->done_callback == NULL); CHECK(callback_data->done_callback == NULL);
/* Clean up the timer and callback. */ /* Clean up the timer and callback. */
destroy_timer_callback(db->loop, callback_data); destroy_timer_callback(db->loop, callback_data);
@ -917,6 +919,7 @@ void redis_task_table_add_task_callback(redisAsyncContext *c,
callback_data->id, callback_data->user_context, callback_data->data); callback_data->id, callback_data->user_context, callback_data->data);
} }
} else { } else {
CHECK(reply->type != REDIS_REPLY_ERROR);
CHECKM(strcmp(reply->str, "OK") == 0, "reply->str is %s", reply->str); CHECKM(strcmp(reply->str, "OK") == 0, "reply->str is %s", reply->str);
/* Call the done callback if there is one. */ /* Call the done callback if there is one. */
if (callback_data->done_callback != NULL) { if (callback_data->done_callback != NULL) {
@ -969,6 +972,7 @@ void redis_task_table_update_callback(redisAsyncContext *c,
callback_data->id, callback_data->user_context, callback_data->data); callback_data->id, callback_data->user_context, callback_data->data);
} }
} else { } else {
CHECK(reply->type != REDIS_REPLY_ERROR);
CHECKM(strcmp(reply->str, "OK") == 0, "reply->str is %s", reply->str); CHECKM(strcmp(reply->str, "OK") == 0, "reply->str is %s", reply->str);
/* Call the done callback if there is one. */ /* Call the done callback if there is one. */
@ -1151,7 +1155,7 @@ void redis_db_client_table_remove_callback(redisAsyncContext *c,
redisReply *reply = (redisReply *) r; redisReply *reply = (redisReply *) r;
CHECK(reply->type != REDIS_REPLY_ERROR); CHECK(reply->type != REDIS_REPLY_ERROR);
CHECK(strcmp(reply->str, "OK") == 0); CHECKM(strcmp(reply->str, "OK") == 0, "reply->str is %s", reply->str);
/* Call the done callback if there is one. */ /* Call the done callback if there is one. */
db_client_table_done_callback done_callback = db_client_table_done_callback done_callback =
@ -1670,7 +1674,7 @@ void redis_push_error_hmset_callback(redisAsyncContext *c,
/* Make sure we were able to add the error information. */ /* Make sure we were able to add the error information. */
CHECK(reply->type != REDIS_REPLY_ERROR); CHECK(reply->type != REDIS_REPLY_ERROR);
CHECK(strcmp(reply->str, "OK") == 0); CHECKM(strcmp(reply->str, "OK") == 0, "reply->str is %s", reply->str);
/* Add the error to this driver's list of errors. */ /* Add the error to this driver's list of errors. */
ErrorInfo *info = (ErrorInfo *) callback_data->data; ErrorInfo *info = (ErrorInfo *) callback_data->data;