summaryrefslogtreecommitdiffstats
path: root/database/ram
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-08-12 07:26:17 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-08-12 07:26:17 +0000
commit7877a98bd9c00db5e81dd2f8c734cba2bab20be7 (patch)
treed18b767250f7c7ced9b8abe2ece784ac1fe24d3e /database/ram
parentReleasing debian version 1.35.1-2. (diff)
downloadnetdata-7877a98bd9c00db5e81dd2f8c734cba2bab20be7.tar.xz
netdata-7877a98bd9c00db5e81dd2f8c734cba2bab20be7.zip
Merging upstream version 1.36.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'database/ram')
-rw-r--r--database/ram/Makefile.am11
-rw-r--r--database/ram/README.md7
-rw-r--r--database/ram/rrddim_mem.c205
-rw-r--r--database/ram/rrddim_mem.h34
4 files changed, 222 insertions, 35 deletions
diff --git a/database/ram/Makefile.am b/database/ram/Makefile.am
new file mode 100644
index 000000000..59250a997
--- /dev/null
+++ b/database/ram/Makefile.am
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+AUTOMAKE_OPTIONS = subdir-objects
+MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
+
+SUBDIRS = \
+ $(NULL)
+
+dist_noinst_DATA = \
+ README.md \
+ $(NULL)
diff --git a/database/ram/README.md b/database/ram/README.md
new file mode 100644
index 000000000..73562f0ff
--- /dev/null
+++ b/database/ram/README.md
@@ -0,0 +1,7 @@
+<!--
+title: "RAM database modes"
+description: "Netdata's RAM database modes."
+custom_edit_url: https://github.com/netdata/netdata/edit/master/database/ram/README.md
+-->
+
+# RAM modes \ No newline at end of file
diff --git a/database/ram/rrddim_mem.c b/database/ram/rrddim_mem.c
index b17f03ca5..3226d3c0d 100644
--- a/database/ram/rrddim_mem.c
+++ b/database/ram/rrddim_mem.c
@@ -5,63 +5,218 @@
// ----------------------------------------------------------------------------
// RRDDIM legacy data collection functions
-void rrddim_collect_init(RRDDIM *rd) {
- rd->values[rd->rrdset->current_entry] = SN_EMPTY_SLOT;
- rd->state->handle = calloc(1, sizeof(struct mem_collect_handle));
+STORAGE_METRIC_HANDLE *rrddim_metric_init(RRDDIM *rd, STORAGE_INSTANCE *db_instance __maybe_unused) {
+ return (STORAGE_METRIC_HANDLE *)rd;
}
-void rrddim_collect_store_metric(RRDDIM *rd, usec_t point_in_time, storage_number number) {
- (void)point_in_time;
- rd->values[rd->rrdset->current_entry] = number;
+
+void rrddim_metric_free(STORAGE_METRIC_HANDLE *db_metric_handle __maybe_unused) {
+ ;
+}
+
+STORAGE_COLLECT_HANDLE *rrddim_collect_init(STORAGE_METRIC_HANDLE *db_metric_handle) {
+ RRDDIM *rd = (RRDDIM *)db_metric_handle;
+ rd->db[rd->rrdset->current_entry] = pack_storage_number(NAN, SN_FLAG_NONE);
+ struct mem_collect_handle *ch = calloc(1, sizeof(struct mem_collect_handle));
+ ch->rd = rd;
+ return (STORAGE_COLLECT_HANDLE *)ch;
+}
+
+void rrddim_collect_store_metric(STORAGE_COLLECT_HANDLE *collection_handle, usec_t point_in_time, NETDATA_DOUBLE number,
+ NETDATA_DOUBLE min_value,
+ NETDATA_DOUBLE max_value,
+ uint16_t count,
+ uint16_t anomaly_count,
+ SN_FLAGS flags)
+{
+ UNUSED(point_in_time);
+ UNUSED(min_value);
+ UNUSED(max_value);
+ UNUSED(count);
+ UNUSED(anomaly_count);
+
+ struct mem_collect_handle *ch = (struct mem_collect_handle *)collection_handle;
+ RRDDIM *rd = ch->rd;
+ rd->db[rd->rrdset->current_entry] = pack_storage_number(number, flags);
+}
+
+void rrddim_store_metric_flush(STORAGE_COLLECT_HANDLE *collection_handle) {
+ struct mem_collect_handle *ch = (struct mem_collect_handle *)collection_handle;
+ RRDDIM *rd = ch->rd;
+ memset(rd->db, 0, rd->entries * sizeof(storage_number));
}
-int rrddim_collect_finalize(RRDDIM *rd) {
- free((struct mem_collect_handle*)rd->state->handle);
+
+int rrddim_collect_finalize(STORAGE_COLLECT_HANDLE *collection_handle) {
+ free(collection_handle);
return 0;
}
// ----------------------------------------------------------------------------
+
+// get the total duration in seconds of the round robin database
+#define rrddim_duration(st) (( (time_t)(rd)->rrdset->counter >= (time_t)(rd)->rrdset->entries ? (time_t)(rd)->rrdset->entries : (time_t)(rd)->rrdset->counter ) * (time_t)(rd)->rrdset->update_every)
+
+// get the last slot updated in the round robin database
+#define rrddim_last_slot(rd) ((size_t)(((rd)->rrdset->current_entry == 0) ? (rd)->rrdset->entries - 1 : (rd)->rrdset->current_entry - 1))
+
+// return the slot that has the oldest value
+#define rrddim_first_slot(rd) ((size_t)((rd)->rrdset->counter >= (size_t)(rd)->rrdset->entries ? (rd)->rrdset->current_entry : 0))
+
+// get the slot of the round robin database, for the given timestamp (t)
+// it always returns a valid slot, although may not be for the time requested if the time is outside the round robin database
+// only valid when not using dbengine
+static inline size_t rrddim_time2slot(RRDDIM *rd, time_t t) {
+ size_t ret = 0;
+ time_t last_entry_t = rrddim_query_latest_time((STORAGE_METRIC_HANDLE *)rd);
+ time_t first_entry_t = rrddim_query_oldest_time((STORAGE_METRIC_HANDLE *)rd);
+ size_t entries = rd->rrdset->entries;
+ size_t first_slot = rrddim_first_slot(rd);
+ size_t last_slot = rrddim_last_slot(rd);
+ size_t update_every = rd->rrdset->update_every;
+
+ if(t >= last_entry_t) {
+ // the requested time is after the last entry we have
+ ret = last_slot;
+ }
+ else {
+ if(t <= first_entry_t) {
+ // the requested time is before the first entry we have
+ ret = first_slot;
+ }
+ else {
+ if(last_slot >= (size_t)((last_entry_t - t) / update_every))
+ ret = last_slot - ((last_entry_t - t) / update_every);
+ else
+ ret = last_slot - ((last_entry_t - t) / update_every) + entries;
+ }
+ }
+
+ if(unlikely(ret >= entries)) {
+ error("INTERNAL ERROR: rrddim_time2slot() on %s returns values outside entries", rd->name);
+ ret = entries - 1;
+ }
+
+ return ret;
+}
+
+// get the timestamp of a specific slot in the round robin database
+// only valid when not using dbengine
+static inline time_t rrddim_slot2time(RRDDIM *rd, size_t slot) {
+ time_t ret;
+ time_t last_entry_t = rrddim_query_latest_time((STORAGE_METRIC_HANDLE *)rd);
+ time_t first_entry_t = rrddim_query_oldest_time((STORAGE_METRIC_HANDLE *)rd);
+ size_t entries = rd->rrdset->entries;
+ size_t last_slot = rrddim_last_slot(rd);
+ size_t update_every = rd->rrdset->update_every;
+
+ if(slot >= entries) {
+ error("INTERNAL ERROR: caller of rrddim_slot2time() gives invalid slot %zu", slot);
+ slot = entries - 1;
+ }
+
+ if(slot > last_slot)
+ ret = last_entry_t - (time_t)(update_every * (last_slot - slot + entries));
+ else
+ ret = last_entry_t - (time_t)(update_every * (last_slot - slot));
+
+ if(unlikely(ret < first_entry_t)) {
+ error("INTERNAL ERROR: rrddim_slot2time() on %s returns time too far in the past", rd->name);
+ ret = first_entry_t;
+ }
+
+ if(unlikely(ret > last_entry_t)) {
+ error("INTERNAL ERROR: rrddim_slot2time() on %s returns time into the future", rd->name);
+ ret = last_entry_t;
+ }
+
+ return ret;
+}
+
+// ----------------------------------------------------------------------------
// RRDDIM legacy database query functions
-void rrddim_query_init(RRDDIM *rd, struct rrddim_query_handle *handle, time_t start_time, time_t end_time) {
+void rrddim_query_init(STORAGE_METRIC_HANDLE *db_metric_handle, struct rrddim_query_handle *handle, time_t start_time, time_t end_time, TIER_QUERY_FETCH tier_query_fetch_type) {
+ UNUSED(tier_query_fetch_type);
+
+ RRDDIM *rd = (RRDDIM *)db_metric_handle;
+
handle->rd = rd;
handle->start_time = start_time;
handle->end_time = end_time;
struct mem_query_handle* h = calloc(1, sizeof(struct mem_query_handle));
- h->slot = rrdset_time2slot(rd->rrdset, start_time);
- h->last_slot = rrdset_time2slot(rd->rrdset, end_time);
- h->finished = 0;
+ h->slot = rrddim_time2slot(rd, start_time);
+ h->last_slot = rrddim_time2slot(rd, end_time);
+ h->dt = rd->rrdset->update_every;
+
+ h->next_timestamp = start_time;
+ h->slot_timestamp = rrddim_slot2time(rd, h->slot);
+ h->last_timestamp = rrddim_slot2time(rd, h->last_slot);
+
+ // info("RRDDIM QUERY INIT: start %ld, end %ld, next %ld, first %ld, last %ld, dt %ld", start_time, end_time, h->next_timestamp, h->slot_timestamp, h->last_timestamp, h->dt);
+
handle->handle = (STORAGE_QUERY_HANDLE *)h;
}
-storage_number rrddim_query_next_metric(struct rrddim_query_handle *handle, time_t *current_time) {
+// Returns the metric and sets its timestamp into current_time
+// IT IS REQUIRED TO **ALWAYS** SET ALL RETURN VALUES (current_time, end_time, flags)
+// IT IS REQUIRED TO **ALWAYS** KEEP TRACK OF TIME, EVEN OUTSIDE THE DATABASE BOUNDARIES
+STORAGE_POINT rrddim_query_next_metric(struct rrddim_query_handle *handle) {
RRDDIM *rd = handle->rd;
struct mem_query_handle* h = (struct mem_query_handle*)handle->handle;
- long entries = rd->rrdset->entries;
- long slot = h->slot;
+ size_t entries = rd->rrdset->entries;
+ size_t slot = h->slot;
+
+ STORAGE_POINT sp;
+ sp.count = 1;
+
+ time_t this_timestamp = h->next_timestamp;
+ h->next_timestamp += h->dt;
- (void)current_time;
- if (unlikely(h->slot == h->last_slot))
- h->finished = 1;
- storage_number n = rd->values[slot++];
+ // set this timestamp for our caller
+ sp.start_time = this_timestamp - h->dt;
+ sp.end_time = this_timestamp;
+ if(unlikely(this_timestamp < h->slot_timestamp)) {
+ storage_point_empty(sp, sp.start_time, sp.end_time);
+ return sp;
+ }
+
+ if(unlikely(this_timestamp > h->last_timestamp)) {
+ storage_point_empty(sp, sp.start_time, sp.end_time);
+ return sp;
+ }
+
+ storage_number n = rd->db[slot++];
if(unlikely(slot >= entries)) slot = 0;
+
h->slot = slot;
+ h->slot_timestamp += h->dt;
+
+ sp.anomaly_count = is_storage_number_anomalous(n) ? 1 : 0;
+ sp.flags = (n & SN_USER_FLAGS);
+ sp.min = sp.max = sp.sum = unpack_storage_number(n);
- return n;
+ return sp;
}
int rrddim_query_is_finished(struct rrddim_query_handle *handle) {
struct mem_query_handle* h = (struct mem_query_handle*)handle->handle;
- return h->finished;
+ return (h->next_timestamp > handle->end_time);
}
void rrddim_query_finalize(struct rrddim_query_handle *handle) {
+#ifdef NETDATA_INTERNAL_CHECKS
+ if(!rrddim_query_is_finished(handle))
+ error("QUERY: query for chart '%s' dimension '%s' has been stopped unfinished", handle->rd->rrdset->id, handle->rd->name);
+#endif
freez(handle->handle);
}
-time_t rrddim_query_latest_time(RRDDIM *rd) {
- return rrdset_last_entry_t_nolock(rd->rrdset);
+time_t rrddim_query_latest_time(STORAGE_METRIC_HANDLE *db_metric_handle) {
+ RRDDIM *rd = (RRDDIM *)db_metric_handle;
+ return rd->rrdset->last_updated.tv_sec;
}
-time_t rrddim_query_oldest_time(RRDDIM *rd) {
- return rrdset_first_entry_t_nolock(rd->rrdset);
+time_t rrddim_query_oldest_time(STORAGE_METRIC_HANDLE *db_metric_handle) {
+ RRDDIM *rd = (RRDDIM *)db_metric_handle;
+ return (time_t)(rd->rrdset->last_updated.tv_sec - rrddim_duration(rd));
}
diff --git a/database/ram/rrddim_mem.h b/database/ram/rrddim_mem.h
index 9a215387a..400bdd0c2 100644
--- a/database/ram/rrddim_mem.h
+++ b/database/ram/rrddim_mem.h
@@ -6,24 +6,38 @@
#include "database/rrd.h"
struct mem_collect_handle {
+ RRDDIM *rd;
long slot;
long entries;
};
+
struct mem_query_handle {
- long slot;
- long last_slot;
- uint8_t finished;
+ time_t dt;
+ time_t next_timestamp;
+ time_t last_timestamp;
+ time_t slot_timestamp;
+ size_t slot;
+ size_t last_slot;
};
-extern void rrddim_collect_init(RRDDIM *rd);
-extern void rrddim_collect_store_metric(RRDDIM *rd, usec_t point_in_time, storage_number number);
-extern int rrddim_collect_finalize(RRDDIM *rd);
+extern STORAGE_METRIC_HANDLE *rrddim_metric_init(RRDDIM *rd, STORAGE_INSTANCE *db_instance);
+extern void rrddim_metric_free(STORAGE_METRIC_HANDLE *db_metric_handle);
+
+extern STORAGE_COLLECT_HANDLE *rrddim_collect_init(STORAGE_METRIC_HANDLE *db_metric_handle);
+extern void rrddim_collect_store_metric(STORAGE_COLLECT_HANDLE *collection_handle, usec_t point_in_time, NETDATA_DOUBLE number,
+ NETDATA_DOUBLE min_value,
+ NETDATA_DOUBLE max_value,
+ uint16_t count,
+ uint16_t anomaly_count,
+ SN_FLAGS flags);
+extern void rrddim_store_metric_flush(STORAGE_COLLECT_HANDLE *collection_handle);
+extern int rrddim_collect_finalize(STORAGE_COLLECT_HANDLE *collection_handle);
-extern void rrddim_query_init(RRDDIM *rd, struct rrddim_query_handle *handle, time_t start_time, time_t end_time);
-extern storage_number rrddim_query_next_metric(struct rrddim_query_handle *handle, time_t *current_time);
+extern void rrddim_query_init(STORAGE_METRIC_HANDLE *db_metric_handle, struct rrddim_query_handle *handle, time_t start_time, time_t end_time, TIER_QUERY_FETCH tier_query_fetch_type);
+extern STORAGE_POINT rrddim_query_next_metric(struct rrddim_query_handle *handle);
extern int rrddim_query_is_finished(struct rrddim_query_handle *handle);
extern void rrddim_query_finalize(struct rrddim_query_handle *handle);
-extern time_t rrddim_query_latest_time(RRDDIM *rd);
-extern time_t rrddim_query_oldest_time(RRDDIM *rd);
+extern time_t rrddim_query_latest_time(STORAGE_METRIC_HANDLE *db_metric_handle);
+extern time_t rrddim_query_oldest_time(STORAGE_METRIC_HANDLE *db_metric_handle);
#endif