fix(bam): services cache too restrictive (#711)

* fix(bam): services cache too restrictive
* fix(mysql_connection): atomic operation not really atomic

REFS: MON-12070

Author: bouda1

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 20.10.11
+
+### Fixes
+
+*bam*
+
+A ba configured with boolean expressions could not anymore load its services
+states because of a regression.
+
 ## 20.10.10
 
 ### Fixes
@@ -20,7 +29,7 @@ A ba configured with best status was initialized in state OK. And when KPI were
 added, there status was always worst than OK (best case was OK). So even if all
 the kpi were in critical, the state appeared as OK.
 
-The cache in bam is lighter, only needed services are loaded. Metrics are no
+The cache in bam is lighter, metrics are no
 more loaded. And queries to load the cache are parallelized.
 
 *mysql_connection*

CMakeLists.txt

@@ -171,7 +171,7 @@ set_target_properties(berpc PROPERTIES COMPILE_FLAGS "-fPIC")
 # Version.
 set(CENTREON_BROKER_MAJOR 20)
 set(CENTREON_BROKER_MINOR 10)
-set(CENTREON_BROKER_PATCH 10)
+set(CENTREON_BROKER_PATCH 11)
 if (CENTREON_BROKER_PRERELEASE)
   set(CENTREON_BROKER_VERSION "${CENTREON_BROKER_MAJOR}.${CENTREON_BROKER_MINOR}.${CENTREON_BROKER_PATCH}-${CENTREON_BROKER_PRERELEASE}")
 else ()

bam/src/configuration/reader_v2.cc

@@ -364,10 +364,11 @@ void reader_v2::_load(bam::hst_svc_mapping& mapping) {
     // XXX : expand hostgroups and servicegroups
     std::promise<database::mysql_result> promise;
     _mysql.run_query_and_get_result(
-        "SELECT DISTINCT h.host_id, s.service_id, h.host_name, s.service_description,service_activate FROM "
-        "service s LEFT JOIN host_service_relation AS hsr ON s.service_id=hsr.service_service_id "
-        "LEFT JOIN host AS h ON hsr.host_host_id=h.host_id LEFT JOIN mod_bam_kpi k ON "
-        "h.host_id=k.host_id AND k.service_id=s.service_id WHERE k.kpi_type='0'",
+        "SELECT h.host_id, s.service_id, h.host_name, "
+        "s.service_description,service_activate FROM "
+        "service s LEFT JOIN host_service_relation hsr ON "
+        "s.service_id=hsr.service_service_id "
+        "LEFT JOIN host h ON hsr.host_host_id=h.host_id",
         &promise, 0);
     database::mysql_result res(promise.get_future().get());
     while (_mysql.fetch_row(res))

core/src/mysql_connection.cc

@@ -238,15 +238,17 @@ void mysql_connection::_commit(mysql_task* t) {
         fmt::format("Error during commit: {}", ::mysql_error(_conn)));
     log_v2::sql()->error("mysql_connection: {}", err_msg);
     set_error_message(err_msg);
-    if (--task->count == 0)
+    int c = atomic_fetch_sub(&task->count, 1) - 1;
+    if (c == 0)
       task->promise->set_value(true);
   } else {
     /* No more queries are waiting for a commit now. */
     _need_commit = false;
 
     /* Commit is done on each connection. If task->count is 0, then we are on
      * the last one. It's time to release the future boolean. */
-    if (--task->count == 0)
+    int c = atomic_fetch_sub(&task->count, 1) - 1;
+    if (c == 0)
       task->promise->set_value(true);
   }
 }