Check for chart obsoletion on children re-connections (#12707)

* check for chart obsoletion on children connections

* use rrdset_is_obsolete

2 files changed, 21 insertions, 0 deletions

diff --git a/database/rrd.h b/database/rrd.h
index 4fa78b005a..371f1af6af 100644
--- a/database/rrd.h
+++ b/database/rrd.h
@@ -827,6 +827,8 @@ struct rrdhost {
 
     struct receiver_state *receiver;
     netdata_mutex_t receiver_lock;
+    time_t trigger_chart_obsoletion_check;          // set when child connects, will instruct parent to
+                                                    // trigger a check for obsoleted charts since previous connect
 
     // ------------------------------------------------------------------------
     // health monitoring options
diff --git a/database/rrdhost.c b/database/rrdhost.c
index 649736ca4f..b0874e3d3d 100644
--- a/database/rrdhost.c
+++ b/database/rrdhost.c
@@ -1528,6 +1528,16 @@ restart_after_removal:
     }
 }
 
+void rrdset_check_obsoletion(RRDHOST *host)
+{
+    RRDSET *st;
+    rrdset_foreach_write(st, host) {
+        if (rrdset_last_entry_t(st) < host->trigger_chart_obsoletion_check) {
+            rrdset_is_obsolete(st);
+        }
+    }
+}
+
 void rrd_cleanup_obsolete_charts()
 {
     rrd_rdlock();
@@ -1547,6 +1557,15 @@ void rrd_cleanup_obsolete_charts()
 #endif
             rrdhost_unlock(host);
         }
+
+        if (host != localhost &&
+            host->trigger_chart_obsoletion_check &&
+            host->trigger_chart_obsoletion_check + 120 < now_realtime_sec()) {
+            rrdhost_wrlock(host);
+            rrdset_check_obsoletion(host);
+            rrdhost_unlock(host);
+            host->trigger_chart_obsoletion_check = 0;
+        }
     }
 
     rrd_unlock();