diff options
| author | Markos Fountoulakis <44345837+mfundul@users.noreply.github.com> | 2020-09-11 19:57:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-11 19:57:22 +0300 |
| commit | 88a6572382b71543d960b57498243d7bf25b6953 (patch) | |
| tree | ad4bf4a1e27b7da820637411bee3546d8226b0cf /database | |
| parent | f9f813cd463173acda2f64b275bb6f3f365e5964 (diff) | |
Fix memory mode none not dropping stale dimension data in general when streaming to a parent. (#9917)
Diffstat (limited to 'database')
| -rw-r--r-- | database/rrddim.c | 2 | ||||
| -rw-r--r-- | database/rrdset.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/database/rrddim.c b/database/rrddim.c index 9521959b51..e2fe519a8c 100644 --- a/database/rrddim.c +++ b/database/rrddim.c @@ -596,8 +596,6 @@ inline void rrddim_is_obsolete(RRDSET *st, RRDDIM *rd) { } rrddim_flag_set(rd, RRDDIM_FLAG_OBSOLETE); rrdset_flag_set(st, RRDSET_FLAG_OBSOLETE_DIMENSIONS); - if (unlikely(st->rrd_memory_mode == RRD_MEMORY_MODE_NONE)) - rd->updated = 0; #ifdef ENABLE_ACLK if (netdata_cloud_setting) aclk_update_chart(st->rrdhost, st->id, ACLK_CMD_CHART); diff --git a/database/rrdset.c b/database/rrdset.c index c941f430d1..585eb7ff0e 100644 --- a/database/rrdset.c +++ b/database/rrdset.c @@ -1796,6 +1796,7 @@ after_first_database_work: , storage_flags ); +after_second_database_work: st->last_collected_total = st->collected_total; rrddim_foreach_read(rd, st) { @@ -1859,8 +1860,7 @@ after_first_database_work: // ALL DONE ABOUT THE DATA UPDATE // -------------------------------------------------------------------- -after_second_database_work: - ; + // find if there are any obsolete dimensions time_t now = now_realtime_sec(); |