Health_index (#6377)

Inside rrdcalc_unlink_and_free I wrote a not proper way to check the presence
of an element inside the AVL, so I was raising an error without to do the correct checks!

1 files changed, 12 insertions, 6 deletions

diff --git a/database/rrdcalc.c b/database/rrdcalc.c
index 835eeab336..908fc2ebfd 100644
--- a/database/rrdcalc.c
+++ b/database/rrdcalc.c
@@ -438,14 +438,20 @@ void rrdcalc_unlink_and_free(RRDHOST *host, RRDCALC *rc) {
     }
 
     if (rc) {
-        RRDCALC *rdcmp = (RRDCALC *) avl_remove_lock(&(host)->alarms_idx_health_log, (avl *)rc);
-        if (!rdcmp) {
-            error("Cannot remove the health alarm index");
+        RRDCALC *rdcmp = (RRDCALC *) avl_search_lock(&(host)->alarms_idx_health_log, (avl *)rc);
+        if (rdcmp) {
+            rdcmp = (RRDCALC *) avl_remove_lock(&(host)->alarms_idx_health_log, (avl *)rc);
+            if (!rdcmp) {
+                error("Cannot remove the health alarm index from health_log");
+            }
         }
 
-        rdcmp = (RRDCALC *) avl_remove_lock(&(host)->alarms_idx_name, (avl *)rc);
-        if (!rdcmp) {
-            error("Cannot remove the health alarm index");
+        rdcmp = (RRDCALC *) avl_search_lock(&(host)->alarms_idx_name, (avl *)rc);
+        if (rdcmp) {
+            rdcmp = (RRDCALC *) avl_remove_lock(&(host)->alarms_idx_name, (avl *)rc);
+            if (!rdcmp) {
+                error("Cannot remove the health alarm index from idx_name");
+            }
         }
     }