From f979efd2b5a8f475c4fca6ba0de16d93c23b9ada Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Czern=C3=BD?= Date: Wed, 26 Aug 2020 12:10:34 +0200 Subject: [PATCH] B #5040: Fix LogDB::purge_log (#166) (cherry picked from commit 734bc15b3008df9f7b7c3d7caf853c0aa8d4bdb6) --- src/sql/LogDB.cc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/sql/LogDB.cc b/src/sql/LogDB.cc index f4aa0afd1b..c74c1be479 100644 --- a/src/sql/LogDB.cc +++ b/src/sql/LogDB.cc @@ -611,8 +611,8 @@ int LogDB::purge_log() multiple_cb cb_info; single_cb cb_min_idx; - std::vector maxmin_i{0, 0}; - std::vector maxmin_e{0, 0}; + std::vector maxmin_i; + std::vector maxmin_e; string min_idx; int rc = 0; @@ -677,11 +677,14 @@ int LogDB::purge_log() cb_info.unset_callback(); - oss.str(""); - oss << "Purging obsolete LogDB records: " << rc << " records purged. Log state: " - << maxmin_i[0] << "," << maxmin_i[1] << " - " << maxmin_e[0] << "," << maxmin_e[1]; + if (maxmin_i.size() == 2 && maxmin_e.size() == 2) + { + oss.str(""); + oss << "Purging obsolete LogDB records: " << rc << " records purged. Log state: " + << maxmin_i[0] << "," << maxmin_i[1] << " - " << maxmin_e[0] << "," << maxmin_e[1]; - NebulaLog::log("DBM", Log::INFO, oss); + NebulaLog::log("DBM", Log::INFO, oss); + } /* ---------------------------------------------------------------------- */ /* Federated records. Keep last log_retention federated records */