[hotfix] master restart fail when ror server open gtid

Author: gd.zhou

src/networking.c

@@ -2285,6 +2285,9 @@ static inline int _writeToClientSlave(client *c, ssize_t *nwritten) {
     *nwritten = 0;
     serverAssert(c->bufpos == 0 && listLength(c->reply) == 0);
     replBufBlock *o = listNodeValue(c->ref_repl_buf_node);
+    if (o->used < c->ref_block_pos) {
+        serverLog(LL_WARNING, "o->used(%lld) < c->ref_block_pos(%lld)", o->used, c->ref_block_pos);
+    }
     serverAssert(o->used >= c->ref_block_pos);
     /* Send current block if it is not fully sent. */
     if (o->used > c->ref_block_pos) {

src/rdb.c

@@ -3841,7 +3841,8 @@ int rdbLoadRioWithLoadingCtx(rio *rdb, int rdbflags, rdbSaveInfo *rsi, rdbLoadin
                 serverAssert(server.repl_backlog != NULL && listLength(server.slaves) == 0);
                 robj keyobj;
                 initStaticStringObject(keyobj,key);
-                if (server.gtid_enabled || (rsi->gtid != NULL && rsi->gtid->repl_mode == REPL_MODE_XSYNC)) {
+                // || (rsi->gtid != NULL && rsi->gtid->repl_mode == REPL_MODE_XSYNC)
+                if (server.gtid_enabled) {
                     gno_t gno = 0;
                     char *buf, *uuid = server.uuid;
                     size_t bufmaxlen, buflen, uuid_len = server.uuid_len;

src/server.c

@@ -7691,22 +7691,45 @@ void loadDataFromDisk(void) {
                     server.repl_backlog->offset = server.master_repl_offset -
                               server.repl_backlog->histlen + 1;
                     rebaseReplicationBuffer(rsi.repl_offset);
-                    if (server.gtid_enabled || (rsi.gtid != NULL && rsi.gtid->repl_mode == REPL_MODE_XSYNC) ) {
+                    // if (server.gtid_enabled || (rsi.gtid != NULL && rsi.gtid->repl_mode == REPL_MODE_XSYNC) ) {
+                    //     server.repl_mode->mode = REPL_MODE_XSYNC;
+                    //     server.repl_mode->from = rsi.repl_offset + 1;
+                    //     server.prev_repl_mode->mode = REPL_MODE_PSYNC;
+                    //     memcpy(server.prev_repl_mode->psync.replid,rsi.repl_id,sizeof(rsi.repl_id));
+                    //     server.prev_repl_mode->from = 1;
+                    //     gtidSeqRebaseOffset(server.gtid_seq, server.uuid, server.uuid_len, rsi.repl_offset);
+                    //     if (rsi.gtid != NULL) {
+                    //         serverGtidSetResetExecuted(gtidSetDup(rsi.gtid->gtid_executed));
+                    //         serverGtidSetResetLost(gtidSetDup(rsi.gtid->gtid_lost));
+                    //     }
+                    // } else {
+                    //     serverAssert(server.repl_mode->mode == REPL_MODE_PSYNC);
+                    //     serverAssert(server.repl_mode->from == 1);
+                    // }
+                    if (server.gtid_enabled) {
                         server.repl_mode->mode = REPL_MODE_XSYNC;
                         server.repl_mode->from = rsi.repl_offset + 1;
                         server.prev_repl_mode->mode = REPL_MODE_PSYNC;
                         memcpy(server.prev_repl_mode->psync.replid,rsi.repl_id,sizeof(rsi.repl_id));
                         server.prev_repl_mode->from = 1;
                         gtidSeqRebaseOffset(server.gtid_seq, server.uuid, server.uuid_len, rsi.repl_offset);
                         if (rsi.gtid != NULL) {
-                            serverGtidSetResetExecuted(gtidSetDup(rsi.gtid->gtid_executed));
-                            serverGtidSetResetLost(gtidSetDup(rsi.gtid->gtid_lost));
+                            // serverGtidSetResetExecuted(gtidSetDup(rsi.gtid->gtid_executed));
+                            // serverGtidSetResetLost(gtidSetDup(rsi.gtid->gtid_lost));
+                            gtidSetMerge(server.gtid_executed, rsi.gtid->gtid_executed);
+                            gtidSetMerge(server.gtid_lost, rsi.gtid->gtid_lost);
                         }
                     } else {
-                        serverAssert(server.repl_mode->mode == REPL_MODE_PSYNC);
-                        serverAssert(server.repl_mode->from == 1);
+                        if (rsi.gtid != NULL && rsi.gtid->repl_mode == REPL_MODE_XSYNC) {
+                            server.prev_repl_mode->mode = REPL_MODE_XSYNC;
+                            server.prev_repl_mode->from = 1;
+                            server.repl_mode->mode=REPL_MODE_PSYNC;
+                            server.repl_mode->from = rsi.repl_offset + 1;
+                        } else {
+                            serverAssert(server.repl_mode->mode == REPL_MODE_PSYNC);
+                            serverAssert(server.repl_mode->from == 1);
+                        }
                     }
-                    
                     server.repl_no_slaves_since = time(NULL);
                 }
             }

tests/gtid/aof.tcl

@@ -1,4 +1,4 @@
-
+if {!$::swap} {
 source tests/support/aofmanifest.tcl
 set defaults {appendonly {yes} appendfilename {appendonly.aof} appenddirname {appendonlydir} auto-aof-rewrite-percentage {0}}
 set server_path [tmpdir server.multi.aof]
@@ -162,4 +162,5 @@ test "aof" {
         }
     }
 
+}
 }