diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-09-04 08:57:49 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-09-04 08:57:49 +0000 |
| commit | 5f647647b2683875bdbed970d955a9e5123284bd (patch) | |
| tree | 66dcf1d9f7a60cd19dd9ac410e27d5f6ead521d3 /database | |
| parent | Releasing debian version 1.42.1-1. (diff) | |
| download | netdata-5f647647b2683875bdbed970d955a9e5123284bd.tar.xz netdata-5f647647b2683875bdbed970d955a9e5123284bd.zip | |
Merging upstream version 1.42.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'database')
| -rw-r--r-- | database/rrd.h | 4 | ||||
| -rw-r--r-- | database/rrdhost.c | 3 | ||||
| -rw-r--r-- | database/sqlite/sqlite_aclk_alert.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/database/rrd.h b/database/rrd.h index ea211f64e..d64f5904a 100644 --- a/database/rrd.h +++ b/database/rrd.h @@ -891,9 +891,11 @@ struct rrdset { } alerts; struct { + SPINLOCK spinlock; // used only for cleanup + pid_t collector_tid; + bool set; uint32_t pos; uint32_t size; - uint32_t used; RRDDIM_ACQUIRED **rda; } pluginsd; diff --git a/database/rrdhost.c b/database/rrdhost.c index 235d64b1e..bec821ccc 100644 --- a/database/rrdhost.c +++ b/database/rrdhost.c @@ -509,7 +509,8 @@ int is_legacy = 1; if(t != host) { netdata_log_error("Host '%s': cannot add host with machine guid '%s' to index. It already exists as host '%s' with machine guid '%s'.", rrdhost_hostname(host), host->machine_guid, rrdhost_hostname(t), t->machine_guid); - rrdhost_free___while_having_rrd_wrlock(host, true); + if (!is_localhost) + rrdhost_free___while_having_rrd_wrlock(host, true); rrd_unlock(); return NULL; } diff --git a/database/sqlite/sqlite_aclk_alert.c b/database/sqlite/sqlite_aclk_alert.c index f10a866f3..20ca0573d 100644 --- a/database/sqlite/sqlite_aclk_alert.c +++ b/database/sqlite/sqlite_aclk_alert.c @@ -850,7 +850,7 @@ static int have_recent_alarm(RRDHOST *host, uint32_t alarm_id, uint32_t mark) } #endif -#define ALARM_EVENTS_PER_CHUNK 10 +#define ALARM_EVENTS_PER_CHUNK 1000 void aclk_push_alert_snapshot_event(char *node_id __maybe_unused) { #ifdef ENABLE_ACLK |