summaryrefslogtreecommitdiffstats
path: root/database
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2023-05-18 14:38:09 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2023-05-18 14:38:09 +0000
commit9f80b256e67a8c2c4755e0b66ae0e83abd74796a (patch)
tree053624169800a5388af4e3d78911e335ee0d78d3 /database
parentReleasing debian version 1.39.0-1. (diff)
downloadnetdata-9f80b256e67a8c2c4755e0b66ae0e83abd74796a.tar.xz
netdata-9f80b256e67a8c2c4755e0b66ae0e83abd74796a.zip
Merging upstream version 1.39.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'database')
-rw-r--r--database/rrdset.c2
-rw-r--r--database/sqlite/sqlite_aclk_alert.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/database/rrdset.c b/database/rrdset.c
index 2843bb33..3177f43f 100644
--- a/database/rrdset.c
+++ b/database/rrdset.c
@@ -2207,7 +2207,7 @@ bool rrdset_memory_load_or_create_map_save(RRDSET *st, RRD_MEMORY_MODE memory_mo
memset(st_on_file, 0, size);
// set the values we need
- strncpyz(st_on_file->id, rrdset_id(st), RRD_ID_LENGTH_MAX_V019 + 1);
+ strncpyz(st_on_file->id, rrdset_id(st), RRD_ID_LENGTH_MAX_V019);
strcpy(st_on_file->cache_filename, fullfilename);
strcpy(st_on_file->magic, RRDSET_MAGIC_V019);
st_on_file->memsize = size;
diff --git a/database/sqlite/sqlite_aclk_alert.c b/database/sqlite/sqlite_aclk_alert.c
index 62f1df29..1e5bd0b7 100644
--- a/database/sqlite/sqlite_aclk_alert.c
+++ b/database/sqlite/sqlite_aclk_alert.c
@@ -1114,6 +1114,7 @@ void aclk_push_alarm_checkpoint(RRDHOST *host __maybe_unused)
buffer_strcat(alarms_to_hash, "");
len = 0;
}
+ freez(active_alerts);
char hash[SHA256_DIGEST_LENGTH + 1];
if (hash256_string((const unsigned char *)buffer_tostring(alarms_to_hash), len, hash)) {
@@ -1126,6 +1127,7 @@ void aclk_push_alarm_checkpoint(RRDHOST *host __maybe_unused)
alarm_checkpoint.checksum = (char *)hash;
aclk_send_provide_alarm_checkpoint(&alarm_checkpoint);
+ freez(claim_id);
log_access("ACLK RES [%s (%s)]: ALERTS CHECKPOINT SENT", wc->node_id, rrdhost_hostname(host));
} else {
log_access("ACLK RES [%s (%s)]: FAILED TO CREATE ALERTS CHECKPOINT HASH", wc->node_id, rrdhost_hostname(host));