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

Fix repl-psync-flash test instability

Browse Source 
Former-commit-id: 310b0cf5413dbf3e7aa67e9b9c31869f3e994291
This commit is contained in:
John Sully 2021-12-23 17:30:14 -05:00
parent c03a4e5838
commit cc70550e67
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/replication.cpp
View File

@ -2157,7 +2157,7 @@ void updateSlavesWaitingBgsave(int bgsaveerr, int type)
* Returns if no storage provider is used. */ * Returns if no storage provider is used. */
void saveMasterStatusToStorage(bool fShutdown) void saveMasterStatusToStorage(bool fShutdown)
{ {
long long tmp = -1; long long tmp = LONG_LONG_MAX;
if (!g_pserver->m_pstorageFactory || !g_pserver->metadataDb) return; if (!g_pserver->m_pstorageFactory || !g_pserver->metadataDb) return;
g_pserver->metadataDb->insert("repl-id", 7, g_pserver->replid, sizeof(g_pserver->replid), true); g_pserver->metadataDb->insert("repl-id", 7, g_pserver->replid, sizeof(g_pserver->replid), true);

2
tests/integration/replication-psync-flash.tcl
View File

@ -9,7 +9,7 @@
# reconnect with the master, otherwise just the initial synchronization is # reconnect with the master, otherwise just the initial synchronization is
# checked for consistency. # checked for consistency.
proc test_psync {descr duration backlog_size backlog_ttl delay cond mdl sdl reconnect} { proc test_psync {descr duration backlog_size backlog_ttl delay cond mdl sdl reconnect} {
start_server [list tags {"repl"} overrides [list storage-provider {flash .rocks.db.m} repl-backlog-size 1m]] { start_server [list tags {"repl"} overrides [list storage-provider {flash .rocks.db.m} repl-backlog-size 64m]] {
start_server [list tags {flash} overrides [list storage-provider {flash ./rocks.db} delete-on-evict no storage-flush-period 10]] { start_server [list tags {flash} overrides [list storage-provider {flash ./rocks.db} delete-on-evict no storage-flush-period 10]] {
set master [srv -1 client] set master [srv -1 client]