Merge remote-tracking branch 'origin/fastsync_collab' into fastsync_collab2

Former-commit-id: 176c00615769e1a73eb44f8fe7a6cacfa2ae539d
This commit is contained in:
malavan 2021-11-24 22:00:18 +00:00
commit bbb565abb0

View File

@ -1378,8 +1378,11 @@ void syncCommand(client *c) {
g_pserver->replid, g_pserver->replid2); g_pserver->replid, g_pserver->replid2);
} }
/* CASE 0: Fast Sync */
if ((c->slave_capa & SLAVE_CAPA_ROCKSDB_SNAPSHOT) && g_pserver->m_pstorageFactory) {
startBgsaveForReplication(c->slave_capa);
/* CASE 1: BGSAVE is in progress, with disk target. */ /* CASE 1: BGSAVE is in progress, with disk target. */
if (g_pserver->FRdbSaveInProgress() && } else if (g_pserver->FRdbSaveInProgress() &&
g_pserver->rdb_child_type == RDB_CHILD_TYPE_DISK) g_pserver->rdb_child_type == RDB_CHILD_TYPE_DISK)
{ {
/* Ok a background save is in progress. Let's check if it is a good /* Ok a background save is in progress. Let's check if it is a good