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

Replace many calling zrealloc to one zmalloc in sentinelResetMasterAndChangeAddress (#8319)

Browse Source 
Replace many calling zrealloc to one zmalloc in sentinelResetMasterAndChangeAddress
This commit is contained in:
charsyam 2021-01-14 09:44:04 +09:00 committed by GitHub
parent 9cb9f98d2f
commit 108afbc0bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/sentinel.c
View File

@ -1523,14 +1523,17 @@ int sentinelResetMasterAndChangeAddress(sentinelRedisInstance *master, char *ip,
newaddr = createSentinelAddr(ip,port); newaddr = createSentinelAddr(ip,port);
if (newaddr == NULL) return C_ERR; if (newaddr == NULL) return C_ERR;
/* Make a list of slaves to add back after the reset. /* There can be only 0 or 1 slave that has the newaddr.
* Don't include the one having the address we are switching to. */ * and It can add old master 1 more slave.
* so It allocates dictSize(master->slaves) + 1 */
slaves = zmalloc(sizeof(sentinelAddr*)*(dictSize(master->slaves) + 1));
/* Don't include the one having the address we are switching to. */
di = dictGetIterator(master->slaves); di = dictGetIterator(master->slaves);
while((de = dictNext(di)) != NULL) { while((de = dictNext(di)) != NULL) {
sentinelRedisInstance *slave = dictGetVal(de); sentinelRedisInstance *slave = dictGetVal(de);
if (sentinelAddrIsEqual(slave->addr,newaddr)) continue; if (sentinelAddrIsEqual(slave->addr,newaddr)) continue;
slaves = zrealloc(slaves,sizeof(sentinelAddr*)*(numslaves+1));
slaves[numslaves++] = createSentinelAddr(slave->addr->ip, slaves[numslaves++] = createSentinelAddr(slave->addr->ip,
slave->addr->port); slave->addr->port);
} }
@ -1540,7 +1543,6 @@ int sentinelResetMasterAndChangeAddress(sentinelRedisInstance *master, char *ip,
* as a slave as well, so that we'll be able to sense / reconfigure * as a slave as well, so that we'll be able to sense / reconfigure
* the old master. */ * the old master. */
if (!sentinelAddrIsEqual(newaddr,master->addr)) { if (!sentinelAddrIsEqual(newaddr,master->addr)) {
slaves = zrealloc(slaves,sizeof(sentinelAddr*)*(numslaves+1));
slaves[numslaves++] = createSentinelAddr(master->addr->ip, slaves[numslaves++] = createSentinelAddr(master->addr->ip,
master->addr->port); master->addr->port);
} }