archive/netdata_netdata
0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-04-17 11:12:42 +00:00
Code Issues Projects Releases Wiki Activity

Prefer context attributes from non archived charts ()

Browse source 
prefer context attributes from non archived charts
This commit is contained in:
Emmanuel Vasilakis 2022-08-23 18:14:53 +03:00 • committed by GitHub
parent 575986a692
commit b955368a90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions

16
database/rrdcontext.c
View file

@ -1531,11 +1531,20 @@ static void rrdcontext_conflict_callback(const char *id, void *oldv, void *newv,
RRDCONTEXT *rc = (RRDCONTEXT *)oldv;
RRDCONTEXT *rc_new = (RRDCONTEXT *)newv;
//current rc is not archived, new_rc is archived, dont merge
if (!rrd_flag_is_archived(rc) && rrd_flag_is_archived(rc_new)) {
rrdcontext_freez(rc_new);
return;
}
rrdcontext_lock(rc);
if(rc->title != rc_new->title) {
STRING *old_title = rc->title;
rc->title = string_2way_merge(rc->title, rc_new->title);
if (rrd_flag_is_archived(rc) && !rrd_flag_is_archived(rc_new))
rc->title = string_dup(rc_new->title);
else
rc->title = string_2way_merge(rc->title, rc_new->title);
string_freez(old_title);
rrd_flag_set_updated(rc, RRD_FLAG_UPDATE_REASON_CHANGED_TITLE);
}
@ -1549,7 +1558,10 @@ static void rrdcontext_conflict_callback(const char *id, void *oldv, void *newv,
if(rc->family != rc_new->family) {
STRING *old_family = rc->family;
rc->family = string_2way_merge(rc->family, rc_new->family);
if (rrd_flag_is_archived(rc) && !rrd_flag_is_archived(rc_new))
rc->family = string_dup(rc_new->family);
else
rc->family = string_2way_merge(rc->family, rc_new->family);
string_freez(old_family);
rrd_flag_set_updated(rc, RRD_FLAG_UPDATE_REASON_CHANGED_FAMILY);
}