From eddb4beea0d495ef52ab37f282ac67203cec01a8 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Mon, 28 Mar 2022 17:11:46 +0200
Subject: [PATCH] Log can't-do-yets

---
 lib/db_ido_mysql/idomysqlconnection.cpp | 26 ++++++++++---------------
 lib/db_ido_mysql/idomysqlconnection.hpp |  1 +
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
index fbe60b303..2eb9fd5f4 100644
--- a/lib/db_ido_mysql/idomysqlconnection.cpp
+++ b/lib/db_ido_mysql/idomysqlconnection.cpp
@@ -488,6 +488,8 @@ void IdoMysqlConnection::FinishConnect(double startTime)
 
 	Query("COMMIT");
 	Query("BEGIN");
+
+	m_Reconnected = true;
 }
 
 void IdoMysqlConnection::ClearTablesBySession()
@@ -1016,12 +1018,10 @@ void IdoMysqlConnection::InternalExecuteMultipleQueries(const std::vector<DbQuer
 		ASSERT(query.Type == DbQueryNewTransaction || query.Category != DbCatInvalid);
 
 		if (!CanExecuteQuery(query)) {
-
-#ifdef I2_DEBUG /* I2_DEBUG */
-			Log(LogDebug, "IdoMysqlConnection")
+			if (m_Reconnected && query.Table != "contactnotifications")
+			Log(LogDebug, "IdoMysqlConnectionDebug")
 				<< "Scheduling multiple execute query task again: Cannot execute query now. Type '"
 				<< query.Type << "', table '" << query.Table << "', queue size: '" << GetPendingQueryCount() << "'.";
-#endif /* I2_DEBUG */
 
 			m_QueryQueue.Enqueue(std::bind(&IdoMysqlConnection::InternalExecuteMultipleQueries, this, queries), query.Priority);
 			return;
@@ -1066,12 +1066,10 @@ void IdoMysqlConnection::InternalExecuteQuery(const DbQuery& query, int typeOver
 
 	/* check if there are missing object/insert ids and re-enqueue the query */
 	if (!CanExecuteQuery(query)) {
-
-#ifdef I2_DEBUG /* I2_DEBUG */
-		Log(LogDebug, "IdoMysqlConnection")
+		if (m_Reconnected && query.Table != "contactnotifications")
+		Log(LogDebug, "IdoMysqlConnectionDebug")
 			<< "Scheduling execute query task again: Cannot execute query now. Type '"
 			<< typeOverride << "', table '" << query.Table << "', queue size: '" << GetPendingQueryCount() << "'.";
-#endif /* I2_DEBUG */
 
 		m_QueryQueue.Enqueue(std::bind(&IdoMysqlConnection::InternalExecuteQuery, this, query, typeOverride), query.Priority);
 		return;
@@ -1089,12 +1087,10 @@ void IdoMysqlConnection::InternalExecuteQuery(const DbQuery& query, int typeOver
 
 		for (const Dictionary::Pair& kv : query.WhereCriteria) {
 			if (!FieldToEscapedString(kv.first, kv.second, &value)) {
-
-#ifdef I2_DEBUG /* I2_DEBUG */
-				Log(LogDebug, "IdoMysqlConnection")
+				if (m_Reconnected && query.Table != "contactnotifications")
+				Log(LogDebug, "IdoMysqlConnectionDebug")
 					<< "Scheduling execute query task again: Cannot execute query now. Type '"
 					<< typeOverride << "', table '" << query.Table << "', queue size: '" << GetPendingQueryCount() << "'.";
-#endif /* I2_DEBUG */
 
 				m_QueryQueue.Enqueue(std::bind(&IdoMysqlConnection::InternalExecuteQuery, this, query, -1), query.Priority);
 				return;
@@ -1169,12 +1165,10 @@ void IdoMysqlConnection::InternalExecuteQuery(const DbQuery& query, int typeOver
 				continue;
 
 			if (!FieldToEscapedString(kv.first, kv.second, &value)) {
-
-#ifdef I2_DEBUG /* I2_DEBUG */
-				Log(LogDebug, "IdoMysqlConnection")
+				if (m_Reconnected && query.Table != "contactnotifications")
+				Log(LogDebug, "IdoMysqlConnectionDebug")
 					<< "Scheduling execute query task again: Cannot extract required INSERT/UPDATE fields, key '"
 					<< kv.first << "', val '" << kv.second << "', type " << typeOverride << ", table '" << query.Table << "'.";
-#endif /* I2_DEBUG */
 
 				m_QueryQueue.Enqueue(std::bind(&IdoMysqlConnection::InternalExecuteQuery, this, query, -1), query.Priority);
 				return;
diff --git a/lib/db_ido_mysql/idomysqlconnection.hpp b/lib/db_ido_mysql/idomysqlconnection.hpp
index 4cd9cac0d..be2d29fb5 100644
--- a/lib/db_ido_mysql/idomysqlconnection.hpp
+++ b/lib/db_ido_mysql/idomysqlconnection.hpp
@@ -64,6 +64,7 @@ private:
 
 	std::vector<IdoAsyncQuery> m_AsyncQueries;
 	uint_fast32_t m_UncommittedAsyncQueries = 0;
+	bool m_Reconnected = false;
 
 	Timer::Ptr m_ReconnectTimer;
 	Timer::Ptr m_TxTimer;