diff --git a/broker/bam/src/availability_thread.cc b/broker/bam/src/availability_thread.cc index a07a4b6a2fe..44f0c5a6bf8 100644 --- a/broker/bam/src/availability_thread.cc +++ b/broker/bam/src/availability_thread.cc @@ -425,7 +425,7 @@ void availability_thread::_write_availability( builder.get_unknown_opened(), builder.get_downtime_opened())); log_v2::bam()->debug("Query: {}", query_str); - _mysql->run_query(query_str, database::mysql_error::insert_availability, true, + _mysql->run_query(query_str, database::mysql_error::insert_availability, thread_id); } diff --git a/broker/bam/src/monitoring_stream.cc b/broker/bam/src/monitoring_stream.cc index 396539ee3d1..ba67c047f4e 100644 --- a/broker/bam/src/monitoring_stream.cc +++ b/broker/bam/src/monitoring_stream.cc @@ -327,7 +327,7 @@ int monitoring_stream::write(std::shared_ptr const& data) { _ba_update.bind_value_as_bool(4, status->in_downtime); _ba_update.bind_value_as_i32(5, status->state); - _mysql.run_statement(_ba_update, database::mysql_error::update_ba, true); + _mysql.run_statement(_ba_update, database::mysql_error::update_ba); ++_pending_request; commit_if_needed(); @@ -370,7 +370,7 @@ int monitoring_stream::write(std::shared_ptr const& data) { _ba_update.bind_value_as_bool(4, status.in_downtime()); _ba_update.bind_value_as_i32(5, status.state()); - _mysql.run_statement(_ba_update, database::mysql_error::update_ba, true); + _mysql.run_statement(_ba_update, database::mysql_error::update_ba); ++_pending_request; commit_if_needed(); @@ -415,8 +415,7 @@ int monitoring_stream::write(std::shared_ptr const& data) { _kpi_update.bind_value_as_bool(8, status->in_downtime); _kpi_update.bind_value_as_u32(9, status->kpi_id); - _mysql.run_statement(_kpi_update, database::mysql_error::update_kpi, - true); + _mysql.run_statement(_kpi_update, database::mysql_error::update_kpi); ++_pending_request; commit_if_needed(); @@ -445,8 +444,7 @@ int monitoring_stream::write(std::shared_ptr const& data) { _kpi_update.bind_value_as_bool(8, status.in_downtime()); _kpi_update.bind_value_as_u32(9, status.kpi_id()); - _mysql.run_statement(_kpi_update, database::mysql_error::update_kpi, - true); + _mysql.run_statement(_kpi_update, database::mysql_error::update_kpi); ++_pending_request; commit_if_needed(); diff --git a/broker/bam/src/reporting_stream.cc b/broker/bam/src/reporting_stream.cc index fe1713a9f8e..619043d0dfb 100644 --- a/broker/bam/src/reporting_stream.cc +++ b/broker/bam/src/reporting_stream.cc @@ -308,7 +308,7 @@ void reporting_stream::_close_inconsistent_events(char const* event_type, table, end_time, id, p.first, p.second)); SPDLOG_LOGGER_TRACE(log_v2::bam(), "reporting_stream: query: '{}'", query); - _mysql.run_query(query, database::mysql_error::close_event, true); + _mysql.run_query(query, database::mysql_error::close_event); } } } @@ -638,7 +638,7 @@ void reporting_stream::_process_ba_event(std::shared_ptr const& e) { _kpi_event_link_update.bind_value_as_u64( 1, m_events[be.start_time.get_time_t()]); _mysql.run_statement(_kpi_event_link_update, - database::mysql_error::update_kpi_event, true); + database::mysql_error::update_kpi_event); } // remove older events for BA for (auto it = m_events.begin(); it != m_events.end();) { @@ -729,7 +729,7 @@ void reporting_stream::_process_pb_ba_event( _kpi_event_link_update.bind_value_as_u64(1, m_events[be.start_time()]); _mysql.run_statement(_kpi_event_link_update, - database::mysql_error::update_kpi_event, true); + database::mysql_error::update_kpi_event); } // remove older events for BA for (auto it = m_events.begin(); it != m_events.end();) { @@ -801,7 +801,7 @@ void reporting_stream::_process_ba_duration_event( 7, static_cast(bde.real_start_time.get_time_t())); _mysql.run_statement(_ba_duration_event_insert, - database::mysql_error::empty, true, thread_id); + database::mysql_error::empty, thread_id); } } catch (std::exception const& e) { throw msg_fmt( @@ -857,7 +857,7 @@ void reporting_stream::_process_pb_ba_duration_event( _ba_duration_event_insert.bind_value_as_u64(7, bde.real_start_time()); _mysql.run_statement(_ba_duration_event_insert, - database::mysql_error::empty, true, thread_id); + database::mysql_error::empty, thread_id); } } catch (std::exception const& e) { throw msg_fmt( @@ -914,8 +914,7 @@ void reporting_stream::_process_kpi_event(std::shared_ptr const& e) { _kpi_full_event_insert.bind_value_as_i32(5, ke.impact_level); _mysql.run_statement(_kpi_full_event_insert, - database::mysql_error::insert_kpi_event, true, - thread_id); + database::mysql_error::insert_kpi_event, thread_id); // Insert kpi event link. _kpi_event_link.bind_value_as_i32(0, ke.kpi_id); @@ -986,8 +985,7 @@ void reporting_stream::_process_pb_kpi_event( _kpi_full_event_insert.bind_value_as_i32(5, ke.impact_level()); _mysql.run_statement(_kpi_full_event_insert, - database::mysql_error::insert_kpi_event, true, - thread_id); + database::mysql_error::insert_kpi_event, thread_id); // Insert kpi event link. _kpi_event_link.bind_value_as_i32(0, ke.kpi_id()); @@ -1037,8 +1035,7 @@ void reporting_stream::_process_dimension_ba( _dimension_ba_insert.bind_value_as_f64(4, dba.sla_month_percent_warn); _dimension_ba_insert.bind_value_as_f64(5, dba.sla_duration_crit); _dimension_ba_insert.bind_value_as_f64(6, dba.sla_duration_warn); - _mysql.run_statement(_dimension_ba_insert, database::mysql_error::insert_ba, - false); + _mysql.run_statement(_dimension_ba_insert, database::mysql_error::insert_ba); } /** @@ -1066,8 +1063,7 @@ void reporting_stream::_process_pb_dimension_ba( _dimension_ba_insert.bind_value_as_f64(4, dba.sla_month_percent_warn()); _dimension_ba_insert.bind_value_as_f64(5, dba.sla_duration_crit()); _dimension_ba_insert.bind_value_as_f64(6, dba.sla_duration_warn()); - _mysql.run_statement(_dimension_ba_insert, database::mysql_error::insert_ba, - false); + _mysql.run_statement(_dimension_ba_insert, database::mysql_error::insert_ba); } /** @@ -1092,8 +1088,7 @@ void reporting_stream::_process_dimension_bv( 2, misc::string::truncate(dbv.bv_description, get_mod_bam_reporting_bv_col_size( mod_bam_reporting_bv_bv_description))); - _mysql.run_statement(_dimension_bv_insert, database::mysql_error::insert_bv, - false); + _mysql.run_statement(_dimension_bv_insert, database::mysql_error::insert_bv); } /** @@ -1118,8 +1113,7 @@ void reporting_stream::_process_pb_dimension_bv( 2, misc::string::truncate(dbv.bv_description(), get_mod_bam_reporting_bv_col_size( mod_bam_reporting_bv_bv_description))); - _mysql.run_statement(_dimension_bv_insert, database::mysql_error::insert_bv, - false); + _mysql.run_statement(_dimension_bv_insert, database::mysql_error::insert_bv); } /** @@ -1138,7 +1132,7 @@ void reporting_stream::_process_dimension_ba_bv_relation( _dimension_ba_bv_relation_insert.bind_value_as_i32(0, dbabv.ba_id); _dimension_ba_bv_relation_insert.bind_value_as_i32(1, dbabv.bv_id); _mysql.run_statement(_dimension_ba_bv_relation_insert, - database::mysql_error::insert_dimension_ba_bv, false); + database::mysql_error::insert_dimension_ba_bv); } /** @@ -1158,7 +1152,7 @@ void reporting_stream::_process_pb_dimension_ba_bv_relation( _dimension_ba_bv_relation_insert.bind_value_as_i32(0, dbabv.ba_id()); _dimension_ba_bv_relation_insert.bind_value_as_i32(1, dbabv.bv_id()); _mysql.run_statement(_dimension_ba_bv_relation_insert, - database::mysql_error::insert_dimension_ba_bv, false); + database::mysql_error::insert_dimension_ba_bv); } /** @@ -1509,7 +1503,7 @@ void reporting_stream::_process_dimension_kpi( mod_bam_reporting_kpi_boolean_name))); _mysql.run_statement(_dimension_kpi_insert, - database::mysql_error::insert_dimension_kpi, false); + database::mysql_error::insert_dimension_kpi); } /** @@ -1579,7 +1573,7 @@ void reporting_stream::_process_pb_dimension_kpi( mod_bam_reporting_kpi_boolean_name))); _mysql.run_statement(_dimension_kpi_insert, - database::mysql_error::insert_dimension_kpi, false); + database::mysql_error::insert_dimension_kpi); } /** @@ -1630,7 +1624,7 @@ void reporting_stream::_process_pb_dimension_timeperiod( get_mod_bam_reporting_timeperiods_col_size( mod_bam_reporting_timeperiods_saturday))); _mysql.run_statement(_dimension_timeperiod_insert, - database::mysql_error::insert_timeperiod, false); + database::mysql_error::insert_timeperiod); _apply(tp); } @@ -1683,7 +1677,7 @@ void reporting_stream::_process_dimension_timeperiod( get_mod_bam_reporting_timeperiods_col_size( mod_bam_reporting_timeperiods_saturday))); _mysql.run_statement(_dimension_timeperiod_insert, - database::mysql_error::insert_timeperiod, false); + database::mysql_error::insert_timeperiod); DimensionTimeperiod convert; convert.set_id(tp.id); convert.set_name(tp.name); @@ -1716,8 +1710,7 @@ void reporting_stream::_process_dimension_ba_timeperiod_relation( _dimension_ba_timeperiod_insert.bind_value_as_i32(1, r.timeperiod_id); _dimension_ba_timeperiod_insert.bind_value_as_bool(2, r.is_default); _mysql.run_statement(_dimension_ba_timeperiod_insert, - database::mysql_error::insert_relation_ba_timeperiod, - false); + database::mysql_error::insert_relation_ba_timeperiod); _timeperiods.add_relation(r.ba_id, r.timeperiod_id, r.is_default); } @@ -1741,8 +1734,7 @@ void reporting_stream::_process_pb_dimension_ba_timeperiod_relation( _dimension_ba_timeperiod_insert.bind_value_as_i32(1, r.timeperiod_id()); _dimension_ba_timeperiod_insert.bind_value_as_bool(2, r.is_default()); _mysql.run_statement(_dimension_ba_timeperiod_insert, - database::mysql_error::insert_relation_ba_timeperiod, - false); + database::mysql_error::insert_relation_ba_timeperiod); _timeperiods.add_relation(r.ba_id(), r.timeperiod_id(), r.is_default()); } @@ -1846,7 +1838,7 @@ void reporting_stream::_process_rebuild(std::shared_ptr const& e) { SPDLOG_LOGGER_TRACE(log_v2::bam(), "reporting_stream: query: '{}'", query); - _mysql.run_query(query, database::mysql_error::delete_ba_durations, true); + _mysql.run_query(query, database::mysql_error::delete_ba_durations); } // Get the ba events. diff --git a/broker/core/inc/com/centreon/broker/database/mysql_task.hh b/broker/core/inc/com/centreon/broker/database/mysql_task.hh index e1afa75f831..9d08708b12d 100644 --- a/broker/core/inc/com/centreon/broker/database/mysql_task.hh +++ b/broker/core/inc/com/centreon/broker/database/mysql_task.hh @@ -114,11 +114,10 @@ class mysql_task_prepare : public mysql_task { class mysql_task_run : public mysql_task { public: - mysql_task_run(std::string const& q, mysql_error::code ec, bool fatal) - : mysql_task(mysql_task::RUN), query(q), error_code(ec), fatal(fatal) {} + mysql_task_run(std::string const& q, mysql_error::code ec) + : mysql_task(mysql_task::RUN), query(q), error_code(ec) {} std::string query; mysql_error::code error_code; - bool fatal; }; class mysql_task_run_res : public mysql_task { @@ -154,14 +153,11 @@ class mysql_task_run_int : public mysql_task { class mysql_task_statement : public mysql_task { public: - mysql_task_statement(database::mysql_stmt_base& stmt, - mysql_error::code ec, - bool fatal) + mysql_task_statement(database::mysql_stmt_base& stmt, mysql_error::code ec) : mysql_task(mysql_task::STATEMENT), statement_id(stmt.get_id()), param_count(stmt.get_param_count()), - error_code(ec), - fatal(fatal) { + error_code(ec) { if (stmt.in_bulk()) { database::mysql_bulk_stmt& s = *static_cast(&stmt); @@ -177,7 +173,6 @@ class mysql_task_statement : public mysql_task { int param_count; std::unique_ptr bind; mysql_error::code error_code; - bool fatal; bool bulk; }; @@ -217,12 +212,13 @@ class mysql_task_statement_int : public mysql_task { mysql_task_statement_int(database::mysql_stmt_base& stmt, std::promise&& promise, int_type type) - : mysql_task((std::is_same::value) ? mysql_task::STATEMENT_INT - : (std::is_same::value) - ? mysql_task::STATEMENT_INT64 - : (std::is_same::value) - ? mysql_task::STATEMENT_UINT - : mysql_task::STATEMENT_UINT64), + : mysql_task((std::is_same::value) + ? mysql_task::STATEMENT_INT + : (std::is_same::value) + ? mysql_task::STATEMENT_INT64 + : (std::is_same::value) + ? mysql_task::STATEMENT_UINT + : mysql_task::STATEMENT_UINT64), promise(std::move(promise)), return_type(type), statement_id(stmt.get_id()), diff --git a/broker/core/inc/com/centreon/broker/mysql.hh b/broker/core/inc/com/centreon/broker/mysql.hh index 9c8766cfdbc..91821ca244d 100644 --- a/broker/core/inc/com/centreon/broker/mysql.hh +++ b/broker/core/inc/com/centreon/broker/mysql.hh @@ -40,7 +40,6 @@ class mysql { void commit(int thread_id = -1); int run_query(std::string const& query, my_error::code ec = my_error::empty, - bool fatal = false, int thread = -1); int run_query_and_get_result(std::string const& query, std::promise&& promise, @@ -52,7 +51,6 @@ class mysql { int run_statement(database::mysql_stmt_base& stmt, my_error::code ec = my_error::empty, - bool fatal = false, int thread_id = -1); int run_statement_and_get_result( diff --git a/broker/core/inc/com/centreon/broker/mysql_connection.hh b/broker/core/inc/com/centreon/broker/mysql_connection.hh index 3390a3c2f11..2d6a6952339 100644 --- a/broker/core/inc/com/centreon/broker/mysql_connection.hh +++ b/broker/core/inc/com/centreon/broker/mysql_connection.hh @@ -151,7 +151,7 @@ class mysql_connection { void commit( const database::mysql_task_commit::mysql_task_commit_data::pointer& commit_data); - void run_query(std::string const& query, my_error::code ec, bool fatal); + void run_query(std::string const& query, my_error::code ec); void run_query_and_get_result(std::string const& query, std::promise&& promise); void run_query_and_get_int(std::string const& query, @@ -159,9 +159,7 @@ class mysql_connection { database::mysql_task::int_type type); void get_server_version(std::promise&& promise); - void run_statement(database::mysql_stmt_base& stmt, - my_error::code ec, - bool fatal); + void run_statement(database::mysql_stmt_base& stmt, my_error::code ec); void run_statement_and_get_result( database::mysql_stmt& stmt, std::promise&& promise, diff --git a/broker/core/src/mysql.cc b/broker/core/src/mysql.cc index af905592f4c..539ea3e204c 100644 --- a/broker/core/src/mysql.cc +++ b/broker/core/src/mysql.cc @@ -117,22 +117,19 @@ void mysql::_check_errors() { * @param query The query to execute. * @param error_msg An error message to complete the error message returned * by the mysql connector. - * @param fatal A boolean telling if the error is fatal. In that case, an - * exception will be thrown if an error occures. * @param thread A thread id or 0 to keep the library choosing which one. * * @return The thread id that executed the query. */ int mysql::run_query(std::string const& query, my_error::code ec, - bool fatal, int thread_id) { _check_errors(); if (thread_id < 0) // Here, we use _current_thread thread_id = choose_best_connection(-1); - _connection[thread_id]->run_query(query, ec, fatal); + _connection[thread_id]->run_query(query, ec); return thread_id; } @@ -199,22 +196,19 @@ int mysql::run_query_and_get_int(std::string const& query, * @param stmt The statement to execute. * @param error_msg An error message to complete the error message returned * by the mysql connector. - * @param fatal A boolean telling if the error is fatal. In that case, an - * exception will be thrown if an error occures. * @param thread A thread id or -1 to keep the library choosing which one. * * @return The thread id that executed the query. */ int mysql::run_statement(database::mysql_stmt_base& stmt, my_error::code ec, - bool fatal, int thread_id) { _check_errors(); if (thread_id < 0) // Here, we use _current_thread thread_id = choose_best_connection(-1); - _connection[thread_id]->run_statement(stmt, ec, fatal); + _connection[thread_id]->run_statement(stmt, ec); return thread_id; } diff --git a/broker/core/src/mysql_connection.cc b/broker/core/src/mysql_connection.cc index 29ae2bb138b..171b30ee9ed 100644 --- a/broker/core/src/mysql_connection.cc +++ b/broker/core/src/mysql_connection.cc @@ -219,9 +219,10 @@ void mysql_connection::_query(mysql_task* t) { static_cast(this), task->query); if (mysql_query(_conn, task->query.c_str())) { const char* m = mysql_error::msg[task->error_code]; - std::string err_msg(fmt::format("{} {}", m, ::mysql_error(_conn))); + std::string err_msg(fmt::format("{} errrno={} {}", m, ::mysql_errno(_conn), + ::mysql_error(_conn))); SPDLOG_LOGGER_ERROR(log_v2::sql(), "mysql_connection: {}", err_msg); - if (task->fatal || _server_error(::mysql_errno(_conn))) + if (_server_error(::mysql_errno(_conn))) set_error_message(err_msg); } else { set_need_to_commit(); @@ -367,16 +368,10 @@ void mysql_connection::_statement(mysql_task* t) { } } if (bb && mysql_stmt_bind_param(stmt, bb)) { - std::string err_msg(::mysql_stmt_error(stmt)); - SPDLOG_LOGGER_ERROR(log_v2::sql(), "mysql_connection: {}", err_msg); - if (task->fatal) - set_error_message(err_msg); - else { - SPDLOG_LOGGER_ERROR( - log_v2::sql(), - "mysql_connection: Error while binding values in statement: {}", - err_msg); - } + SPDLOG_LOGGER_ERROR( + log_v2::sql(), + "mysql_connection: Error while binding values in statement: {}", + ::mysql_stmt_error(stmt)); } else { int32_t attempts = 0; std::chrono::system_clock::time_point request_begin = @@ -388,9 +383,9 @@ void mysql_connection::_statement(mysql_task* t) { static_cast(this), task->statement_id, attempts, _stmt_query[task->statement_id]); if (mysql_stmt_execute(stmt)) { - std::string err_msg(fmt::format("{} {}", - mysql_error::msg[task->error_code], - ::mysql_stmt_error(stmt))); + std::string err_msg( + fmt::format("{} errno={} {}", mysql_error::msg[task->error_code], + ::mysql_errno(_conn), ::mysql_stmt_error(stmt))); SPDLOG_LOGGER_ERROR(log_v2::sql(), "connection fail to execute statement {:p}: {}", static_cast(this), err_msg); @@ -415,7 +410,7 @@ void mysql_connection::_statement(mysql_task* t) { "mysql_connection {:p} attempts {}: {}", static_cast(this), attempts, err_msg); if (++attempts >= MAX_ATTEMPTS) { - if (task->fatal || _server_error(::mysql_stmt_errno(stmt))) + if (_server_error(::mysql_stmt_errno(stmt))) set_error_message("{} {}", mysql_error::msg[task->error_code], ::mysql_stmt_error(stmt)); break; @@ -758,11 +753,15 @@ void mysql_connection::_run() { bool reconnect_failed_logged = false; std::list> tasks_list; - while (_state == running || !_tasks_list.empty()) { + while (true) { if (tasks_list.empty()) { std::unique_lock lock(_tasks_m); _tasks_list.swap(tasks_list); } + // no request to execute and want to exit => exit + if (tasks_list.empty() && _state != running) { + break; + } if (_error.is_active()) { if (!_try_to_reconnect()) { @@ -972,10 +971,8 @@ void mysql_connection::prepare_query(int stmt_id, std::string const& query) { * @param error_msg The error message to return in case of error. * @param p A pointer to a promise. */ -void mysql_connection::run_query(std::string const& query, - my_error::code ec, - bool fatal) { - _push(std::make_unique(query, ec, fatal)); +void mysql_connection::run_query(std::string const& query, my_error::code ec) { + _push(std::make_unique(query, ec)); } void mysql_connection::run_query_and_get_result( @@ -991,9 +988,8 @@ void mysql_connection::run_query_and_get_int(std::string const& query, } void mysql_connection::run_statement(database::mysql_stmt_base& stmt, - my_error::code ec, - bool fatal) { - _push(std::make_unique(stmt, ec, fatal)); + my_error::code ec) { + _push(std::make_unique(stmt, ec)); } void mysql_connection::run_statement_and_get_result( diff --git a/broker/core/test/mysql/mysql.cc b/broker/core/test/mysql/mysql.cc index 511f5621562..5c6b6398f3f 100644 --- a/broker/core/test/mysql/mysql.cc +++ b/broker/core/test/mysql/mysql.cc @@ -529,20 +529,20 @@ TEST_F(DatabaseStorageTest, CustomVarStatement) { cv.default_value = "centengine"; cv_insert_or_update << cv; - ms->run_statement(cv_insert_or_update, mysql_error::empty, false, 0); + ms->run_statement(cv_insert_or_update, mysql_error::empty, 0); // Deletion cv_delete << cv; - ms->run_statement(cv_delete, mysql_error::empty, false, 0); + ms->run_statement(cv_delete, mysql_error::empty, 0); // Insert cv_insert_or_update << cv; - ms->run_statement(cv_insert_or_update, mysql_error::empty, false, 0); + ms->run_statement(cv_insert_or_update, mysql_error::empty, 0); // Update cv.update_time = time(nullptr) + 1; cv_insert_or_update << cv; - ms->run_statement(cv_insert_or_update, mysql_error::empty, false, 0); + ms->run_statement(cv_insert_or_update, mysql_error::empty, 0); ms->commit(); @@ -2040,8 +2040,8 @@ TEST_F(DatabaseStorageTest, BulkStatementsWithBooleanValues) { bool inside1 = false; while (ms->fetch_row(res)) { inside1 = true; - ASSERT_TRUE(res.value_as_int(2) <= 1); - ASSERT_TRUE(res.value_as_int(3) <= 1); + ASSERT_TRUE(res.value_as_i32(2) <= 1); + ASSERT_TRUE(res.value_as_i32(3) <= 1); ASSERT_NE(res.value_as_bool(2), res.value_as_bool(3)); } ASSERT_TRUE(inside1); diff --git a/broker/sql/src/cleanup.cc b/broker/sql/src/cleanup.cc index 426003f4da1..5ae7012348f 100644 --- a/broker/sql/src/cleanup.cc +++ b/broker/sql/src/cleanup.cc @@ -126,17 +126,17 @@ void cleanup::_run() { " ON hosts.instance_id=instances.instance_id" " SET index_data.to_delete=1" " WHERE instances.deleted=1", - database::mysql_error::flag_index_data, false); + database::mysql_error::flag_index_data); ms.run_query( "DELETE hosts FROM hosts INNER JOIN instances" " ON hosts.instance_id=instances.instance_id" " WHERE instances.deleted=1", - database::mysql_error::delete_hosts, false); + database::mysql_error::delete_hosts); ms.run_query( "DELETE modules FROM modules INNER JOIN instances" " ON modules.instance_id=instances.instance_id" " WHERE instances.deleted=1", - database::mysql_error::delete_modules, false); + database::mysql_error::delete_modules); // Sleep a while. time_t target(time(nullptr) + _interval); diff --git a/broker/storage/src/conflict_manager.cc b/broker/storage/src/conflict_manager.cc index 52f55e6bf80..fdb0d631055 100644 --- a/broker/storage/src/conflict_manager.cc +++ b/broker/storage/src/conflict_manager.cc @@ -989,14 +989,14 @@ void conflict_manager::remove_graphs(const std::shared_ptr& d) { log_v2::sql()->info("metrics {} erased from database", mids_str); ms.run_query( fmt::format("DELETE FROM metrics WHERE metric_id in ({})", mids_str), - database::mysql_error::delete_metric, false); + database::mysql_error::delete_metric); } std::string ids_str{fmt::format("{}", fmt::join(indexes_to_delete, ","))}; if (!indexes_to_delete.empty()) { log_v2::sql()->info("indexes {} erased from database", ids_str); ms.run_query( fmt::format("DELETE FROM index_data WHERE id in ({})", ids_str), - database::mysql_error::delete_index, false); + database::mysql_error::delete_index); } if (!metrics_to_delete.empty() || !indexes_to_delete.empty()) { diff --git a/broker/storage/src/conflict_manager_sql.cc b/broker/storage/src/conflict_manager_sql.cc index 413caf16465..c31dd8a68f5 100644 --- a/broker/storage/src/conflict_manager_sql.cc +++ b/broker/storage/src/conflict_manager_sql.cc @@ -58,8 +58,7 @@ void conflict_manager::_clean_tables(uint32_t instance_id) { "UPDATE hosts AS h LEFT JOIN services AS s ON h.host_id = s.host_id " "SET h.enabled=0, s.enabled=0 WHERE h.instance_id={}", instance_id)); - _mysql.run_query(query, database::mysql_error::clean_hosts_services, false, - conn); + _mysql.run_query(query, database::mysql_error::clean_hosts_services, conn); _add_action(conn, actions::hosts); /* Remove host group memberships. */ @@ -70,8 +69,7 @@ void conflict_manager::_clean_tables(uint32_t instance_id) { "DELETE hosts_hostgroups FROM hosts_hostgroups LEFT JOIN hosts ON " "hosts_hostgroups.host_id=hosts.host_id WHERE hosts.instance_id={}", instance_id); - _mysql.run_query(query, database::mysql_error::clean_hostgroup_members, false, - conn); + _mysql.run_query(query, database::mysql_error::clean_hostgroup_members, conn); _add_action(conn, actions::hostgroups); /* Remove service group memberships */ @@ -84,7 +82,7 @@ void conflict_manager::_clean_tables(uint32_t instance_id) { "hosts.instance_id={}", instance_id); _mysql.run_query(query, database::mysql_error::clean_servicegroup_members, - false, conn); + conn); _add_action(conn, actions::servicegroups); /* Remove host dependencies. */ @@ -96,8 +94,7 @@ void conflict_manager::_clean_tables(uint32_t instance_id) { "h ON hhd.host_id=h.host_id OR hhd.dependent_host_id=h.host_id WHERE " "h.instance_id={}", instance_id); - _mysql.run_query(query, database::mysql_error::clean_host_dependencies, false, - conn); + _mysql.run_query(query, database::mysql_error::clean_host_dependencies, conn); _add_action(conn, actions::host_dependencies); /* Remove host parents. */ @@ -108,8 +105,7 @@ void conflict_manager::_clean_tables(uint32_t instance_id) { "hhp.child_id=h.host_id OR hhp.parent_id=h.host_id WHERE " "h.instance_id={}", instance_id); - _mysql.run_query(query, database::mysql_error::clean_host_parents, false, - conn); + _mysql.run_query(query, database::mysql_error::clean_host_parents, conn); _add_action(conn, actions::host_parents); /* Remove service dependencies. */ @@ -126,14 +122,14 @@ void conflict_manager::_clean_tables(uint32_t instance_id) { " WHERE h.instance_id={}", instance_id); _mysql.run_query(query, database::mysql_error::clean_service_dependencies, - false, conn); + conn); _add_action(conn, actions::service_dependencies); /* Remove list of modules. */ log_v2::sql()->debug("SQL: remove list of modules (instance_id: {})", instance_id); query = fmt::format("DELETE FROM modules WHERE instance_id={}", instance_id); - _mysql.run_query(query, database::mysql_error::clean_modules, false, conn); + _mysql.run_query(query, database::mysql_error::clean_modules, conn); _add_action(conn, actions::modules); // Cancellation of downtimes. @@ -145,7 +141,7 @@ void conflict_manager::_clean_tables(uint32_t instance_id) { "AND instance_id={}", instance_id); - _mysql.run_query(query, database::mysql_error::clean_downtimes, false, conn); + _mysql.run_query(query, database::mysql_error::clean_downtimes, conn); _add_action(conn, actions::downtimes); // Remove comments. @@ -158,7 +154,7 @@ void conflict_manager::_clean_tables(uint32_t instance_id) { "(deletion_time IS NULL OR deletion_time=0)", time(nullptr), instance_id); - _mysql.run_query(query, database::mysql_error::clean_comments, false, conn); + _mysql.run_query(query, database::mysql_error::clean_comments, conn); _add_action(conn, actions::comments); // Remove custom variables. No need to choose the good instance, there are @@ -171,8 +167,7 @@ void conflict_manager::_clean_tables(uint32_t instance_id) { instance_id); _finish_action(conn, actions::custom_variables | actions::hosts); - _mysql.run_query(query, database::mysql_error::clean_customvariables, false, - conn); + _mysql.run_query(query, database::mysql_error::clean_customvariables, conn); _add_action(conn, actions::custom_variables); std::lock_guard l(_group_clean_timer_m); @@ -191,7 +186,7 @@ void conflict_manager::_clean_group_table() { _mysql.run_query( "DELETE hg FROM hostgroups AS hg LEFT JOIN hosts_hostgroups AS hhg ON " "hg.hostgroup_id=hhg.hostgroup_id WHERE hhg.hostgroup_id IS NULL", - database::mysql_error::clean_empty_hostgroups, false, conn); + database::mysql_error::clean_empty_hostgroups, conn); _add_action(conn, actions::hostgroups); /* Remove service groups. */ @@ -201,7 +196,7 @@ void conflict_manager::_clean_group_table() { "DELETE sg FROM servicegroups AS sg LEFT JOIN services_servicegroups as " "ssg ON sg.servicegroup_id=ssg.servicegroup_id WHERE ssg.servicegroup_id " "IS NULL", - database::mysql_error::clean_empty_servicegroups, false, conn); + database::mysql_error::clean_empty_servicegroups, conn); _add_action(conn, actions::servicegroups); } @@ -260,21 +255,18 @@ void conflict_manager::_update_hosts_and_services_of_instance(uint32_t id, if (responsive) { query = fmt::format( "UPDATE instances SET outdated=FALSE WHERE instance_id={}", id); - _mysql.run_query(query, database::mysql_error::restore_instances, false, - conn); + _mysql.run_query(query, database::mysql_error::restore_instances, conn); _add_action(conn, actions::instances); query = fmt::format( "UPDATE hosts AS h LEFT JOIN services AS s ON h.host_id=s.host_id " "SET h.state=h.real_state,s.state=s.real_state WHERE h.instance_id={}", id); - _mysql.run_query(query, database::mysql_error::restore_instances, false, - conn); + _mysql.run_query(query, database::mysql_error::restore_instances, conn); _add_action(conn, actions::hosts); } else { query = fmt::format( "UPDATE instances SET outdated=TRUE WHERE instance_id={}", id); - _mysql.run_query(query, database::mysql_error::restore_instances, false, - conn); + _mysql.run_query(query, database::mysql_error::restore_instances, conn); _add_action(conn, actions::instances); query = fmt::format( "UPDATE hosts AS h LEFT JOIN services AS s ON h.host_id=s.host_id " @@ -282,8 +274,7 @@ void conflict_manager::_update_hosts_and_services_of_instance(uint32_t id, "WHERE h.instance_id={}", com::centreon::engine::host::state_unreachable, com::centreon::engine::service::state_unknown, id); - _mysql.run_query(query, database::mysql_error::restore_instances, false, - conn); + _mysql.run_query(query, database::mysql_error::restore_instances, conn); _add_action(conn, actions::hosts); } std::shared_ptr ri = @@ -393,8 +384,7 @@ void conflict_manager::_process_acknowledgement( // Process object. _acknowledgement_insupdate << ack; _mysql.run_statement(_acknowledgement_insupdate, - database::mysql_error::store_acknowledgement, true, - conn); + database::mysql_error::store_acknowledgement, conn); } *std::get<2>(t) = true; } @@ -437,7 +427,7 @@ void conflict_manager::_process_comment( // Processing. _comment_insupdate << cmmnt; _mysql.run_statement(_comment_insupdate, database::mysql_error::store_comment, - true, conn); + conn); _add_action(conn, actions::comments); *std::get<2>(t) = true; } @@ -495,8 +485,7 @@ void conflict_manager::_process_custom_variable( _custom_variable_delete.bind_value_as_str_k(":name", cv.name); _mysql.run_statement(_custom_variable_delete, - database::mysql_error::remove_customvariable, true, - conn); + database::mysql_error::remove_customvariable, conn); _add_action(conn, actions::custom_variables); *std::get<2>(t) = true; } @@ -638,7 +627,7 @@ void conflict_manager::_process_host_check( _host_check_update << hc; std::promise promise; _mysql.run_statement(_host_check_update, - database::mysql_error::store_host_check, true, conn); + database::mysql_error::store_host_check, conn); _add_action(conn, actions::hosts); } } else @@ -687,8 +676,7 @@ void conflict_manager::_process_host_dependency( // Process object. _host_dependency_insupdate << hd; _mysql.run_statement(_host_dependency_insupdate, - database::mysql_error::store_host_dependency, true, - conn); + database::mysql_error::store_host_dependency, conn); _add_action(conn, actions::host_dependencies); } // Delete. @@ -699,7 +687,7 @@ void conflict_manager::_process_host_dependency( "DELETE FROM hosts_hosts_dependencies WHERE dependent_host_id={}" " AND host_id={}", hd.dependent_host_id, hd.host_id)); - _mysql.run_query(query, database::mysql_error::empty, true, conn); + _mysql.run_query(query, database::mysql_error::empty, conn); _add_action(conn, actions::host_dependencies); } *std::get<2>(t) = true; @@ -728,7 +716,7 @@ void conflict_manager::_process_host_group( _host_group_insupdate << hg; _mysql.run_statement(_host_group_insupdate, - database::mysql_error::store_host_group, true, conn); + database::mysql_error::store_host_group, conn); _add_action(conn, actions::hostgroups); _hostgroup_cache.insert(hg.id); } @@ -744,7 +732,7 @@ void conflict_manager::_process_host_group( " ON hosts_hostgroups.host_id=hosts.host_id" " WHERE hosts_hostgroups.hostgroup_id={} AND hosts.instance_id={}", hg.id, hg.poller_id)); - _mysql.run_query(query, database::mysql_error::empty, false, conn); + _mysql.run_query(query, database::mysql_error::empty, conn); _hostgroup_cache.erase(hg.id); } } @@ -801,15 +789,14 @@ void conflict_manager::_process_host_group_member( _host_group_insupdate << hg; _mysql.run_statement(_host_group_insupdate, - database::mysql_error::store_host_group, false, - conn); + database::mysql_error::store_host_group, conn); _add_action(conn, actions::hostgroups); } _host_group_member_insert << hgm; _mysql.run_statement(_host_group_member_insert, database::mysql_error::store_host_group_member, - false, conn); + conn); _add_action(conn, actions::hostgroups); } else log_v2::sql()->error( @@ -833,8 +820,7 @@ void conflict_manager::_process_host_group_member( } _host_group_member_delete << hgm; _mysql.run_statement(_host_group_member_delete, - database::mysql_error::delete_host_group_member, true, - conn); + database::mysql_error::delete_host_group_member, conn); _add_action(conn, actions::hostgroups); } *std::get<2>(t) = true; @@ -880,7 +866,7 @@ void conflict_manager::_process_host( // Process object. _host_insupdate << h; _mysql.run_statement(_host_insupdate, database::mysql_error::store_host, - true, conn); + conn); _add_action(conn, actions::hosts); // Fill the cache... @@ -928,8 +914,7 @@ void conflict_manager::_process_host_parent( // Insert. _host_parent_insert << hp; _mysql.run_statement(_host_parent_insert, - database::mysql_error::store_host_parentship, false, - conn); + database::mysql_error::store_host_parentship, conn); _add_action(conn, actions::host_parents); } // Disable parenting. @@ -949,7 +934,7 @@ void conflict_manager::_process_host_parent( // Delete. _host_parent_delete << hp; _mysql.run_statement(_host_parent_delete, database::mysql_error::empty, - false, conn); + conn); _add_action(conn, actions::host_parents); } *std::get<2>(t) = true; @@ -998,7 +983,7 @@ void conflict_manager::_process_host_status( int32_t conn = _mysql.choose_connection_by_instance(_cache_host_instance[hs.host_id]); _mysql.run_statement(_host_status_update, - database::mysql_error::store_host_status, true, conn); + database::mysql_error::store_host_status, conn); _add_action(conn, actions::hosts); } else // Do nothing. @@ -1050,7 +1035,7 @@ void conflict_manager::_process_instance( // Process object. _instance_insupdate << i; _mysql.run_statement(_instance_insupdate, - database::mysql_error::store_poller, true, conn); + database::mysql_error::store_poller, conn); _add_action(conn, actions::instances); } *std::get<2>(t) = true; @@ -1093,7 +1078,7 @@ void conflict_manager::_process_instance_status( // Process object. _instance_status_insupdate << is; _mysql.run_statement(_instance_status_insupdate, - database::mysql_error::update_poller, true, conn); + database::mysql_error::update_poller, conn); _add_action(conn, actions::instances); } *std::get<2>(t) = true; @@ -1196,7 +1181,7 @@ void conflict_manager::_process_service_check( _cache_host_instance[sc.host_id]); _mysql.run_statement(_service_check_update, database::mysql_error::store_service_check_command, - false, conn); + conn); } else log_v2::sql()->error( "SQL: host with host_id = {} does not exist - unable to store " @@ -1254,8 +1239,7 @@ void conflict_manager::_process_service_dependency( // Process object. _service_dependency_insupdate << sd; _mysql.run_statement(_service_dependency_insupdate, - database::mysql_error::store_service_dependency, true, - conn); + database::mysql_error::store_service_dependency, conn); _add_action(conn, actions::service_dependencies); } // Delete. @@ -1269,7 +1253,7 @@ void conflict_manager::_process_service_dependency( "AND dependent_service_id={} AND host_id={} AND service_id={}", sd.dependent_host_id, sd.dependent_service_id, sd.host_id, sd.service_id)); - _mysql.run_query(query, database::mysql_error::empty, false, conn); + _mysql.run_query(query, database::mysql_error::empty, conn); _add_action(conn, actions::service_dependencies); } *std::get<2>(t) = true; @@ -1300,8 +1284,7 @@ void conflict_manager::_process_service_group( _service_group_insupdate << sg; _mysql.run_statement(_service_group_insupdate, - database::mysql_error::store_service_group, true, - conn); + database::mysql_error::store_service_group, conn); _add_action(conn, actions::servicegroups); _servicegroup_cache.insert(sg.id); } @@ -1318,7 +1301,7 @@ void conflict_manager::_process_service_group( "services_servicegroups.servicegroup_id={} AND " "hosts.instance_id={}", sg.id, sg.poller_id)); - _mysql.run_query(query, database::mysql_error::empty, false, conn); + _mysql.run_query(query, database::mysql_error::empty, conn); _add_action(conn, actions::servicegroups); _servicegroup_cache.erase(sg.id); } @@ -1378,15 +1361,14 @@ void conflict_manager::_process_service_group_member( _service_group_insupdate << sg; _mysql.run_statement(_service_group_insupdate, - database::mysql_error::store_service_group, false, - conn); + database::mysql_error::store_service_group, conn); _add_action(conn, actions::servicegroups); } _service_group_member_insert << sgm; _mysql.run_statement(_service_group_member_insert, database::mysql_error::store_service_group_member, - false, conn); + conn); _add_action(conn, actions::servicegroups); } // Delete. @@ -1408,7 +1390,7 @@ void conflict_manager::_process_service_group_member( _service_group_member_delete << sgm; _mysql.run_statement(_service_group_member_delete, database::mysql_error::delete_service_group_member, - false, conn); + conn); _add_action(conn, actions::servicegroups); } *std::get<2>(t) = true; @@ -1452,7 +1434,7 @@ void conflict_manager::_process_service( _service_insupdate << s; _mysql.run_statement(_service_insupdate, - database::mysql_error::store_service, true, conn); + database::mysql_error::store_service, conn); _add_action(conn, actions::services); } else log_v2::sql()->trace( @@ -1515,8 +1497,7 @@ void conflict_manager::_process_service_status( int32_t conn = _mysql.choose_connection_by_instance(_cache_host_instance[ss.host_id]); _mysql.run_statement(_service_status_update, - database::mysql_error::store_service_status, false, - conn); + database::mysql_error::store_service_status, conn); _add_action(conn, actions::services); } else // Do nothing. @@ -1583,8 +1564,7 @@ void conflict_manager::_process_severity( _severity_update.bind_value_as_u64(4, sv.icon_id()); _severity_update.bind_value_as_u64(5, severity_id); _mysql.run_statement(_severity_update, - database::mysql_error::store_severity, false, - conn); + database::mysql_error::store_severity, conn); } else { log_v2::sql()->trace("SQL: add severity {}", sv.id()); _severity_insert.bind_value_as_u64(0, sv.id()); @@ -1618,8 +1598,7 @@ void conflict_manager::_process_severity( if (severity_id) { _severity_update.bind_value_as_u64(5, severity_id); _mysql.run_statement(_severity_update, - database::mysql_error::store_severity, false, - conn); + database::mysql_error::store_severity, conn); _add_action(conn, actions::severities); } else log_v2::sql()->error( @@ -1668,7 +1647,7 @@ void conflict_manager::_process_tag( _tag_update.bind_value_as_str(2, tg.name()); _tag_update.bind_value_as_u64(3, tag_id); _mysql.run_statement(_tag_update, database::mysql_error::store_tag, - false, conn); + conn); } else { log_v2::sql()->trace("SQL: add tag {}", tg.id()); _tag_insert.bind_value_as_u64(0, tg.id()); @@ -1698,7 +1677,7 @@ void conflict_manager::_process_tag( if (tag_id) { _tag_update.bind_value_as_u64(3, tag_id); _mysql.run_statement(_tag_update, database::mysql_error::store_tag, - false, conn); + conn); _add_action(conn, actions::tags); } else log_v2::sql()->error( @@ -1737,7 +1716,7 @@ void conflict_manager::_update_customvariables() { "default_value=VALUES(default_VALUE),modified=VALUES(modified),type=" "VALUES(type),update_time=VALUES(update_time),value=VALUES(value)"; std::string query(oss.str()); - _mysql.run_query(query, database::mysql_error::update_customvariables, true, + _mysql.run_query(query, database::mysql_error::update_customvariables, conn); log_v2::sql()->debug("{} new custom variables inserted", _cv_queue.size()); log_v2::sql()->trace("sending query << {} >>", query); @@ -1765,7 +1744,7 @@ void conflict_manager::_update_customvariables() { "modified=VALUES(modified),update_time=VALUES(update_time),value=" "VALUES(value)"; std::string query(oss.str()); - _mysql.run_query(query, database::mysql_error::update_customvariables, true, + _mysql.run_query(query, database::mysql_error::update_customvariables, conn); log_v2::sql()->debug("{} new custom variable status inserted", _cvs_queue.size()); @@ -1817,7 +1796,7 @@ void conflict_manager::_update_downtimes() { "started),triggered_by=VALUES(triggered_by), type=VALUES(type)"; std::string query{oss.str()}; - _mysql.run_query(query, database::mysql_error::store_downtime, true, conn); + _mysql.run_query(query, database::mysql_error::store_downtime, conn); log_v2::sql()->debug("{} new downtimes inserted", _downtimes_queue.size()); log_v2::sql()->trace("sending query << {} >>", query); _add_action(conn, actions::downtimes); @@ -1855,7 +1834,7 @@ void conflict_manager::_insert_logs() { oss << "," << std::get<1>(*it); std::string query(oss.str()); - _mysql.run_query(query, database::mysql_error::update_logs, true, conn); + _mysql.run_query(query, database::mysql_error::update_logs, conn); log_v2::sql()->debug("{} new logs inserted", _log_queue.size()); log_v2::sql()->trace("sending query << {} >>", query); diff --git a/broker/storage/src/conflict_manager_storage.cc b/broker/storage/src/conflict_manager_storage.cc index 9180745f0c7..a4038a09121 100644 --- a/broker/storage/src/conflict_manager_storage.cc +++ b/broker/storage/src/conflict_manager_storage.cc @@ -474,7 +474,7 @@ void conflict_manager::_update_metrics() { int32_t conn = _mysql.choose_best_connection(-1); _finish_action(-1, actions::metrics); log_v2::sql()->trace("Send query: {}", query); - _mysql.run_query(query, database::mysql_error::update_metrics, false, conn); + _mysql.run_query(query, database::mysql_error::update_metrics, conn); _add_action(conn, actions::metrics); _metrics.clear(); } @@ -585,8 +585,7 @@ void conflict_manager::_check_deleted_index() { std::string err_msg; for (int64_t i : metrics_to_delete) { query = fmt::format("DELETE FROM metrics WHERE metric_id={}", i); - _mysql.run_query(query, database::mysql_error::delete_metric, false, - conn); + _mysql.run_query(query, database::mysql_error::delete_metric, conn); _add_action(conn, actions::metrics); // Remove associated graph. @@ -602,7 +601,7 @@ void conflict_manager::_check_deleted_index() { // Delete index from DB. for (int64_t i : index_to_delete) { query = fmt::format("DELETE FROM index_data WHERE id={}", i); - _mysql.run_query(query, database::mysql_error::delete_index, false, conn); + _mysql.run_query(query, database::mysql_error::delete_index, conn); _add_action(conn, actions::index_data); // Remove associated graph. diff --git a/broker/unified_sql/src/stream.cc b/broker/unified_sql/src/stream.cc index da181b44f30..1c6be9506c2 100644 --- a/broker/unified_sql/src/stream.cc +++ b/broker/unified_sql/src/stream.cc @@ -857,7 +857,7 @@ void stream::remove_graphs(const std::shared_ptr& d) { mids_str); ms.run_query( fmt::format("DELETE FROM metrics WHERE metric_id in ({})", mids_str), - database::mysql_error::delete_metric, false); + database::mysql_error::delete_metric); } std::string ids_str{fmt::format("{}", fmt::join(indexes_to_delete, ","))}; if (!indexes_to_delete.empty()) { @@ -865,7 +865,7 @@ void stream::remove_graphs(const std::shared_ptr& d) { ids_str); ms.run_query( fmt::format("DELETE FROM index_data WHERE id in ({})", ids_str), - database::mysql_error::delete_index, false); + database::mysql_error::delete_index); } if (!metrics_to_delete.empty() || !indexes_to_delete.empty()) { @@ -988,18 +988,18 @@ void stream::remove_poller(const std::shared_ptr& d) { SPDLOG_LOGGER_INFO(log_v2::sql(), "unified sql: removing poller {}", id); _mysql.run_query( fmt::format("DELETE FROM instances WHERE instance_id={}", id), - database::mysql_error::delete_poller, false, conn); + database::mysql_error::delete_poller, conn); SPDLOG_LOGGER_TRACE(log_v2::sql(), "unified sql: removing poller {} hosts", id); _mysql.run_query( fmt::format("DELETE FROM hosts WHERE instance_id={}", id), - database::mysql_error::delete_poller, false, conn); + database::mysql_error::delete_poller, conn); SPDLOG_LOGGER_TRACE(log_v2::sql(), "unified sql: removing poller {} resources", id); _mysql.run_query( fmt::format("DELETE FROM resources WHERE poller_id={}", id), - database::mysql_error::delete_poller, false, conn); + database::mysql_error::delete_poller, conn); _cache_deleted_instance_id.insert(id); } _clear_instances_cache(ids); diff --git a/broker/unified_sql/src/stream_sql.cc b/broker/unified_sql/src/stream_sql.cc index 54088e02a93..faecde0b08a 100644 --- a/broker/unified_sql/src/stream_sql.cc +++ b/broker/unified_sql/src/stream_sql.cc @@ -71,7 +71,7 @@ void stream::_clean_tables(uint32_t instance_id) { fmt::format("DELETE rt FROM resources_tags rt LEFT JOIN resources r ON " "rt.resource_id=r.resource_id WHERE r.poller_id={}", instance_id), - database::mysql_error::clean_resources_tags, false, conn); + database::mysql_error::clean_resources_tags, conn); _mysql.commit(conn); } @@ -79,7 +79,7 @@ void stream::_clean_tables(uint32_t instance_id) { _mysql.run_query( fmt::format("UPDATE resources SET enabled=0 WHERE poller_id={}", instance_id), - database::mysql_error::clean_resources, false, conn); + database::mysql_error::clean_resources, conn); _add_action(conn, actions::resources); SPDLOG_LOGGER_DEBUG( log_v2::sql(), @@ -89,8 +89,7 @@ void stream::_clean_tables(uint32_t instance_id) { "UPDATE hosts AS h LEFT JOIN services AS s ON h.host_id = s.host_id " "SET h.enabled=0, s.enabled=0 WHERE h.instance_id={}", instance_id)); - _mysql.run_query(query, database::mysql_error::clean_hosts_services, false, - conn); + _mysql.run_query(query, database::mysql_error::clean_hosts_services, conn); _add_action(conn, actions::hosts); /* Remove host group memberships. */ @@ -102,8 +101,7 @@ void stream::_clean_tables(uint32_t instance_id) { "DELETE hosts_hostgroups FROM hosts_hostgroups LEFT JOIN hosts ON " "hosts_hostgroups.host_id=hosts.host_id WHERE hosts.instance_id={}", instance_id); - _mysql.run_query(query, database::mysql_error::clean_hostgroup_members, false, - conn); + _mysql.run_query(query, database::mysql_error::clean_hostgroup_members, conn); _add_action(conn, actions::hostgroups); /* Remove service group memberships */ @@ -117,7 +115,7 @@ void stream::_clean_tables(uint32_t instance_id) { "hosts.instance_id={}", instance_id); _mysql.run_query(query, database::mysql_error::clean_servicegroup_members, - false, conn); + conn); _add_action(conn, actions::servicegroups); /* Remove host dependencies. */ @@ -129,8 +127,7 @@ void stream::_clean_tables(uint32_t instance_id) { "h ON hhd.host_id=h.host_id OR hhd.dependent_host_id=h.host_id WHERE " "h.instance_id={}", instance_id); - _mysql.run_query(query, database::mysql_error::clean_host_dependencies, false, - conn); + _mysql.run_query(query, database::mysql_error::clean_host_dependencies, conn); _add_action(conn, actions::host_dependencies); /* Remove host parents. */ @@ -142,8 +139,7 @@ void stream::_clean_tables(uint32_t instance_id) { "hhp.child_id=h.host_id OR hhp.parent_id=h.host_id WHERE " "h.instance_id={}", instance_id); - _mysql.run_query(query, database::mysql_error::clean_host_parents, false, - conn); + _mysql.run_query(query, database::mysql_error::clean_host_parents, conn); _add_action(conn, actions::host_parents); /* Remove service dependencies. */ @@ -161,7 +157,7 @@ void stream::_clean_tables(uint32_t instance_id) { " WHERE h.instance_id={}", instance_id); _mysql.run_query(query, database::mysql_error::clean_service_dependencies, - false, conn); + conn); _add_action(conn, actions::service_dependencies); /* Remove list of modules. */ @@ -169,7 +165,7 @@ void stream::_clean_tables(uint32_t instance_id) { "SQL: remove list of modules (instance_id: {})", instance_id); query = fmt::format("DELETE FROM modules WHERE instance_id={}", instance_id); - _mysql.run_query(query, database::mysql_error::clean_modules, false, conn); + _mysql.run_query(query, database::mysql_error::clean_modules, conn); _add_action(conn, actions::modules); // Cancellation of downtimes. @@ -182,7 +178,7 @@ void stream::_clean_tables(uint32_t instance_id) { "AND instance_id={}", instance_id); - _mysql.run_query(query, database::mysql_error::clean_downtimes, false, conn); + _mysql.run_query(query, database::mysql_error::clean_downtimes, conn); _add_action(conn, actions::downtimes); // Remove comments. @@ -196,7 +192,7 @@ void stream::_clean_tables(uint32_t instance_id) { "(deletion_time IS NULL OR deletion_time=0)", time(nullptr), instance_id); - _mysql.run_query(query, database::mysql_error::clean_comments, false, conn); + _mysql.run_query(query, database::mysql_error::clean_comments, conn); _add_action(conn, actions::comments); // Remove custom variables. No need to choose the good instance, there are @@ -210,8 +206,7 @@ void stream::_clean_tables(uint32_t instance_id) { instance_id); _finish_action(conn, actions::custom_variables | actions::hosts); - _mysql.run_query(query, database::mysql_error::clean_customvariables, false, - conn); + _mysql.run_query(query, database::mysql_error::clean_customvariables, conn); _add_action(conn, actions::custom_variables); std::lock_guard l(_timer_m); @@ -232,7 +227,7 @@ void stream::_clean_group_table() { _mysql.run_query( "DELETE hg FROM hostgroups AS hg LEFT JOIN hosts_hostgroups AS hhg ON " "hg.hostgroup_id=hhg.hostgroup_id WHERE hhg.hostgroup_id IS NULL", - database::mysql_error::clean_empty_hostgroups, false, conn); + database::mysql_error::clean_empty_hostgroups, conn); _add_action(conn, actions::hostgroups); /* Remove service groups. */ @@ -245,7 +240,7 @@ void stream::_clean_group_table() { "ssg ON sg.servicegroup_id=ssg.servicegroup_id WHERE " "ssg.servicegroup_id " "IS NULL", - database::mysql_error::clean_empty_servicegroups, false, conn); + database::mysql_error::clean_empty_servicegroups, conn); _add_action(conn, actions::servicegroups); } catch (const std::exception& e) { SPDLOG_LOGGER_ERROR(log_v2::sql(), "fail to clean group tables: {}", @@ -317,21 +312,18 @@ void stream::_update_hosts_and_services_of_instance(uint32_t id, if (responsive) { query = fmt::format( "UPDATE instances SET outdated=FALSE WHERE instance_id={}", id); - _mysql.run_query(query, database::mysql_error::restore_instances, false, - conn); + _mysql.run_query(query, database::mysql_error::restore_instances, conn); _add_action(conn, actions::instances); query = fmt::format( "UPDATE hosts AS h LEFT JOIN services AS s ON h.host_id=s.host_id " "SET h.state=h.real_state,s.state=s.real_state WHERE h.instance_id={}", id); - _mysql.run_query(query, database::mysql_error::restore_instances, false, - conn); + _mysql.run_query(query, database::mysql_error::restore_instances, conn); _add_action(conn, actions::hosts); } else { query = fmt::format( "UPDATE instances SET outdated=TRUE WHERE instance_id={}", id); - _mysql.run_query(query, database::mysql_error::restore_instances, false, - conn); + _mysql.run_query(query, database::mysql_error::restore_instances, conn); _add_action(conn, actions::instances); query = fmt::format( "UPDATE hosts AS h LEFT JOIN services AS s ON h.host_id=s.host_id " @@ -339,8 +331,7 @@ void stream::_update_hosts_and_services_of_instance(uint32_t id, "WHERE h.instance_id={}", com::centreon::engine::host::state_unreachable, com::centreon::engine::service::state_unknown, id); - _mysql.run_query(query, database::mysql_error::restore_instances, false, - conn); + _mysql.run_query(query, database::mysql_error::restore_instances, conn); _add_action(conn, actions::hosts); } auto bbdo = config::applier::state::instance().get_bbdo_version(); @@ -460,8 +451,7 @@ void stream::_process_acknowledgement(const std::shared_ptr& d) { // Process object. _acknowledgement_insupdate << ack; _mysql.run_statement(_acknowledgement_insupdate, - database::mysql_error::store_acknowledgement, false, - conn); + database::mysql_error::store_acknowledgement, conn); } } @@ -525,8 +515,7 @@ void stream::_process_pb_acknowledgement(const std::shared_ptr& d) { // Process object. _pb_acknowledgement_insupdate << ack; _mysql.run_statement(_pb_acknowledgement_insupdate, - database::mysql_error::store_acknowledgement, false, - conn); + database::mysql_error::store_acknowledgement, conn); } } @@ -567,7 +556,7 @@ void stream::_process_comment(const std::shared_ptr& d) { // Processing. _comment_insupdate << cmmnt; _mysql.run_statement(_comment_insupdate, database::mysql_error::store_comment, - false, conn); + conn); _add_action(conn, actions::comments); } @@ -621,8 +610,7 @@ void stream::_process_pb_custom_variable(const std::shared_ptr& d) { _custom_variable_delete.bind_value_as_str_k(":name", cv.name()); _mysql.run_statement(_custom_variable_delete, - database::mysql_error::remove_customvariable, false, - conn); + database::mysql_error::remove_customvariable, conn); _add_action(conn, actions::custom_variables); } } @@ -677,7 +665,7 @@ void stream::_process_pb_comment(const std::shared_ptr& d) { // Process object. _pb_comment_insupdate << *comm_obj; _mysql.run_statement(_pb_comment_insupdate, - database::mysql_error::store_comment, false, conn); + database::mysql_error::store_comment, conn); _add_action(conn, actions::comments); } } @@ -733,8 +721,7 @@ void stream::_process_custom_variable(const std::shared_ptr& d) { _custom_variable_delete.bind_value_as_str_k(":name", cv.name); _mysql.run_statement(_custom_variable_delete, - database::mysql_error::remove_customvariable, false, - conn); + database::mysql_error::remove_customvariable, conn); _add_action(conn, actions::custom_variables); } } @@ -971,8 +958,7 @@ void stream::_process_host_check(const std::shared_ptr& d) { _host_check_update << hc; _mysql.run_statement(_host_check_update, - database::mysql_error::store_host_check, false, - conn); + database::mysql_error::store_host_check, conn); _add_action(conn, actions::hosts); } } else @@ -1050,8 +1036,7 @@ void stream::_process_pb_host_check(const std::shared_ptr& d) { _pb_host_check_update << hc_obj; _mysql.run_statement(_pb_host_check_update, - database::mysql_error::store_host_check, false, - conn); + database::mysql_error::store_host_check, conn); _add_action(conn, actions::hosts); } } else @@ -1099,8 +1084,7 @@ void stream::_process_host_dependency(const std::shared_ptr& d) { // Process object. _host_dependency_insupdate << hd; _mysql.run_statement(_host_dependency_insupdate, - database::mysql_error::store_host_dependency, false, - conn); + database::mysql_error::store_host_dependency, conn); _add_action(conn, actions::host_dependencies); } // Delete. @@ -1112,7 +1096,7 @@ void stream::_process_host_dependency(const std::shared_ptr& d) { "DELETE FROM hosts_hosts_dependencies WHERE dependent_host_id={}" " AND host_id={}", hd.dependent_host_id, hd.host_id)); - _mysql.run_query(query, database::mysql_error::empty, false, conn); + _mysql.run_query(query, database::mysql_error::empty, conn); _add_action(conn, actions::host_dependencies); } } @@ -1138,7 +1122,7 @@ void stream::_process_host_group(const std::shared_ptr& d) { _host_group_insupdate << hg; _mysql.run_statement(_host_group_insupdate, - database::mysql_error::store_host_group, false, conn); + database::mysql_error::store_host_group, conn); _hostgroup_cache.insert(hg.id); } // Delete group. @@ -1157,7 +1141,7 @@ void stream::_process_host_group(const std::shared_ptr& d) { " WHERE hosts_hostgroups.hostgroup_id={} AND " "hosts.instance_id={}", hg.id, hg.poller_id)); - _mysql.run_query(query, database::mysql_error::empty, false, conn); + _mysql.run_query(query, database::mysql_error::empty, conn); _hostgroup_cache.erase(hg.id); } } @@ -1222,15 +1206,14 @@ void stream::_process_host_group_member(const std::shared_ptr& d) { _host_group_insupdate << hg; _mysql.run_statement(_host_group_insupdate, - database::mysql_error::store_host_group, false, - conn); + database::mysql_error::store_host_group, conn); _hostgroup_cache.insert(hgm.group_id); } _host_group_member_insert << hgm; _mysql.run_statement(_host_group_member_insert, database::mysql_error::store_host_group_member, - false, conn); + conn); _add_action(conn, actions::hostgroups); } else SPDLOG_LOGGER_ERROR( @@ -1256,8 +1239,7 @@ void stream::_process_host_group_member(const std::shared_ptr& d) { } _host_group_member_delete << hgm; _mysql.run_statement(_host_group_member_delete, - database::mysql_error::delete_host_group_member, false, - conn); + database::mysql_error::delete_host_group_member, conn); _add_action(conn, actions::hostgroups); } } @@ -1301,7 +1283,7 @@ void stream::_process_host(const std::shared_ptr& d) { // Process object. _host_insupdate << h; _mysql.run_statement(_host_insupdate, database::mysql_error::store_host, - false, conn); + conn); _add_action(conn, actions::hosts); // Fill the cache... @@ -1347,8 +1329,7 @@ void stream::_process_host_parent(const std::shared_ptr& d) { // Insert. _host_parent_insert << hp; _mysql.run_statement(_host_parent_insert, - database::mysql_error::store_host_parentship, false, - conn); + database::mysql_error::store_host_parentship, conn); _add_action(conn, actions::host_parents); } // Disable parenting. @@ -1369,7 +1350,7 @@ void stream::_process_host_parent(const std::shared_ptr& d) { // Delete. _host_parent_delete << hp; _mysql.run_statement(_host_parent_delete, database::mysql_error::empty, - false, conn); + conn); _add_action(conn, actions::host_parents); } } @@ -1427,7 +1408,7 @@ void stream::_process_host_status(const std::shared_ptr& d) { int32_t conn = _mysql.choose_connection_by_instance(_cache_host_instance[hs.host_id]); _mysql.run_statement(_host_status_update, - database::mysql_error::store_host_status, false, conn); + database::mysql_error::store_host_status, conn); _add_action(conn, actions::hosts); } else // Do nothing. @@ -1607,7 +1588,7 @@ void stream::_process_pb_host(const std::shared_ptr& d) { // Process object. _pb_host_insupdate << *hst; _mysql.run_statement(_pb_host_insupdate, - database::mysql_error::store_host, false, conn); + database::mysql_error::store_host, conn); _add_action(conn, actions::hosts); // Fill the cache... @@ -1771,7 +1752,7 @@ void stream::_process_pb_host(const std::shared_ptr& d) { _mysql.run_statement(_resources_host_update, database::mysql_error::store_host_resources, - false, conn); + conn); _add_action(conn, actions::resources); } @@ -1787,7 +1768,7 @@ void stream::_process_pb_host(const std::shared_ptr& d) { _resources_tags_remove.bind_value_as_u64(0, res_id); _mysql.run_statement(_resources_tags_remove, database::mysql_error::delete_resources_tags, - false, conn); + conn); for (auto& tag : h.tags()) { SPDLOG_LOGGER_DEBUG(log_v2::sql(), "add tag ({}, {}) for resource {} for host{}", @@ -1837,8 +1818,7 @@ void stream::_process_pb_host(const std::shared_ptr& d) { res_id, h.host_id(), tag.id(), tag.type()); _mysql.run_statement( _resources_tags_insert, - database::mysql_error::store_tags_resources_tags, false, - conn); + database::mysql_error::store_tags_resources_tags, conn); _add_action(conn, actions::resources_tags); } } @@ -1847,8 +1827,7 @@ void stream::_process_pb_host(const std::shared_ptr& d) { _resources_disable.bind_value_as_u64(0, found->second); _mysql.run_statement(_resources_disable, - database::mysql_error::clean_resources, false, - conn); + database::mysql_error::clean_resources, conn); _resource_cache.erase(found); _add_action(conn, actions::resources); } else { @@ -1947,7 +1926,7 @@ void stream::_process_pb_adaptive_host(const std::shared_ptr& d) { query.resize(query.size() - 1); query += fmt::format(" WHERE host_id={}", ah.host_id()); SPDLOG_LOGGER_TRACE(log_v2::sql(), "SQL: query <<{}>>", query); - _mysql.run_query(query, database::mysql_error::store_host, false, conn); + _mysql.run_query(query, database::mysql_error::store_host, conn); _add_action(conn, actions::hosts); if (_store_in_resources) { @@ -1971,7 +1950,7 @@ void stream::_process_pb_adaptive_host(const std::shared_ptr& d) { res_query += fmt::format(" WHERE parent_id=0 AND id={}", ah.host_id()); SPDLOG_LOGGER_TRACE(log_v2::sql(), "SQL: query <<{}>>", res_query); _mysql.run_query(res_query, database::mysql_error::update_resources, - false, conn); + conn); _add_action(conn, actions::resources); } } @@ -2106,8 +2085,7 @@ void stream::_process_pb_host_status(const std::shared_ptr& d) { _hscr_update->bind_value_as_i32(27, hscr.host_id()); _mysql.run_statement(*_hscr_update, - database::mysql_error::store_host_status, false, - conn); + database::mysql_error::store_host_status, conn); _add_action(conn, actions::hosts); } @@ -2157,8 +2135,7 @@ void stream::_process_pb_host_status(const std::shared_ptr& d) { _hscr_resources_update->bind_value_as_u64(11, hscr.host_id()); _mysql.run_statement(*_hscr_resources_update, - database::mysql_error::store_host_status, false, - conn); + database::mysql_error::store_host_status, conn); _add_action(conn, actions::resources); } @@ -2214,7 +2191,7 @@ void stream::_process_instance(const std::shared_ptr& d) { // Process object. _instance_insupdate << i; _mysql.run_statement(_instance_insupdate, - database::mysql_error::store_poller, false, conn); + database::mysql_error::store_poller, conn); _add_action(conn, actions::instances); } } @@ -2270,7 +2247,7 @@ void stream::_process_pb_instance(const std::shared_ptr& d) { // Process object. _pb_instance_insupdate << inst_obj; _mysql.run_statement(_pb_instance_insupdate, - database::mysql_error::store_poller, false, conn); + database::mysql_error::store_poller, conn); _add_action(conn, actions::instances); } } @@ -2311,7 +2288,7 @@ void stream::_process_instance_status(const std::shared_ptr& d) { // Process object. _instance_status_insupdate << is; _mysql.run_statement(_instance_status_insupdate, - database::mysql_error::update_poller, false, conn); + database::mysql_error::update_poller, conn); _add_action(conn, actions::instances); } } @@ -2374,7 +2351,7 @@ void stream::_process_pb_instance_status(const std::shared_ptr& d) { // Process object. _pb_instance_status_insupdate << is_obj; _mysql.run_statement(_pb_instance_status_insupdate, - database::mysql_error::update_poller, false, conn); + database::mysql_error::update_poller, conn); _add_action(conn, actions::instances); } } @@ -2518,7 +2495,7 @@ void stream::_process_service_check(const std::shared_ptr& d) { _cache_host_instance[sc.host_id]); _mysql.run_statement(_service_check_update, database::mysql_error::store_service_check_command, - false, conn); + conn); } } else // Do nothing. @@ -2600,7 +2577,7 @@ void stream::_process_pb_service_check(const std::shared_ptr& d) { _cache_host_instance[sc.host_id()]); _mysql.run_statement(_pb_service_check_update, database::mysql_error::store_service_check_command, - false, conn); + conn); } } else // Do nothing. @@ -2652,8 +2629,7 @@ void stream::_process_service_dependency(const std::shared_ptr& d) { // Process object. _service_dependency_insupdate << sd; _mysql.run_statement(_service_dependency_insupdate, - database::mysql_error::store_service_dependency, false, - conn); + database::mysql_error::store_service_dependency, conn); _add_action(conn, actions::service_dependencies); } // Delete. @@ -2668,7 +2644,7 @@ void stream::_process_service_dependency(const std::shared_ptr& d) { "AND dependent_service_id={} AND host_id={} AND service_id={}", sd.dependent_host_id, sd.dependent_service_id, sd.host_id, sd.service_id)); - _mysql.run_query(query, database::mysql_error::empty, false, conn); + _mysql.run_query(query, database::mysql_error::empty, conn); _add_action(conn, actions::service_dependencies); } } @@ -2696,8 +2672,7 @@ void stream::_process_service_group(const std::shared_ptr& d) { _service_group_insupdate << sg; _mysql.run_statement(_service_group_insupdate, - database::mysql_error::store_service_group, false, - conn); + database::mysql_error::store_service_group, conn); _servicegroup_cache.insert(sg.id); } // Delete group. @@ -2717,7 +2692,7 @@ void stream::_process_service_group(const std::shared_ptr& d) { "services_servicegroups.servicegroup_id={} AND " "hosts.instance_id={}", sg.id, sg.poller_id)); - _mysql.run_query(query, database::mysql_error::empty, false, conn); + _mysql.run_query(query, database::mysql_error::empty, conn); _servicegroup_cache.erase(sg.id); } } @@ -2775,15 +2750,14 @@ void stream::_process_service_group_member(const std::shared_ptr& d) { _service_group_insupdate << sg; _mysql.run_statement(_service_group_insupdate, - database::mysql_error::store_service_group, false, - conn); + database::mysql_error::store_service_group, conn); _servicegroup_cache.insert(sgm.group_id); } _service_group_member_insert << sgm; _mysql.run_statement(_service_group_member_insert, database::mysql_error::store_service_group_member, - false, conn); + conn); _add_action(conn, actions::servicegroups); } // Delete. @@ -2807,7 +2781,7 @@ void stream::_process_service_group_member(const std::shared_ptr& d) { _service_group_member_delete << sgm; _mysql.run_statement(_service_group_member_delete, database::mysql_error::delete_service_group_member, - false, conn); + conn); _add_action(conn, actions::servicegroups); } } @@ -2854,7 +2828,7 @@ void stream::_process_service(const std::shared_ptr& d) { _service_insupdate << s; _mysql.run_statement(_service_insupdate, - database::mysql_error::store_service, false, conn); + database::mysql_error::store_service, conn); _add_action(conn, actions::services); } else SPDLOG_LOGGER_TRACE( @@ -3040,7 +3014,7 @@ void stream::_process_pb_service(const std::shared_ptr& d) { // Process object. _pb_service_insupdate << *svc; _mysql.run_statement(_pb_service_insupdate, - database::mysql_error::store_service, false, conn); + database::mysql_error::store_service, conn); _add_action(conn, actions::services); _check_and_update_index_cache(s); @@ -3196,8 +3170,7 @@ void stream::_process_pb_service(const std::shared_ptr& d) { _resources_service_update.bind_value_as_u64(21, res_id); _mysql.run_statement(_resources_service_update, - database::mysql_error::store_service, false, - conn); + database::mysql_error::store_service, conn); _add_action(conn, actions::resources); } @@ -3213,7 +3186,7 @@ void stream::_process_pb_service(const std::shared_ptr& d) { _resources_tags_remove.bind_value_as_u64(0, res_id); _mysql.run_statement(_resources_tags_remove, database::mysql_error::delete_resources_tags, - false, conn); + conn); for (auto& tag : s.tags()) { auto it_tags_cache = _tags_cache.find({tag.id(), tag.type()}); @@ -3255,7 +3228,7 @@ void stream::_process_pb_service(const std::shared_ptr& d) { res_id, s.host_id(), s.service_id(), tag.id(), tag.type()); _mysql.run_statement( _resources_tags_insert, - database::mysql_error::store_tags_resources_tags, false, conn); + database::mysql_error::store_tags_resources_tags, conn); _add_action(conn, actions::resources_tags); } else { SPDLOG_LOGGER_ERROR( @@ -3269,8 +3242,7 @@ void stream::_process_pb_service(const std::shared_ptr& d) { _resources_disable.bind_value_as_u64(0, found->second); _mysql.run_statement(_resources_disable, - database::mysql_error::clean_resources, false, - conn); + database::mysql_error::clean_resources, conn); _resource_cache.erase(found); _add_action(conn, actions::resources); } else { @@ -3372,7 +3344,7 @@ void stream::_process_pb_adaptive_service(const std::shared_ptr& d) { query += fmt::format(" WHERE host_id={} AND service_id={}", as.host_id(), as.service_id()); SPDLOG_LOGGER_TRACE(log_v2::sql(), "SQL: query <<{}>>", query); - _mysql.run_query(query, database::mysql_error::store_service, false, conn); + _mysql.run_query(query, database::mysql_error::store_service, conn); _add_action(conn, actions::services); if (_store_in_resources) { @@ -3397,7 +3369,7 @@ void stream::_process_pb_adaptive_service(const std::shared_ptr& d) { as.service_id()); SPDLOG_LOGGER_TRACE(log_v2::sql(), "SQL: query <<{}>>", res_query); _mysql.run_query(res_query, database::mysql_error::update_resources, - false, conn); + conn); _add_action(conn, actions::resources); } } @@ -3637,8 +3609,7 @@ void stream::_process_service_status(const std::shared_ptr& d) { int32_t conn = _mysql.choose_connection_by_instance(_cache_host_instance[ss.host_id]); _mysql.run_statement(_service_status_update, - database::mysql_error::store_service_status, false, - conn); + database::mysql_error::store_service_status, conn); _add_action(conn, actions::hosts); } else // Do nothing. @@ -3793,8 +3764,7 @@ void stream::_process_pb_service_status(const std::shared_ptr& d) { _sscr_update->bind_value_as_i32(29, sscr.service_id()); _mysql.run_statement(*_sscr_update, - database::mysql_error::store_service_status, false, - conn); + database::mysql_error::store_service_status, conn); _add_action(conn, actions::services); } @@ -3854,8 +3824,7 @@ void stream::_process_pb_service_status(const std::shared_ptr& d) { _sscr_resources_update->bind_value_as_u64(12, sscr.host_id()); _mysql.run_statement(*_sscr_resources_update, - database::mysql_error::store_service_status, false, - conn); + database::mysql_error::store_service_status, conn); _add_action(conn, actions::resources); } } @@ -3914,8 +3883,7 @@ void stream::_process_severity(const std::shared_ptr& d) { _severity_update.bind_value_as_u64(4, sv.icon_id()); _severity_update.bind_value_as_u64(5, severity_id); _mysql.run_statement(_severity_update, - database::mysql_error::store_severity, false, - conn); + database::mysql_error::store_severity, conn); } else { SPDLOG_LOGGER_TRACE(log_v2::sql(), "SQL: add severity {}", sv.id()); _severity_insert.bind_value_as_u64(0, sv.id()); @@ -3950,8 +3918,7 @@ void stream::_process_severity(const std::shared_ptr& d) { if (severity_id) { _severity_update.bind_value_as_u64(5, severity_id); _mysql.run_statement(_severity_update, - database::mysql_error::store_severity, false, - conn); + database::mysql_error::store_severity, conn); _add_action(conn, actions::severities); } else SPDLOG_LOGGER_ERROR( @@ -4007,7 +3974,7 @@ void stream::_process_tag(const std::shared_ptr& d) { _tag_update.bind_value_as_str(2, tg.name()); _tag_update.bind_value_as_u64(3, tag_id); _mysql.run_statement(_tag_update, database::mysql_error::store_tag, - false, conn); + conn); } else { SPDLOG_LOGGER_TRACE(log_v2::sql(), "SQL: add tag {}", tg.id()); _tag_insert.bind_value_as_u64(0, tg.id()); @@ -4038,7 +4005,7 @@ void stream::_process_tag(const std::shared_ptr& d) { if (tag_id) { _tag_update.bind_value_as_u64(3, tag_id); _mysql.run_statement(_tag_update, database::mysql_error::store_tag, - false, conn); + conn); _add_action(conn, actions::tags); } else SPDLOG_LOGGER_ERROR( @@ -4052,9 +4019,8 @@ void stream::_process_tag(const std::shared_ptr& d) { uint64_t id = it->second; SPDLOG_LOGGER_TRACE(log_v2::sql(), "SQL: delete tag {}", id); _tag_delete.bind_value_as_u64(0, tg.id()); - _mysql.run_statement(_tag_delete, - database::mysql_error::delete_resources_tags, - false, conn); + _mysql.run_statement( + _tag_delete, database::mysql_error::delete_resources_tags, conn); _tags_cache.erase(it); } else SPDLOG_LOGGER_WARN( diff --git a/broker/unified_sql/src/stream_storage.cc b/broker/unified_sql/src/stream_storage.cc index 89ed0b19976..17986c3450d 100644 --- a/broker/unified_sql/src/stream_storage.cc +++ b/broker/unified_sql/src/stream_storage.cc @@ -764,7 +764,7 @@ void stream::_update_metrics() { int32_t conn = _mysql.choose_best_connection(-1); _finish_action(-1, actions::metrics); log_v2::sql()->trace("Send query: {}", query); - _mysql.run_query(query, database::mysql_error::update_metrics, false, conn); + _mysql.run_query(query, database::mysql_error::update_metrics, conn); _add_action(conn, actions::metrics); } } @@ -809,9 +809,8 @@ void stream::_check_queues(asio::error_code ec) { // Setting the good bind to the stmt _hscr_bind->apply_to_stmt(conn); // Executing the stmt - _mysql.run_statement(*_hscr_update, - database::mysql_error::store_host_status, - false, conn); + _mysql.run_statement( + *_hscr_update, database::mysql_error::store_host_status, conn); _add_action(conn, actions::hosts); } } @@ -830,7 +829,7 @@ void stream::_check_queues(asio::error_code ec) { // Executing the stmt _mysql.run_statement(*_sscr_update, database::mysql_error::store_service_status, - false, conn); + conn); _add_action(conn, actions::services); } } @@ -847,7 +846,7 @@ void stream::_check_queues(asio::error_code ec) { // Executing the stmt _mysql.run_statement(*_hscr_resources_update, database::mysql_error::store_host_status, - false, conn); + conn); _add_action(conn, actions::resources); } } @@ -862,7 +861,7 @@ void stream::_check_queues(asio::error_code ec) { // Executing the stmt _mysql.run_statement(*_sscr_resources_update, database::mysql_error::store_service_status, - false, conn); + conn); _add_action(conn, actions::resources); } } @@ -883,7 +882,7 @@ void stream::_check_queues(asio::error_code ec) { std::string query = _cv.get_query(); int32_t conn = special_conn::custom_variable % _mysql.connections_count(); _mysql.run_query(query, database::mysql_error::update_customvariables, - false, conn); + conn); _add_action(conn, actions::custom_variables); customvar_done = true; } @@ -894,7 +893,7 @@ void stream::_check_queues(asio::error_code ec) { std::string query = _cvs.get_query(); int32_t conn = special_conn::custom_variable % _mysql.connections_count(); _mysql.run_query(query, database::mysql_error::update_customvariables, - false, conn); + conn); _add_action(conn, actions::custom_variables); customvar_done = true; } @@ -909,7 +908,7 @@ void stream::_check_queues(asio::error_code ec) { actions::service_dependencies); int32_t conn = special_conn::downtime % _mysql.connections_count(); _mysql.run_query(query, database::mysql_error::update_customvariables, - false, conn); + conn); _add_action(conn, actions::downtimes); downtimes_done = true; } @@ -920,7 +919,7 @@ void stream::_check_queues(asio::error_code ec) { std::string query = _logs.get_query(); // Execute query. int32_t conn = special_conn::log % _mysql.connections_count(); - _mysql.run_query(query, database::mysql_error::update_logs, false, conn); + _mysql.run_query(query, database::mysql_error::update_logs, conn); logs_done = true; } diff --git a/tests/bam/inherited_downtime.robot b/tests/bam/inherited_downtime.robot index 24586224e5a..ecdb9cdad13 100644 --- a/tests/bam/inherited_downtime.robot +++ b/tests/bam/inherited_downtime.robot @@ -164,6 +164,7 @@ BEBAMIGNDT1 Config Broker central Broker Config Log central bam trace Broker Config Log central sql trace + broker_config_source_log central true Broker Config Flush Log module0 0 Broker Config Log module0 neb trace Config Broker rrd diff --git a/tests/resources/db_variables.robot b/tests/resources/db_variables.robot index 1614d6316ee..890fa4837aa 100644 --- a/tests/resources/db_variables.robot +++ b/tests/resources/db_variables.robot @@ -3,10 +3,10 @@ ${EtcRoot} /tmp/etc ${VarRoot} /tmp/var ${DBName} centreon_storage ${DBNameConf} centreon -${DBHost} 127.0.0.1 +${DBHost} localhost ${DBUser} centreon ${DBPass} centreon ${DBPort} 3306 -${DBUserRoot} root +${DBUserRoot} root_centreon ${DBPassRoot} centreon