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

Fix spurious error messages trying to join the RDB save thread

Browse Source 
Former-commit-id: 775f3477655207a4df2b0b3609f3ee83d41098af
This commit is contained in:
John Sully 2020-02-01 20:26:09 -05:00
parent d715bc15e1
commit 82cb879485
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/server.cpp
View File

@ -1846,10 +1846,11 @@ void checkChildrenDone(void) {
if (g_pserver->FRdbSaveInProgress()) if (g_pserver->FRdbSaveInProgress())
{ {
void *rval = nullptr; void *rval = nullptr;
if (pthread_tryjoin_np(g_pserver->rdbThreadVars.rdb_child_thread, &rval)) int err;
if ((err = pthread_tryjoin_np(g_pserver->rdbThreadVars.rdb_child_thread, &rval)))
{ {
if (errno != EBUSY && errno != EAGAIN) if (err != EBUSY && errno != EAGAIN)
serverLog(LL_WARNING, "Error joining the background RDB save thread: %s\n", strerror(errno)); serverLog(LL_WARNING, "Error joining the background RDB save thread: %s\n", strerror(err));
} }
else else
{ {