tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-26 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Log can't-do-yets summmary"

Browse Source 
This reverts commit a652c4f52a1ac713bcfcd87979d9adae595673f6.
This commit is contained in:
Alexander A. Klimov 2022-03-28 17:07:17 +02:00
parent 06e0d75f99
commit 10b3bacb48
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/db_ido_mysql/idomysqlconnection.cpp
View File

@ -85,14 +85,6 @@ void IdoMysqlConnection::Resume()
m_ReconnectTimer->OnTimerExpired.connect(std::bind(&IdoMysqlConnection::ReconnectTimerHandler, this)); m_ReconnectTimer->OnTimerExpired.connect(std::bind(&IdoMysqlConnection::ReconnectTimerHandler, this));
m_ReconnectTimer->Start(); m_ReconnectTimer->Start();
m_RescheduledQueriesLogTimer = new Timer();
m_RescheduledQueriesLogTimer->SetInterval(10);
m_RescheduledQueriesLogTimer->OnTimerExpired.connect([this](const Timer * const&) {
Log(LogDebug, "IdoMysqlConnectionDebug")
<< "Re-scheduled " << m_RescheduledQueries.exchange(0) << " in the last 10s";
});
m_RescheduledQueriesLogTimer->Start();
/* Start with queries after connect. */ /* Start with queries after connect. */
DbConnection::Resume(); DbConnection::Resume();
@ -1024,7 +1016,6 @@ void IdoMysqlConnection::InternalExecuteMultipleQueries(const std::vector<DbQuer
ASSERT(query.Type == DbQueryNewTransaction || query.Category != DbCatInvalid); ASSERT(query.Type == DbQueryNewTransaction || query.Category != DbCatInvalid);
if (!CanExecuteQuery(query)) { if (!CanExecuteQuery(query)) {
m_RescheduledQueries.fetch_add(1);
#ifdef I2_DEBUG /* I2_DEBUG */ #ifdef I2_DEBUG /* I2_DEBUG */
Log(LogDebug, "IdoMysqlConnection") Log(LogDebug, "IdoMysqlConnection")
@ -1075,7 +1066,6 @@ void IdoMysqlConnection::InternalExecuteQuery(const DbQuery& query, int typeOver
/* check if there are missing object/insert ids and re-enqueue the query */ /* check if there are missing object/insert ids and re-enqueue the query */
if (!CanExecuteQuery(query)) { if (!CanExecuteQuery(query)) {
m_RescheduledQueries.fetch_add(1);
#ifdef I2_DEBUG /* I2_DEBUG */ #ifdef I2_DEBUG /* I2_DEBUG */
Log(LogDebug, "IdoMysqlConnection") Log(LogDebug, "IdoMysqlConnection")
@ -1099,7 +1089,6 @@ void IdoMysqlConnection::InternalExecuteQuery(const DbQuery& query, int typeOver
for (const Dictionary::Pair& kv : query.WhereCriteria) { for (const Dictionary::Pair& kv : query.WhereCriteria) {
if (!FieldToEscapedString(kv.first, kv.second, &value)) { if (!FieldToEscapedString(kv.first, kv.second, &value)) {
m_RescheduledQueries.fetch_add(1);
#ifdef I2_DEBUG /* I2_DEBUG */ #ifdef I2_DEBUG /* I2_DEBUG */
Log(LogDebug, "IdoMysqlConnection") Log(LogDebug, "IdoMysqlConnection")
@ -1180,7 +1169,6 @@ void IdoMysqlConnection::InternalExecuteQuery(const DbQuery& query, int typeOver
continue; continue;
if (!FieldToEscapedString(kv.first, kv.second, &value)) { if (!FieldToEscapedString(kv.first, kv.second, &value)) {
m_RescheduledQueries.fetch_add(1);
#ifdef I2_DEBUG /* I2_DEBUG */ #ifdef I2_DEBUG /* I2_DEBUG */
Log(LogDebug, "IdoMysqlConnection") Log(LogDebug, "IdoMysqlConnection")

2
lib/db_ido_mysql/idomysqlconnection.hpp
View File

@ -64,11 +64,9 @@ private:
std::vector<IdoAsyncQuery> m_AsyncQueries; std::vector<IdoAsyncQuery> m_AsyncQueries;
uint_fast32_t m_UncommittedAsyncQueries = 0; uint_fast32_t m_UncommittedAsyncQueries = 0;
std::atomic<uint_fast32_t> m_RescheduledQueries {0};
Timer::Ptr m_ReconnectTimer; Timer::Ptr m_ReconnectTimer;
Timer::Ptr m_TxTimer; Timer::Ptr m_TxTimer;
Timer::Ptr m_RescheduledQueriesLogTimer;
IdoMysqlResult Query(const String& query); IdoMysqlResult Query(const String& query);
DbReference GetLastInsertID(); DbReference GetLastInsertID();