From 1ee0c09c5742557e037df5421ca62abddb90ae22 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 19 May 2021 14:33:38 +0200 Subject: Merging upstream version 1.31.0. Signed-off-by: Daniel Baumann --- streaming/receiver.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'streaming/receiver.c') diff --git a/streaming/receiver.c b/streaming/receiver.c index 03954064a..11191f3c7 100644 --- a/streaming/receiver.c +++ b/streaming/receiver.c @@ -30,7 +30,7 @@ static void rrdpush_receiver_thread_cleanup(void *ptr) { executed = 1; struct receiver_state *rpt = (struct receiver_state *) ptr; // If the shutdown sequence has started, and this receiver is still attached to the host then we cannot touch - // the host pointer as it is unpredicable when the RRDHOST is deleted. Do the cleanup from rrdhost_free(). + // the host pointer as it is unpredictable when the RRDHOST is deleted. Do the cleanup from rrdhost_free(). if (netdata_exit && rpt->host) { rpt->exited = 1; return; @@ -123,13 +123,16 @@ PARSER_RC streaming_claimed_id(char **words, void *user, PLUGINSD_ACTION *plugin if(strcmp(words[1], host->machine_guid)) { error("Claim ID is for host \"%s\" but it came over connection for \"%s\"", words[1], host->machine_guid); - return PARSER_RC_OK; //the message is OK problem must be somewehere else + return PARSER_RC_OK; //the message is OK problem must be somewhere else } rrdhost_aclk_state_lock(host); if (host->aclk_state.claimed_id) freez(host->aclk_state.claimed_id); host->aclk_state.claimed_id = strcmp(words[2], "NULL") ? strdupz(words[2]) : NULL; + + store_claim_id(&host->host_uuid, host->aclk_state.claimed_id ? &uuid : NULL); + rrdhost_aclk_state_unlock(host); rrdpush_claimed_id(host); -- cgit v1.2.3