fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-22 17:12:13 +00:00
Code Issues Projects Releases Wiki Activity

Minor MIGRATE refactoring.

Browse Source 
Centralize cleanup of newargv in a single place.
Add more comments to help a bit following a complex function.

Related to issue #3016.
This commit is contained in:
antirez 2016-01-19 09:53:04 +01:00
parent f5a1e608cc
commit 83b862a30e
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cluster.c
View File

@ -4789,8 +4789,6 @@ try_again:
if (!error_from_target && socket_error && j == 0 && may_retry && if (!error_from_target && socket_error && j == 0 && may_retry &&
errno != ETIMEDOUT) errno != ETIMEDOUT)
{ {
zfree(newargv);
newargv = NULL; /* This will get reallocated on retry. */
goto socket_err; /* A retry is guaranteed because of tested conditions.*/ goto socket_err; /* A retry is guaranteed because of tested conditions.*/
} }
@ -4816,7 +4814,8 @@ try_again:
} }
if (!error_from_target) { if (!error_from_target) {
/* Update the last_dbid in migrateCachedSocket and reply +OK. */ /* Success! Update the last_dbid in migrateCachedSocket, so that we can
* avoid SELECT the next time if the target DB is the same. Reply +OK. */
cs->last_dbid = dbid; cs->last_dbid = dbid;
addReply(c,shared.ok); addReply(c,shared.ok);
} else { } else {
@ -4833,14 +4832,22 @@ try_again:
* It is very common for the cached socket to get closed, if just reopening * It is very common for the cached socket to get closed, if just reopening
* it works it's a shame to notify the error to the caller. */ * it works it's a shame to notify the error to the caller. */
socket_err: socket_err:
/* Cleanup we want to perform in both the retry and no retry case.
* Note: Closing the migrate socket will also force SELECT next time. */
sdsfree(cmd.io.buffer.ptr); sdsfree(cmd.io.buffer.ptr);
migrateCloseSocket(c->argv[1],c->argv[2]); migrateCloseSocket(c->argv[1],c->argv[2]);
/* Note: Closing the migrate socket will also force SELECT next time. */ zfree(newargv);
newargv = NULL; /* This will get reallocated on retry. */
/* Retry only if it's not a timeout and we never attempted a retry
* (or the code jumping here did not set may_retry to zero). */
if (errno != ETIMEDOUT && may_retry) { if (errno != ETIMEDOUT && may_retry) {
may_retry = 0; may_retry = 0;
goto try_again; goto try_again;
} }
zfree(ov); zfree(kv); zfree(newargv);
/* Cleanup we want to do if no retry is attempted. */
zfree(ov); zfree(kv);
addReplySds(c, addReplySds(c,
sdscatprintf(sdsempty(), sdscatprintf(sdsempty(),
"-IOERR error or timeout %s to target instance\r\n", "-IOERR error or timeout %s to target instance\r\n",