Revert "Refactor RRD code. (#15423)" (#15723)

This reverts commit 440bd51e08fdfa2a4daa191fb68643456028a753.

dbengine was still being used for non-zero tiers
even on non-dbengine modes.

CMakeLists.txt

@@ -734,7 +734,6 @@ set(RRD_PLUGIN_FILES
         database/rrdfunctions.h
         database/rrdhost.c
         database/rrdlabels.c
-        database/rrdlabels.h
         database/rrd.c
         database/rrd.h
         database/rrdset.c
@@ -744,7 +743,6 @@ set(RRD_PLUGIN_FILES
         database/rrdvar.h
         database/storage_engine.c
         database/storage_engine.h
-        database/storage_engine_types.h
         database/ram/rrddim_mem.c
         database/ram/rrddim_mem.h
         database/sqlite/sqlite_metadata.c
@@ -776,7 +774,6 @@ set(RRD_PLUGIN_FILES
         database/engine/rrdenginelib.h
         database/engine/rrdengineapi.c
         database/engine/rrdengineapi.h
-        database/engine/rrddim_eng.h
         database/engine/pagecache.c
         database/engine/pagecache.h
         database/engine/cache.c
@@ -1059,7 +1056,6 @@ ENDIF()
 
 set(NETDATA_FILES
         collectors/all.h
-        collectors/utils.h
         ${DAEMON_FILES}
         ${API_PLUGIN_FILES}
         ${EXPORTING_ENGINE_FILES}

Makefile.am

@@ -464,7 +464,6 @@ RRD_PLUGIN_FILES = \
     database/rrdfamily.c \
     database/rrdhost.c \
     database/rrdlabels.c \
-    database/rrdlabels.h \
     database/rrd.c \
     database/rrd.h \
     database/rrdset.c \
@@ -476,7 +475,6 @@ RRD_PLUGIN_FILES = \
     database/rrdvar.h \
     database/storage_engine.c \
     database/storage_engine.h \
-    database/storage_engine_types.h \
     database/ram/rrddim_mem.c \
     database/ram/rrddim_mem.h \
     database/sqlite/sqlite_functions.c \
@@ -549,7 +547,6 @@ libjudy_a-JudyLTables.$(OBJEXT) : CFLAGS += -I$(abs_top_srcdir)/libnetdata/libju
 
 if ENABLE_DBENGINE
     RRD_PLUGIN_FILES += \
-        database/engine/rrddim_eng.h \
         database/engine/rrdengine.c \
         database/engine/rrdengine.h \
         database/engine/rrddiskprotocol.h \
@@ -1075,7 +1072,6 @@ endif #ENABLE_H2O
 
 NETDATA_FILES = \
     collectors/all.h \
-    collectors/utils.h \
     $(DAEMON_FILES) \
     $(LIBNETDATA_FILES) \
     $(API_PLUGIN_FILES) \

aclk/aclk.c

@@ -913,15 +913,15 @@ void aclk_host_state_update(RRDHOST *host, int cmd)
             // node_id not found
             aclk_query_t create_query;
             create_query = aclk_query_new(REGISTER_NODE);
-            rrdhost_aclk_state_lock(rrdb.localhost);
+            rrdhost_aclk_state_lock(localhost);
             node_instance_creation_t node_instance_creation = {
-                .claim_id = rrdb.localhost->aclk_state.claimed_id,
+                .claim_id = localhost->aclk_state.claimed_id,
                 .hops = host->system_info->hops,
                 .hostname = rrdhost_hostname(host),
                 .machine_guid = host->machine_guid};
             create_query->data.bin_payload.payload =
                 generate_node_instance_creation(&create_query->data.bin_payload.size, &node_instance_creation);
-            rrdhost_aclk_state_unlock(rrdb.localhost);
+            rrdhost_aclk_state_unlock(localhost);
             create_query->data.bin_payload.topic = ACLK_TOPICID_CREATE_NODE;
             create_query->data.bin_payload.msg_name = "CreateNodeInstance";
             netdata_log_info("Registering host=%s, hops=%u", host->machine_guid, host->system_info->hops);
@@ -942,10 +942,10 @@ void aclk_host_state_update(RRDHOST *host, int cmd)
 
     node_state_update.capabilities = aclk_get_agent_capas();
 
-    rrdhost_aclk_state_lock(rrdb.localhost);
-    node_state_update.claim_id = rrdb.localhost->aclk_state.claimed_id;
+    rrdhost_aclk_state_lock(localhost);
+    node_state_update.claim_id = localhost->aclk_state.claimed_id;
     query->data.bin_payload.payload = generate_node_instance_connection(&query->data.bin_payload.size, &node_state_update);
-    rrdhost_aclk_state_unlock(rrdb.localhost);
+    rrdhost_aclk_state_unlock(localhost);
 
     netdata_log_info("Queuing status update for node=%s, live=%d, hops=%u",(char*)node_state_update.node_id, cmd,
          host->system_info->hops);
@@ -986,10 +986,10 @@ void aclk_send_node_instances()
             }
             node_state_update.capabilities = aclk_get_node_instance_capas(host);
 
-            rrdhost_aclk_state_lock(rrdb.localhost);
-            node_state_update.claim_id = rrdb.localhost->aclk_state.claimed_id;
+            rrdhost_aclk_state_lock(localhost);
+            node_state_update.claim_id = localhost->aclk_state.claimed_id;
             query->data.bin_payload.payload = generate_node_instance_connection(&query->data.bin_payload.size, &node_state_update);
-            rrdhost_aclk_state_unlock(rrdb.localhost);
+            rrdhost_aclk_state_unlock(localhost);
             netdata_log_info("Queuing status update for node=%s, live=%d, hops=%d",(char*)node_state_update.node_id,
                  list->live,
                  list->hops);
@@ -1010,10 +1010,10 @@ void aclk_send_node_instances()
             uuid_unparse_lower(list->host_id, (char*)node_instance_creation.machine_guid);
             create_query->data.bin_payload.topic = ACLK_TOPICID_CREATE_NODE;
             create_query->data.bin_payload.msg_name = "CreateNodeInstance";
-            rrdhost_aclk_state_lock(rrdb.localhost);
-            node_instance_creation.claim_id = rrdb.localhost->aclk_state.claimed_id,
+            rrdhost_aclk_state_lock(localhost);
+            node_instance_creation.claim_id = localhost->aclk_state.claimed_id,
             create_query->data.bin_payload.payload = generate_node_instance_creation(&create_query->data.bin_payload.size, &node_instance_creation);
-            rrdhost_aclk_state_unlock(rrdb.localhost);
+            rrdhost_aclk_state_unlock(localhost);
             netdata_log_info("Queuing registration for host=%s, hops=%d",(char*)node_instance_creation.machine_guid,
                  list->hops);
             freez((void *)node_instance_creation.machine_guid);
@@ -1124,9 +1124,9 @@ char *aclk_state(void)
                 buffer_sprintf(wb, "\n\tNode ID: %s\n", node_id);
             }
 
-            buffer_sprintf(wb, "\tStreaming Hops: %d\n\tRelationship: %s", host->system_info->hops, host == rrdb.localhost ? "self" : "child");
+            buffer_sprintf(wb, "\tStreaming Hops: %d\n\tRelationship: %s", host->system_info->hops, host == localhost ? "self" : "child");
 
-            if (host != rrdb.localhost)
+            if (host != localhost)
                 buffer_sprintf(wb, "\n\tStreaming Connection Live: %s", host->receiver ? "true" : "false");
 
             buffer_strcat(wb, "\n\tAlert Streaming Status:");
@@ -1270,10 +1270,10 @@ char *aclk_state_json(void)
         tmp = json_object_new_int(host->system_info->hops);
         json_object_object_add(nodeinstance, "streaming-hops", tmp);
 
-        tmp = json_object_new_string(host == rrdb.localhost ? "self" : "child");
+        tmp = json_object_new_string(host == localhost ? "self" : "child");
         json_object_object_add(nodeinstance, "relationship", tmp);
 
-        tmp = json_object_new_boolean((host->receiver || host == rrdb.localhost));
+        tmp = json_object_new_boolean((host->receiver || host == localhost));
         json_object_object_add(nodeinstance, "streaming-online", tmp);
 
         tmp = json_object_new_object();
@@ -1292,7 +1292,7 @@ char *aclk_state_json(void)
 }
 
 void add_aclk_host_labels(void) {
-    DICTIONARY *labels = rrdb.localhost->rrdlabels;
+    DICTIONARY *labels = localhost->rrdlabels;
 
 #ifdef ENABLE_ACLK
     rrdlabels_add(labels, "_aclk_available", "true", RRDLABEL_SRC_AUTO|RRDLABEL_SRC_ACLK);
@@ -1324,5 +1324,5 @@ void aclk_queue_node_info(RRDHOST *host, bool immediate)
 {
     struct aclk_sync_host_config *wc = (struct aclk_sync_host_config *) host->aclk_sync_host_config;
     if (likely(wc))
-        wc->node_info_send_time = (host == rrdb.localhost || immediate) ? 1 : now_realtime_sec();
+        wc->node_info_send_time = (host == localhost || immediate) ? 1 : now_realtime_sec();
 }

aclk/aclk_capas.c

@@ -21,19 +21,19 @@ const struct capability *aclk_get_agent_capas()
         { .name = NULL,          .version = 0, .enabled = 0 }
     };
     agent_capabilities[2].version = ml_capable() ? 1 : 0;
-    agent_capabilities[2].enabled = ml_enabled(rrdb.localhost);
+    agent_capabilities[2].enabled = ml_enabled(localhost);
 
     agent_capabilities[3].version = enable_metric_correlations ? metric_correlations_version : 0;
     agent_capabilities[3].enabled = enable_metric_correlations;
 
-    agent_capabilities[7].enabled = rrdb.localhost->health.health_enabled;
+    agent_capabilities[7].enabled = localhost->health.health_enabled;
 
     return agent_capabilities;
 }
 
 struct capability *aclk_get_node_instance_capas(RRDHOST *host)
 {
-    bool functions = (host == rrdb.localhost || (host->receiver && stream_has_capability(host->receiver, STREAM_CAP_FUNCTIONS)));
+    bool functions = (host == localhost || (host->receiver && stream_has_capability(host->receiver, STREAM_CAP_FUNCTIONS)));
 
     struct capability ni_caps[] = {
         { .name = "proto",       .version = 1,                     .enabled = 1 },

aclk/aclk_proxy.c

@@ -1,5 +1,3 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 #include "aclk_proxy.h"
 
 #include "daemon/common.h"

aclk/aclk_proxy.h

@@ -1,5 +1,3 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 #ifndef ACLK_PROXY_H
 #define ACLK_PROXY_H
 

aclk/aclk_query.c

@@ -128,7 +128,7 @@ static int http_api_v2(struct aclk_query_thread *query_thr, aclk_query_t query)
         ACLK_STATS_UNLOCK;
     }
 
-    w->response.code = (short)web_client_api_request_with_node_selection(rrdb.localhost, w, path);
+    w->response.code = (short)web_client_api_request_with_node_selection(localhost, w, path);
     web_client_timeout_checkpoint_response_ready(w, &t);
 
     if(buffer_strlen(w->response.data) > ACLK_MAX_WEB_RESPONSE_SIZE) {

aclk/aclk_rrdhost_state.h

@@ -1,5 +1,3 @@
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 #ifndef ACLK_RRDHOST_STATE_H
 #define ACLK_RRDHOST_STATE_H
 

aclk/aclk_rx_msgs.c

@@ -279,7 +279,7 @@ int create_node_instance_result(const char *msg, size_t msg_len)
 
     RRDHOST *host = rrdhost_find_by_guid(res.machine_guid);
     if (likely(host)) {
-        if (host == rrdb.localhost) {
+        if (host == localhost) {
             node_state_update.live = 1;
             node_state_update.hops = 0;
         } else {
@@ -289,10 +289,10 @@ int create_node_instance_result(const char *msg, size_t msg_len)
         node_state_update.capabilities = aclk_get_node_instance_capas(host);
     }
 
-    rrdhost_aclk_state_lock(rrdb.localhost);
-    node_state_update.claim_id = rrdb.localhost->aclk_state.claimed_id;
+    rrdhost_aclk_state_lock(localhost);
+    node_state_update.claim_id = localhost->aclk_state.claimed_id;
     query->data.bin_payload.payload = generate_node_instance_connection(&query->data.bin_payload.size, &node_state_update);
-    rrdhost_aclk_state_unlock(rrdb.localhost);
+    rrdhost_aclk_state_unlock(localhost);
 
     freez((void *)node_state_update.capabilities);
 

aclk/aclk_stats.c

@@ -38,7 +38,7 @@ static void aclk_stats_collect(struct aclk_metrics_per_sample *per_sample, struc
     if (unlikely(!st_aclkstats)) {
         st_aclkstats = rrdset_create_localhost(
             "netdata", "aclk_status", NULL, "aclk", NULL, "ACLK/Cloud connection status",
-            "connected", "netdata", "stats", 200000, rrdb.localhost->update_every, RRDSET_TYPE_LINE);
+            "connected", "netdata", "stats", 200000, localhost->rrd_update_every, RRDSET_TYPE_LINE);
 
         rd_online_status = rrddim_add(st_aclkstats, "online", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
     }
@@ -57,10 +57,10 @@ static void aclk_stats_query_queue(struct aclk_metrics_per_sample *per_sample)
     if (unlikely(!st_query_thread)) {
         st_query_thread = rrdset_create_localhost(
             "netdata", "aclk_query_per_second", NULL, "aclk", NULL, "ACLK Queries per second", "queries/s",
-            "netdata", "stats", 200001, rrdb.localhost->update_every, RRDSET_TYPE_AREA);
+            "netdata", "stats", 200001, localhost->rrd_update_every, RRDSET_TYPE_AREA);
 
-        rd_queued = rrddim_add(st_query_thread, "added", NULL, 1, rrdb.localhost->update_every, RRD_ALGORITHM_ABSOLUTE);
-        rd_dispatched = rrddim_add(st_query_thread, "dispatched", NULL, -1, rrdb.localhost->update_every, RRD_ALGORITHM_ABSOLUTE);
+        rd_queued = rrddim_add(st_query_thread, "added", NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
+        rd_dispatched = rrddim_add(st_query_thread, "dispatched", NULL, -1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
     }
 
     rrddim_set_by_pointer(st_query_thread, rd_queued, per_sample->queries_queued);
@@ -79,7 +79,7 @@ static void aclk_stats_latency(struct aclk_metrics_per_sample *per_sample)
     if (unlikely(!st)) {
         st = rrdset_create_localhost(
             "netdata", "aclk_latency_mqtt", NULL, "aclk", NULL, "ACLK Message Publish Latency", "ms",
-            "netdata", "stats", 200002, rrdb.localhost->update_every, RRDSET_TYPE_LINE);
+            "netdata", "stats", 200002, localhost->rrd_update_every, RRDSET_TYPE_LINE);
 
         rd_avg = rrddim_add(st, "avg", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
         rd_max = rrddim_add(st, "max", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -105,10 +105,10 @@ static void aclk_stats_cloud_req(struct aclk_metrics_per_sample *per_sample)
     if (unlikely(!st)) {
         st = rrdset_create_localhost(
             "netdata", "aclk_cloud_req", NULL, "aclk", NULL, "Requests received from cloud", "req/s",
-            "netdata", "stats", 200005, rrdb.localhost->update_every, RRDSET_TYPE_STACKED);
+            "netdata", "stats", 200005, localhost->rrd_update_every, RRDSET_TYPE_STACKED);
 
-        rd_rq_rcvd = rrddim_add(st, "received", NULL, 1, rrdb.localhost->update_every, RRD_ALGORITHM_ABSOLUTE);
-        rd_rq_err = rrddim_add(st, "malformed", NULL, 1, rrdb.localhost->update_every, RRD_ALGORITHM_ABSOLUTE);
+        rd_rq_rcvd = rrddim_add(st, "received", NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
+        rd_rq_err = rrddim_add(st, "malformed", NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
     }
 
     rrddim_set_by_pointer(st, rd_rq_rcvd, per_sample->cloud_req_recvd - per_sample->cloud_req_err);
@@ -125,10 +125,10 @@ static void aclk_stats_cloud_req_type(struct aclk_metrics_per_sample *per_sample
     if (unlikely(!st)) {
         st = rrdset_create_localhost(
             "netdata", "aclk_processed_query_type", NULL, "aclk", NULL, "Query thread commands processed by their type", "cmd/s",
-            "netdata", "stats", 200006, rrdb.localhost->update_every, RRDSET_TYPE_STACKED);
+            "netdata", "stats", 200006, localhost->rrd_update_every, RRDSET_TYPE_STACKED);
 
         for (int i = 0; i < ACLK_QUERY_TYPE_COUNT; i++)
-            dims[i] = rrddim_add(st, aclk_query_get_name(i, 1), NULL, 1, rrdb.localhost->update_every, RRD_ALGORITHM_ABSOLUTE);
+            dims[i] = rrddim_add(st, aclk_query_get_name(i, 1), NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
 
     }
 
@@ -167,10 +167,10 @@ static void aclk_stats_cloud_req_http_type(struct aclk_metrics_per_sample *per_s
     if (unlikely(!st)) {
         st = rrdset_create_localhost(
             "netdata", "aclk_cloud_req_http_type", NULL, "aclk", NULL, "Requests received from cloud via HTTP by their type", "req/s",
-            "netdata", "stats", 200007, rrdb.localhost->update_every, RRDSET_TYPE_STACKED);
+            "netdata", "stats", 200007, localhost->rrd_update_every, RRDSET_TYPE_STACKED);
 
         for (int i = 0; i < ACLK_STATS_CLOUD_HTTP_REQ_TYPE_CNT; i++)
-            rd_rq_types[i] = rrddim_add(st, cloud_req_http_type_names[i], NULL, 1, rrdb.localhost->update_every, RRD_ALGORITHM_ABSOLUTE);
+            rd_rq_types[i] = rrddim_add(st, cloud_req_http_type_names[i], NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
     }
 
     for (int i = 0; i < ACLK_STATS_CLOUD_HTTP_REQ_TYPE_CNT; i++)
@@ -189,12 +189,12 @@ static void aclk_stats_query_threads(uint32_t *queries_per_thread)
     if (unlikely(!st)) {
         st = rrdset_create_localhost(
             "netdata", "aclk_query_threads", NULL, "aclk", NULL, "Queries Processed Per Thread", "req/s",
-            "netdata", "stats", 200009, rrdb.localhost->update_every, RRDSET_TYPE_STACKED);
+            "netdata", "stats", 200009, localhost->rrd_update_every, RRDSET_TYPE_STACKED);
 
         for (int i = 0; i < aclk_stats_cfg.query_thread_count; i++) {
             if (snprintfz(dim_name, MAX_DIM_NAME, "Query %d", i) < 0)
                 netdata_log_error("snprintf encoding error");
-            aclk_qt_data[i].dim = rrddim_add(st, dim_name, NULL, 1, rrdb.localhost->update_every, RRD_ALGORITHM_ABSOLUTE);
+            aclk_qt_data[i].dim = rrddim_add(st, dim_name, NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
         }
     }
 
@@ -215,11 +215,11 @@ static void aclk_stats_query_time(struct aclk_metrics_per_sample *per_sample)
     if (unlikely(!st)) {
         st = rrdset_create_localhost(
             "netdata", "aclk_query_time", NULL, "aclk", NULL, "Time it took to process cloud requested DB queries", "us",
-            "netdata", "stats", 200008, rrdb.localhost->update_every, RRDSET_TYPE_LINE);
+            "netdata", "stats", 200008, localhost->rrd_update_every, RRDSET_TYPE_LINE);
 
-        rd_rq_avg = rrddim_add(st, "avg", NULL, 1, rrdb.localhost->update_every, RRD_ALGORITHM_ABSOLUTE);
-        rd_rq_max = rrddim_add(st, "max", NULL, 1, rrdb.localhost->update_every, RRD_ALGORITHM_ABSOLUTE);
-        rd_rq_total = rrddim_add(st, "total", NULL, 1, rrdb.localhost->update_every, RRD_ALGORITHM_ABSOLUTE);
+        rd_rq_avg = rrddim_add(st, "avg", NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
+        rd_rq_max = rrddim_add(st, "max", NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
+        rd_rq_total = rrddim_add(st, "total", NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
     }
 
     if(per_sample->cloud_q_process_count)
@@ -240,10 +240,10 @@ static void aclk_stats_newproto_rx(uint32_t *rx_msgs_sample)
     if (unlikely(!st)) {
         st = rrdset_create_localhost(
             "netdata", "aclk_protobuf_rx_types", NULL, "aclk", NULL, "Received new cloud architecture messages by their type.", "msg/s",
-            "netdata", "stats", 200010, rrdb.localhost->update_every, RRDSET_TYPE_STACKED);
+            "netdata", "stats", 200010, localhost->rrd_update_every, RRDSET_TYPE_STACKED);
 
         for (unsigned int i = 0; i < aclk_stats_cfg.proto_hdl_cnt; i++) {
-            aclk_stats_cfg.rx_msg_dims[i] = rrddim_add(st, rx_handler_get_name(i), NULL, 1, rrdb.localhost->update_every, RRD_ALGORITHM_ABSOLUTE);
+            aclk_stats_cfg.rx_msg_dims[i] = rrddim_add(st, rx_handler_get_name(i), NULL, 1, localhost->rrd_update_every, RRD_ALGORITHM_ABSOLUTE);
         }
     }
 
@@ -284,7 +284,7 @@ static void aclk_stats_mqtt_wss(struct mqtt_wss_stats *stats)
     if (unlikely(!st)) {
         st = rrdset_create_localhost(
             "netdata", "aclk_openssl_bytes", NULL, "aclk", NULL, "Received and Sent bytes.", "B/s",
-            "netdata", "stats", 200011, rrdb.localhost->update_every, RRDSET_TYPE_STACKED);
+            "netdata", "stats", 200011, localhost->rrd_update_every, RRDSET_TYPE_STACKED);
 
         rd_sent  = rrddim_add(st, "sent", NULL, -1, 1, RRD_ALGORITHM_INCREMENTAL);
         rd_recvd = rrddim_add(st, "received", NULL, 1, 1, RRD_ALGORITHM_INCREMENTAL);
@@ -293,7 +293,7 @@ static void aclk_stats_mqtt_wss(struct mqtt_wss_stats *stats)
     if (unlikely(!st_txbuf_perc)) {
         st_txbuf_perc = rrdset_create_localhost(
             "netdata", "aclk_mqtt_tx_perc", NULL, "aclk", NULL, "Actively used percentage of MQTT Tx Buffer,", "%",
-            "netdata", "stats", 200012, rrdb.localhost->update_every, RRDSET_TYPE_LINE);
+            "netdata", "stats", 200012, localhost->rrd_update_every, RRDSET_TYPE_LINE);
         
         rd_txbuf_perc = rrddim_add(st_txbuf_perc, "used", NULL, 1, 100, RRD_ALGORITHM_ABSOLUTE);
     }
@@ -301,7 +301,7 @@ static void aclk_stats_mqtt_wss(struct mqtt_wss_stats *stats)
     if (unlikely(!st_txbuf)) {
         st_txbuf = rrdset_create_localhost(
             "netdata", "aclk_mqtt_tx_queue", NULL, "aclk", NULL, "State of transmit MQTT queue.", "B",
-            "netdata", "stats", 200013, rrdb.localhost->update_every, RRDSET_TYPE_LINE);
+            "netdata", "stats", 200013, localhost->rrd_update_every, RRDSET_TYPE_LINE);
 
         rd_tx_buffer_usable = rrddim_add(st_txbuf, "usable", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
         rd_tx_buffer_reclaimable = rrddim_add(st_txbuf, "reclaimable", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -313,7 +313,7 @@ static void aclk_stats_mqtt_wss(struct mqtt_wss_stats *stats)
     if (unlikely(!st_timing)) {
         st_timing = rrdset_create_localhost(
             "netdata", "aclk_mqtt_wss_time", NULL, "aclk", NULL, "Time spent handling MQTT, WSS, SSL and network communication.", "us",
-            "netdata", "stats", 200014, rrdb.localhost->update_every, RRDSET_TYPE_STACKED);
+            "netdata", "stats", 200014, localhost->rrd_update_every, RRDSET_TYPE_STACKED);
 
         rd_keepalive = rrddim_add(st_timing, "keep-alive", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
         rd_read_socket = rrddim_add(st_timing, "socket_read_ssl", NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
@@ -379,7 +379,7 @@ void *aclk_stats_main_thread(void *ptr)
 
     heartbeat_t hb;
     heartbeat_init(&hb);
-    usec_t step_ut = rrdb.localhost->update_every * USEC_PER_SEC;
+    usec_t step_ut = localhost->rrd_update_every * USEC_PER_SEC;
 
     struct aclk_metrics_per_sample per_sample;
     struct aclk_metrics permanent;