From 82cb879485db56fc78ca22d0581c7405a8497d80 Mon Sep 17 00:00:00 2001 From: John Sully Date: Sat, 1 Feb 2020 20:26:09 -0500 Subject: [PATCH] Fix spurious error messages trying to join the RDB save thread Former-commit-id: 775f3477655207a4df2b0b3609f3ee83d41098af --- src/server.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index ea4289e58..ceecdb2f5 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1846,10 +1846,11 @@ void checkChildrenDone(void) { if (g_pserver->FRdbSaveInProgress()) { 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) - serverLog(LL_WARNING, "Error joining the background RDB save thread: %s\n", strerror(errno)); + if (err != EBUSY && errno != EAGAIN) + serverLog(LL_WARNING, "Error joining the background RDB save thread: %s\n", strerror(err)); } else {