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

Fix merge conflicts from cherry-pick

Browse Source 
Former-commit-id: 57956b3fd2d05581c976f58d07e245896d3a515b
This commit is contained in:
John Sully 2020-04-14 17:33:54 -04:00
parent 34f7c653d5
commit f084ee6f17
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/replication.cpp
View File

@ -1147,15 +1147,16 @@ void putSlaveOnline(client *replica) {
* to take RDB files around, this violates certain policies in certain * to take RDB files around, this violates certain policies in certain
* environments. */ * environments. */
void removeRDBUsedToSyncReplicas(void) { void removeRDBUsedToSyncReplicas(void) {
serverAssert(GlobalLocksAcquired());
if (allPersistenceDisabled() && RDBGeneratedByReplication) { if (allPersistenceDisabled() && RDBGeneratedByReplication) {
client *slave; client *slave;
listNode *ln; listNode *ln;
listIter li; listIter li;
int delrdb = 1; int delrdb = 1;
listRewind(server.slaves,&li); listRewind(g_pserver->slaves,&li);
while((ln = listNext(&li))) { while((ln = listNext(&li))) {
slave = ln->value; slave = (client*)ln->value;
if (slave->replstate == SLAVE_STATE_WAIT_BGSAVE_START || if (slave->replstate == SLAVE_STATE_WAIT_BGSAVE_START ||
slave->replstate == SLAVE_STATE_WAIT_BGSAVE_END || slave->replstate == SLAVE_STATE_WAIT_BGSAVE_END ||
slave->replstate == SLAVE_STATE_SEND_BULK) slave->replstate == SLAVE_STATE_SEND_BULK)
@ -1166,7 +1167,7 @@ void removeRDBUsedToSyncReplicas(void) {
} }
if (delrdb) { if (delrdb) {
RDBGeneratedByReplication = 0; RDBGeneratedByReplication = 0;
unlink(server.rdb_filename); unlink(g_pserver->rdb_filename);
} }
} }
} }
@ -1237,7 +1238,7 @@ void rdbPipeWriteHandlerConnRemoved(struct connection *conn) {
/* if there are no more writes for now for this conn, or write error: */ /* if there are no more writes for now for this conn, or write error: */
if (g_pserver->rdb_pipe_numconns_writing == 0) { if (g_pserver->rdb_pipe_numconns_writing == 0) {
if (aeCreateFileEvent(serverTL->el, g_pserver->rdb_pipe_read, AE_READABLE, rdbPipeReadHandler,NULL) == AE_ERR) { if (aeCreateFileEvent(serverTL->el, g_pserver->rdb_pipe_read, AE_READABLE, rdbPipeReadHandler,NULL) == AE_ERR) {
serverPanic("Unrecoverable error creating server.rdb_pipe_read file event."); serverPanic("Unrecoverable error creating g_pserver->rdb_pipe_read file event.");
} }
} }
} }
@ -2032,7 +2033,7 @@ void readSyncBulkPayload(connection *conn) {
} }
/* Cleanup. */ /* Cleanup. */
if (allPersistenceDisabled()) unlink(server.rdb_filename); if (allPersistenceDisabled()) unlink(g_pserver->rdb_filename);
if (fUpdate) if (fUpdate)
unlink(mi->repl_transfer_tmpfile); unlink(mi->repl_transfer_tmpfile);
zfree(mi->repl_transfer_tmpfile); zfree(mi->repl_transfer_tmpfile);
@ -2626,7 +2627,7 @@ void syncWithMaster(connection *conn) {
if (psync_result == PSYNC_CONTINUE) { if (psync_result == PSYNC_CONTINUE) {
serverLog(LL_NOTICE, "MASTER <-> REPLICA sync: Master accepted a Partial Resynchronization."); serverLog(LL_NOTICE, "MASTER <-> REPLICA sync: Master accepted a Partial Resynchronization.");
if (server.supervised_mode == SUPERVISED_SYSTEMD) { if (cserver.supervised_mode == SUPERVISED_SYSTEMD) {
redisCommunicateSystemd("STATUS=MASTER <-> REPLICA sync: Partial Resynchronization accepted. Ready to accept connections.\n"); redisCommunicateSystemd("STATUS=MASTER <-> REPLICA sync: Partial Resynchronization accepted. Ready to accept connections.\n");
redisCommunicateSystemd("READY=1\n"); redisCommunicateSystemd("READY=1\n");
} }

4
src/server.cpp
View File

@ -1494,7 +1494,7 @@ int hasActiveChildProcess() {
/* Return true if this instance has persistence completely turned off: /* Return true if this instance has persistence completely turned off:
* both RDB and AOF are disabled. */ * both RDB and AOF are disabled. */
int allPersistenceDisabled(void) { int allPersistenceDisabled(void) {
return server.saveparamslen == 0 && server.aof_state == AOF_OFF; return g_pserver->saveparamslen == 0 && g_pserver->aof_state == AOF_OFF;
} }
/* ======================= Cron: called every 100 ms ======================== */ /* ======================= Cron: called every 100 ms ======================== */
@ -3488,7 +3488,7 @@ void call(client *c, int flags) {
if (flags & CMD_CALL_PROPAGATE) { if (flags & CMD_CALL_PROPAGATE) {
bool multi_emitted = false; bool multi_emitted = false;
/* Wrap the commands in server.also_propagate array, /* Wrap the commands in g_pserver->also_propagate array,
* but don't wrap it if we are already in MULIT context, * but don't wrap it if we are already in MULIT context,
* in case the nested MULIT/EXEC. * in case the nested MULIT/EXEC.
* *