mirror of
https://github.com/netdata/netdata.git
synced 2025-04-10 16:17:36 +00:00
reworked pluginsd caching of RDAs to avoid crashes (#15845)
This commit is contained in:
Costa Tsaousis
GitHub
parent
41bd902426
commit
980a605363
2 changed files with 129 additions and 72 deletions
|
|
@ -68,7 +68,7 @@ static ssize_t send_to_plugin(const char *txt, void *data) {
|
|||
return -4;
|
||||
}
|
||||
|
||||
static inline RRDHOST *pluginsd_require_host_from_parent(PARSER *parser, const char *cmd) {
|
||||
static inline RRDHOST *pluginsd_require_scope_host(PARSER *parser, const char *cmd) {
|
||||
RRDHOST *host = parser->user.host;
|
||||
|
||||
if(unlikely(!host))
|
||||
|
|
@ -77,7 +77,7 @@ static inline RRDHOST *pluginsd_require_host_from_parent(PARSER *parser, const c
|
|||
return host;
|
||||
}
|
||||
|
||||
static inline RRDSET *pluginsd_require_chart_from_parent(PARSER *parser, const char *cmd, const char *parent_cmd) {
|
||||
static inline RRDSET *pluginsd_require_scope_chart(PARSER *parser, const char *cmd, const char *parent_cmd) {
|
||||
RRDSET *st = parser->user.st;
|
||||
|
||||
if(unlikely(!st))
|
||||
|
|
@ -86,7 +86,7 @@ static inline RRDSET *pluginsd_require_chart_from_parent(PARSER *parser, const c
|
|||
return st;
|
||||
}
|
||||
|
||||
static inline RRDSET *pluginsd_get_chart_from_parent(PARSER *parser) {
|
||||
static inline RRDSET *pluginsd_get_scope_chart(PARSER *parser) {
|
||||
return parser->user.st;
|
||||
}
|
||||
|
||||
|
|
@ -108,20 +108,23 @@ static inline bool pluginsd_unlock_rrdset_data_collection(PARSER *parser) {
|
|||
}
|
||||
|
||||
void pluginsd_rrdset_cleanup(RRDSET *st) {
|
||||
for(size_t i = 0; i < st->pluginsd.used ; i++) {
|
||||
if (st->pluginsd.rda[i]) {
|
||||
rrddim_acquired_release(st->pluginsd.rda[i]);
|
||||
st->pluginsd.rda[i] = NULL;
|
||||
}
|
||||
spinlock_lock(&st->pluginsd.spinlock);
|
||||
|
||||
for(size_t i = 0; i < st->pluginsd.size ; i++) {
|
||||
rrddim_acquired_release(st->pluginsd.rda[i]); // can be NULL
|
||||
st->pluginsd.rda[i] = NULL;
|
||||
}
|
||||
|
||||
freez(st->pluginsd.rda);
|
||||
st->pluginsd.collector_tid = 0;
|
||||
st->pluginsd.rda = NULL;
|
||||
st->pluginsd.size = 0;
|
||||
st->pluginsd.used = 0;
|
||||
st->pluginsd.pos = 0;
|
||||
|
||||
spinlock_unlock(&st->pluginsd.spinlock);
|
||||
}
|
||||
|
||||
static inline void pluginsd_unlock_previous_chart(PARSER *parser, const char *keyword, bool stale) {
|
||||
static inline void pluginsd_unlock_previous_scope_chart(PARSER *parser, const char *keyword, bool stale) {
|
||||
if(unlikely(pluginsd_unlock_rrdset_data_collection(parser))) {
|
||||
if(stale)
|
||||
netdata_log_error("PLUGINSD: 'host:%s/chart:%s/' stale data collection lock found during %s; it has been unlocked",
|
||||
|
|
@ -142,23 +145,49 @@ static inline void pluginsd_unlock_previous_chart(PARSER *parser, const char *ke
|
|||
}
|
||||
}
|
||||
|
||||
static inline void pluginsd_set_chart_from_parent(PARSER *parser, RRDSET *st, const char *keyword) {
|
||||
pluginsd_unlock_previous_chart(parser, keyword, true);
|
||||
static inline void pluginsd_clear_scope_chart(PARSER *parser, const char *keyword) {
|
||||
pluginsd_unlock_previous_scope_chart(parser, keyword, true);
|
||||
parser->user.st = NULL;
|
||||
}
|
||||
|
||||
if(st) {
|
||||
size_t dims = dictionary_entries(st->rrddim_root_index);
|
||||
if(unlikely(st->pluginsd.size < dims)) {
|
||||
st->pluginsd.rda = reallocz(st->pluginsd.rda, dims * sizeof(RRDDIM_ACQUIRED *));
|
||||
st->pluginsd.size = dims;
|
||||
static inline bool pluginsd_set_scope_chart(PARSER *parser, RRDSET *st, const char *keyword) {
|
||||
RRDSET *old_st = parser->user.st;
|
||||
pid_t old_collector_tid = (old_st) ? old_st->pluginsd.collector_tid : 0;
|
||||
pid_t my_collector_tid = gettid();
|
||||
|
||||
if(unlikely(old_collector_tid)) {
|
||||
if(old_collector_tid != my_collector_tid) {
|
||||
error_limit_static_global_var(erl, 1, 0);
|
||||
error_limit(&erl, "PLUGINSD: keyword %s: 'host:%s/chart:%s' is collected twice (my tid %d, other collector tid %d)",
|
||||
keyword ? keyword : "UNKNOWN",
|
||||
rrdhost_hostname(st->rrdhost), rrdset_id(st),
|
||||
my_collector_tid, old_collector_tid);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
if(st->pluginsd.pos > st->pluginsd.used && st->pluginsd.pos <= st->pluginsd.size)
|
||||
st->pluginsd.used = st->pluginsd.pos;
|
||||
|
||||
st->pluginsd.pos = 0;
|
||||
old_st->pluginsd.collector_tid = 0;
|
||||
}
|
||||
|
||||
st->pluginsd.collector_tid = my_collector_tid;
|
||||
|
||||
pluginsd_clear_scope_chart(parser, keyword);
|
||||
|
||||
size_t dims = dictionary_entries(st->rrddim_root_index);
|
||||
if(unlikely(st->pluginsd.size < dims)) {
|
||||
st->pluginsd.rda = reallocz(st->pluginsd.rda, dims * sizeof(RRDDIM_ACQUIRED *));
|
||||
|
||||
// initialize the empty slots
|
||||
for(ssize_t i = (ssize_t)dims - 1; i >= (ssize_t)st->pluginsd.size ;i--)
|
||||
st->pluginsd.rda[i] = NULL;
|
||||
|
||||
st->pluginsd.size = dims;
|
||||
}
|
||||
|
||||
st->pluginsd.pos = 0;
|
||||
parser->user.st = st;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static inline RRDDIM *pluginsd_acquire_dimension(RRDHOST *host, RRDSET *st, const char *dimension, const char *cmd) {
|
||||
|
|
@ -168,16 +197,21 @@ static inline RRDDIM *pluginsd_acquire_dimension(RRDHOST *host, RRDSET *st, cons
|
|||
return NULL;
|
||||
}
|
||||
|
||||
RRDDIM_ACQUIRED *rda;
|
||||
if(unlikely(st->pluginsd.pos >= st->pluginsd.size))
|
||||
st->pluginsd.pos = 0;
|
||||
|
||||
if(likely(st->pluginsd.pos < st->pluginsd.used)) {
|
||||
rda = st->pluginsd.rda[st->pluginsd.pos];
|
||||
RRDDIM_ACQUIRED *rda = st->pluginsd.rda[st->pluginsd.pos];
|
||||
|
||||
if(likely(rda)) {
|
||||
RRDDIM *rd = rrddim_acquired_to_rrddim(rda);
|
||||
if (likely(rd && string_strcmp(rd->id, dimension) == 0)) {
|
||||
// we found a cached RDA
|
||||
st->pluginsd.pos++;
|
||||
return rd;
|
||||
}
|
||||
else {
|
||||
// the collector is sending dimensions in a different order
|
||||
// release the previous one, to reuse this slot
|
||||
rrddim_acquired_release(rda);
|
||||
st->pluginsd.rda[st->pluginsd.pos] = NULL;
|
||||
}
|
||||
|
|
@ -191,8 +225,7 @@ static inline RRDDIM *pluginsd_acquire_dimension(RRDHOST *host, RRDSET *st, cons
|
|||
return NULL;
|
||||
}
|
||||
|
||||
if(likely(st->pluginsd.pos < st->pluginsd.size))
|
||||
st->pluginsd.rda[st->pluginsd.pos++] = rda;
|
||||
st->pluginsd.rda[st->pluginsd.pos++] = rda;
|
||||
|
||||
return rrddim_acquired_to_rrddim(rda);
|
||||
}
|
||||
|
|
@ -227,15 +260,17 @@ static inline PARSER_RC pluginsd_set(char **words, size_t num_words, PARSER *par
|
|||
char *dimension = get_word(words, num_words, 1);
|
||||
char *value = get_word(words, num_words, 2);
|
||||
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_SET);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_SET);
|
||||
if(!host) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
RRDSET *st = pluginsd_require_chart_from_parent(parser, PLUGINSD_KEYWORD_SET, PLUGINSD_KEYWORD_CHART);
|
||||
RRDSET *st = pluginsd_require_scope_chart(parser, PLUGINSD_KEYWORD_SET, PLUGINSD_KEYWORD_CHART);
|
||||
if(!st) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
RRDDIM *rd = pluginsd_acquire_dimension(host, st, dimension, PLUGINSD_KEYWORD_SET);
|
||||
if(!rd) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
st->pluginsd.set = true;
|
||||
|
||||
if (unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
|
||||
netdata_log_debug(D_PLUGINSD, "PLUGINSD: 'host:%s/chart:%s/dim:%s' SET is setting value to '%s'",
|
||||
rrdhost_hostname(host), rrdset_id(st), dimension, value && *value ? value : "UNSET");
|
||||
|
|
@ -250,13 +285,14 @@ static inline PARSER_RC pluginsd_begin(char **words, size_t num_words, PARSER *p
|
|||
char *id = get_word(words, num_words, 1);
|
||||
char *microseconds_txt = get_word(words, num_words, 2);
|
||||
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_BEGIN);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_BEGIN);
|
||||
if(!host) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
RRDSET *st = pluginsd_find_chart(host, id, PLUGINSD_KEYWORD_BEGIN);
|
||||
if(!st) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
pluginsd_set_chart_from_parent(parser, st, PLUGINSD_KEYWORD_BEGIN);
|
||||
if(!pluginsd_set_scope_chart(parser, st, PLUGINSD_KEYWORD_BEGIN))
|
||||
return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
usec_t microseconds = 0;
|
||||
if (microseconds_txt && *microseconds_txt) {
|
||||
|
|
@ -296,16 +332,16 @@ static inline PARSER_RC pluginsd_end(char **words, size_t num_words, PARSER *par
|
|||
UNUSED(words);
|
||||
UNUSED(num_words);
|
||||
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_END);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_END);
|
||||
if(!host) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
RRDSET *st = pluginsd_require_chart_from_parent(parser, PLUGINSD_KEYWORD_END, PLUGINSD_KEYWORD_BEGIN);
|
||||
RRDSET *st = pluginsd_require_scope_chart(parser, PLUGINSD_KEYWORD_END, PLUGINSD_KEYWORD_BEGIN);
|
||||
if(!st) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
if (unlikely(rrdset_flag_check(st, RRDSET_FLAG_DEBUG)))
|
||||
netdata_log_debug(D_PLUGINSD, "requested an END on chart '%s'", rrdset_id(st));
|
||||
|
||||
pluginsd_set_chart_from_parent(parser, NULL, PLUGINSD_KEYWORD_END);
|
||||
pluginsd_clear_scope_chart(parser, PLUGINSD_KEYWORD_END);
|
||||
parser->user.data_collections_count++;
|
||||
|
||||
struct timeval now;
|
||||
|
|
@ -418,7 +454,7 @@ static inline PARSER_RC pluginsd_host_define_end(char **words __maybe_unused, si
|
|||
pluginsd_host_define_cleanup(parser);
|
||||
|
||||
parser->user.host = host;
|
||||
pluginsd_set_chart_from_parent(parser, NULL, PLUGINSD_KEYWORD_HOST_DEFINE_END);
|
||||
pluginsd_clear_scope_chart(parser, PLUGINSD_KEYWORD_HOST_DEFINE_END);
|
||||
|
||||
rrdhost_flag_clear(host, RRDHOST_FLAG_ORPHAN);
|
||||
rrdcontext_host_child_connected(host);
|
||||
|
|
@ -450,7 +486,7 @@ static inline PARSER_RC pluginsd_host(char **words, size_t num_words, PARSER *pa
|
|||
}
|
||||
|
||||
static inline PARSER_RC pluginsd_chart(char **words, size_t num_words, PARSER *parser) {
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_CHART);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_CHART);
|
||||
if(!host) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
char *type = get_word(words, num_words, 1);
|
||||
|
|
@ -554,13 +590,18 @@ static inline PARSER_RC pluginsd_chart(char **words, size_t num_words, PARSER *p
|
|||
rrdset_flag_set(st, RRDSET_FLAG_STORE_FIRST);
|
||||
else
|
||||
rrdset_flag_clear(st, RRDSET_FLAG_STORE_FIRST);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
rrdset_isnot_obsolete(st);
|
||||
rrdset_flag_clear(st, RRDSET_FLAG_DETAIL);
|
||||
rrdset_flag_clear(st, RRDSET_FLAG_STORE_FIRST);
|
||||
}
|
||||
|
||||
if(!pluginsd_set_scope_chart(parser, st, PLUGINSD_KEYWORD_CHART))
|
||||
return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
}
|
||||
pluginsd_set_chart_from_parent(parser, st, PLUGINSD_KEYWORD_CHART);
|
||||
else
|
||||
pluginsd_clear_scope_chart(parser, PLUGINSD_KEYWORD_CHART);
|
||||
|
||||
return PARSER_RC_OK;
|
||||
}
|
||||
|
|
@ -570,10 +611,10 @@ static inline PARSER_RC pluginsd_chart_definition_end(char **words, size_t num_w
|
|||
const char *last_entry_txt = get_word(words, num_words, 2);
|
||||
const char *wall_clock_time_txt = get_word(words, num_words, 3);
|
||||
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_CHART_DEFINITION_END);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_CHART_DEFINITION_END);
|
||||
if(!host) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
RRDSET *st = pluginsd_require_chart_from_parent(parser, PLUGINSD_KEYWORD_CHART_DEFINITION_END, PLUGINSD_KEYWORD_CHART);
|
||||
RRDSET *st = pluginsd_require_scope_chart(parser, PLUGINSD_KEYWORD_CHART_DEFINITION_END, PLUGINSD_KEYWORD_CHART);
|
||||
if(!st) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
time_t first_entry_child = (first_entry_txt && *first_entry_txt) ? (time_t)str2ul(first_entry_txt) : 0;
|
||||
|
|
@ -615,10 +656,10 @@ static inline PARSER_RC pluginsd_dimension(char **words, size_t num_words, PARSE
|
|||
char *divisor_s = get_word(words, num_words, 5);
|
||||
char *options = get_word(words, num_words, 6);
|
||||
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_DIMENSION);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_DIMENSION);
|
||||
if(!host) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
RRDSET *st = pluginsd_require_chart_from_parent(parser, PLUGINSD_KEYWORD_DIMENSION, PLUGINSD_KEYWORD_CHART);
|
||||
RRDSET *st = pluginsd_require_scope_chart(parser, PLUGINSD_KEYWORD_DIMENSION, PLUGINSD_KEYWORD_CHART);
|
||||
if(!st) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
if (unlikely(!id))
|
||||
|
|
@ -860,10 +901,10 @@ static inline PARSER_RC pluginsd_function(char **words, size_t num_words, PARSER
|
|||
char *timeout_s = get_word(words, num_words, i++);
|
||||
char *help = get_word(words, num_words, i++);
|
||||
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_FUNCTION);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_FUNCTION);
|
||||
if(!host) return PARSER_RC_ERROR;
|
||||
|
||||
RRDSET *st = (global)?NULL:pluginsd_require_chart_from_parent(parser, PLUGINSD_KEYWORD_FUNCTION, PLUGINSD_KEYWORD_CHART);
|
||||
RRDSET *st = (global)? NULL: pluginsd_require_scope_chart(parser, PLUGINSD_KEYWORD_FUNCTION, PLUGINSD_KEYWORD_CHART);
|
||||
if(!st) global = true;
|
||||
|
||||
if (unlikely(!timeout_s || !name || !help || (!global && !st))) {
|
||||
|
|
@ -959,10 +1000,10 @@ static inline PARSER_RC pluginsd_variable(char **words, size_t num_words, PARSER
|
|||
char *value = get_word(words, num_words, 2);
|
||||
NETDATA_DOUBLE v;
|
||||
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_VARIABLE);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_VARIABLE);
|
||||
if(!host) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
RRDSET *st = pluginsd_get_chart_from_parent(parser);
|
||||
RRDSET *st = pluginsd_get_scope_chart(parser);
|
||||
|
||||
int global = (st) ? 0 : 1;
|
||||
|
||||
|
|
@ -1040,7 +1081,7 @@ static inline PARSER_RC pluginsd_variable(char **words, size_t num_words, PARSER
|
|||
|
||||
static inline PARSER_RC pluginsd_flush(char **words __maybe_unused, size_t num_words __maybe_unused, PARSER *parser) {
|
||||
netdata_log_debug(D_PLUGINSD, "requested a " PLUGINSD_KEYWORD_FLUSH);
|
||||
pluginsd_set_chart_from_parent(parser, NULL, PLUGINSD_KEYWORD_FLUSH);
|
||||
pluginsd_clear_scope_chart(parser, PLUGINSD_KEYWORD_FLUSH);
|
||||
parser->user.replay.start_time = 0;
|
||||
parser->user.replay.end_time = 0;
|
||||
parser->user.replay.start_time_ut = 0;
|
||||
|
|
@ -1101,7 +1142,7 @@ static inline PARSER_RC pluginsd_label(char **words, size_t num_words, PARSER *p
|
|||
}
|
||||
|
||||
static inline PARSER_RC pluginsd_overwrite(char **words __maybe_unused, size_t num_words __maybe_unused, PARSER *parser) {
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_OVERWRITE);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_OVERWRITE);
|
||||
if(!host) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
netdata_log_debug(D_PLUGINSD, "requested to OVERWRITE host labels");
|
||||
|
|
@ -1128,7 +1169,7 @@ static inline PARSER_RC pluginsd_clabel(char **words, size_t num_words, PARSER *
|
|||
}
|
||||
|
||||
if(unlikely(!parser->user.chart_rrdlabels_linked_temporarily)) {
|
||||
RRDSET *st = pluginsd_get_chart_from_parent(parser);
|
||||
RRDSET *st = pluginsd_get_scope_chart(parser);
|
||||
parser->user.chart_rrdlabels_linked_temporarily = st->rrdlabels;
|
||||
rrdlabels_unmark_all(parser->user.chart_rrdlabels_linked_temporarily);
|
||||
}
|
||||
|
|
@ -1139,10 +1180,10 @@ static inline PARSER_RC pluginsd_clabel(char **words, size_t num_words, PARSER *
|
|||
}
|
||||
|
||||
static inline PARSER_RC pluginsd_clabel_commit(char **words __maybe_unused, size_t num_words __maybe_unused, PARSER *parser) {
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_CLABEL_COMMIT);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_CLABEL_COMMIT);
|
||||
if(!host) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
RRDSET *st = pluginsd_require_chart_from_parent(parser, PLUGINSD_KEYWORD_CLABEL_COMMIT, PLUGINSD_KEYWORD_BEGIN);
|
||||
RRDSET *st = pluginsd_require_scope_chart(parser, PLUGINSD_KEYWORD_CLABEL_COMMIT, PLUGINSD_KEYWORD_BEGIN);
|
||||
if(!st) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
netdata_log_debug(D_PLUGINSD, "requested to commit chart labels");
|
||||
|
|
@ -1167,17 +1208,19 @@ static inline PARSER_RC pluginsd_replay_begin(char **words, size_t num_words, PA
|
|||
char *end_time_str = get_word(words, num_words, 3);
|
||||
char *child_now_str = get_word(words, num_words, 4);
|
||||
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_REPLAY_BEGIN);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_REPLAY_BEGIN);
|
||||
if(!host) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
RRDSET *st;
|
||||
if (likely(!id || !*id))
|
||||
st = pluginsd_require_chart_from_parent(parser, PLUGINSD_KEYWORD_REPLAY_BEGIN, PLUGINSD_KEYWORD_REPLAY_BEGIN);
|
||||
st = pluginsd_require_scope_chart(parser, PLUGINSD_KEYWORD_REPLAY_BEGIN, PLUGINSD_KEYWORD_REPLAY_BEGIN);
|
||||
else
|
||||
st = pluginsd_find_chart(host, id, PLUGINSD_KEYWORD_REPLAY_BEGIN);
|
||||
|
||||
if(!st) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
pluginsd_set_chart_from_parent(parser, st, PLUGINSD_KEYWORD_REPLAY_BEGIN);
|
||||
|
||||
if(!pluginsd_set_scope_chart(parser, st, PLUGINSD_KEYWORD_REPLAY_BEGIN))
|
||||
return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
if(start_time_str && end_time_str) {
|
||||
time_t start_time = (time_t) str2ull_encoded(start_time_str);
|
||||
|
|
@ -1291,10 +1334,10 @@ static inline PARSER_RC pluginsd_replay_set(char **words, size_t num_words, PARS
|
|||
char *value_str = get_word(words, num_words, 2);
|
||||
char *flags_str = get_word(words, num_words, 3);
|
||||
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_REPLAY_SET);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_REPLAY_SET);
|
||||
if(!host) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
RRDSET *st = pluginsd_require_chart_from_parent(parser, PLUGINSD_KEYWORD_REPLAY_SET, PLUGINSD_KEYWORD_REPLAY_BEGIN);
|
||||
RRDSET *st = pluginsd_require_scope_chart(parser, PLUGINSD_KEYWORD_REPLAY_SET, PLUGINSD_KEYWORD_REPLAY_BEGIN);
|
||||
if(!st) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
if(!parser->user.replay.rset_enabled) {
|
||||
|
|
@ -1309,6 +1352,8 @@ static inline PARSER_RC pluginsd_replay_set(char **words, size_t num_words, PARS
|
|||
RRDDIM *rd = pluginsd_acquire_dimension(host, st, dimension, PLUGINSD_KEYWORD_REPLAY_SET);
|
||||
if(!rd) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
st->pluginsd.set = true;
|
||||
|
||||
if (unlikely(!parser->user.replay.start_time || !parser->user.replay.end_time)) {
|
||||
netdata_log_error("PLUGINSD: 'host:%s/chart:%s/dim:%s' got a %s with invalid timestamps %ld to %ld from a %s. Disabling it.",
|
||||
rrdhost_hostname(host),
|
||||
|
|
@ -1364,12 +1409,18 @@ static inline PARSER_RC pluginsd_replay_rrddim_collection_state(char **words, si
|
|||
char *last_calculated_value_str = get_word(words, num_words, 4);
|
||||
char *last_stored_value_str = get_word(words, num_words, 5);
|
||||
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_REPLAY_RRDDIM_STATE);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_REPLAY_RRDDIM_STATE);
|
||||
if(!host) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
RRDSET *st = pluginsd_require_chart_from_parent(parser, PLUGINSD_KEYWORD_REPLAY_RRDDIM_STATE, PLUGINSD_KEYWORD_REPLAY_BEGIN);
|
||||
RRDSET *st = pluginsd_require_scope_chart(parser, PLUGINSD_KEYWORD_REPLAY_RRDDIM_STATE, PLUGINSD_KEYWORD_REPLAY_BEGIN);
|
||||
if(!st) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
if(st->pluginsd.set) {
|
||||
// reset pos to reuse the same RDAs
|
||||
st->pluginsd.pos = 0;
|
||||
st->pluginsd.set = false;
|
||||
}
|
||||
|
||||
RRDDIM *rd = pluginsd_acquire_dimension(host, st, dimension, PLUGINSD_KEYWORD_REPLAY_RRDDIM_STATE);
|
||||
if(!rd) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
|
|
@ -1394,10 +1445,11 @@ static inline PARSER_RC pluginsd_replay_rrdset_collection_state(char **words, si
|
|||
char *last_collected_ut_str = get_word(words, num_words, 1);
|
||||
char *last_updated_ut_str = get_word(words, num_words, 2);
|
||||
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_REPLAY_RRDSET_STATE);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_REPLAY_RRDSET_STATE);
|
||||
if(!host) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
RRDSET *st = pluginsd_require_chart_from_parent(parser, PLUGINSD_KEYWORD_REPLAY_RRDSET_STATE, PLUGINSD_KEYWORD_REPLAY_BEGIN);
|
||||
RRDSET *st = pluginsd_require_scope_chart(parser, PLUGINSD_KEYWORD_REPLAY_RRDSET_STATE,
|
||||
PLUGINSD_KEYWORD_REPLAY_BEGIN);
|
||||
if(!st) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
usec_t chart_last_collected_ut = (usec_t)st->last_collected_time.tv_sec * USEC_PER_SEC + (usec_t)st->last_collected_time.tv_usec;
|
||||
|
|
@ -1446,10 +1498,10 @@ static inline PARSER_RC pluginsd_replay_end(char **words, size_t num_words, PARS
|
|||
time_t child_world_time = (child_world_time_txt && *child_world_time_txt) ? (time_t) str2ull_encoded(
|
||||
child_world_time_txt) : now_realtime_sec();
|
||||
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_REPLAY_END);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_REPLAY_END);
|
||||
if(!host) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
RRDSET *st = pluginsd_require_chart_from_parent(parser, PLUGINSD_KEYWORD_REPLAY_END, PLUGINSD_KEYWORD_REPLAY_BEGIN);
|
||||
RRDSET *st = pluginsd_require_scope_chart(parser, PLUGINSD_KEYWORD_REPLAY_END, PLUGINSD_KEYWORD_REPLAY_BEGIN);
|
||||
if(!st) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
#ifdef NETDATA_LOG_REPLICATION_REQUESTS
|
||||
|
|
@ -1512,7 +1564,7 @@ static inline PARSER_RC pluginsd_replay_end(char **words, size_t num_words, PARS
|
|||
rrdhost_hostname(host), rrdset_id(st));
|
||||
#endif
|
||||
|
||||
pluginsd_set_chart_from_parent(parser, NULL, PLUGINSD_KEYWORD_REPLAY_END);
|
||||
pluginsd_clear_scope_chart(parser, PLUGINSD_KEYWORD_REPLAY_END);
|
||||
|
||||
host->rrdpush_receiver_replication_percent = 100.0;
|
||||
worker_set_metric(WORKER_RECEIVER_JOB_REPLICATION_COMPLETION, host->rrdpush_receiver_replication_percent);
|
||||
|
|
@ -1520,7 +1572,7 @@ static inline PARSER_RC pluginsd_replay_end(char **words, size_t num_words, PARS
|
|||
return PARSER_RC_OK;
|
||||
}
|
||||
|
||||
pluginsd_set_chart_from_parent(parser, NULL, PLUGINSD_KEYWORD_REPLAY_END);
|
||||
pluginsd_clear_scope_chart(parser, PLUGINSD_KEYWORD_REPLAY_END);
|
||||
|
||||
rrdcontext_updated_retention_rrdset(st);
|
||||
|
||||
|
|
@ -1541,7 +1593,7 @@ static inline PARSER_RC pluginsd_begin_v2(char **words, size_t num_words, PARSER
|
|||
if(unlikely(!id || !update_every_str || !end_time_str || !wall_clock_time_str))
|
||||
return PLUGINSD_DISABLE_PLUGIN(parser, PLUGINSD_KEYWORD_BEGIN_V2, "missing parameters");
|
||||
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_BEGIN_V2);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_BEGIN_V2);
|
||||
if(unlikely(!host)) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
timing_step(TIMING_STEP_BEGIN2_PREPARE);
|
||||
|
|
@ -1549,7 +1601,8 @@ static inline PARSER_RC pluginsd_begin_v2(char **words, size_t num_words, PARSER
|
|||
RRDSET *st = pluginsd_find_chart(host, id, PLUGINSD_KEYWORD_BEGIN_V2);
|
||||
if(unlikely(!st)) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
pluginsd_set_chart_from_parent(parser, st, PLUGINSD_KEYWORD_BEGIN_V2);
|
||||
if(!pluginsd_set_scope_chart(parser, st, PLUGINSD_KEYWORD_BEGIN_V2))
|
||||
return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
if(unlikely(rrdset_flag_check(st, RRDSET_FLAG_OBSOLETE | RRDSET_FLAG_ARCHIVED)))
|
||||
rrdset_isnot_obsolete(st);
|
||||
|
|
@ -1665,10 +1718,10 @@ static inline PARSER_RC pluginsd_set_v2(char **words, size_t num_words, PARSER *
|
|||
if(unlikely(!dimension || !collected_str || !value_str || !flags_str))
|
||||
return PLUGINSD_DISABLE_PLUGIN(parser, PLUGINSD_KEYWORD_SET_V2, "missing parameters");
|
||||
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_SET_V2);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_SET_V2);
|
||||
if(unlikely(!host)) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
RRDSET *st = pluginsd_require_chart_from_parent(parser, PLUGINSD_KEYWORD_SET_V2, PLUGINSD_KEYWORD_BEGIN_V2);
|
||||
RRDSET *st = pluginsd_require_scope_chart(parser, PLUGINSD_KEYWORD_SET_V2, PLUGINSD_KEYWORD_BEGIN_V2);
|
||||
if(unlikely(!st)) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
timing_step(TIMING_STEP_SET2_PREPARE);
|
||||
|
|
@ -1676,6 +1729,8 @@ static inline PARSER_RC pluginsd_set_v2(char **words, size_t num_words, PARSER *
|
|||
RRDDIM *rd = pluginsd_acquire_dimension(host, st, dimension, PLUGINSD_KEYWORD_SET_V2);
|
||||
if(unlikely(!rd)) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
st->pluginsd.set = true;
|
||||
|
||||
if(unlikely(rrddim_flag_check(rd, RRDDIM_FLAG_OBSOLETE | RRDDIM_FLAG_ARCHIVED)))
|
||||
rrddim_isnot_obsolete(st, rd);
|
||||
|
||||
|
|
@ -1766,16 +1821,16 @@ static inline PARSER_RC pluginsd_set_v2(char **words, size_t num_words, PARSER *
|
|||
|
||||
void pluginsd_cleanup_v2(PARSER *parser) {
|
||||
// this is called when the thread is stopped while processing
|
||||
pluginsd_set_chart_from_parent(parser, NULL, "THREAD CLEANUP");
|
||||
pluginsd_clear_scope_chart(parser, "THREAD CLEANUP");
|
||||
}
|
||||
|
||||
static inline PARSER_RC pluginsd_end_v2(char **words __maybe_unused, size_t num_words __maybe_unused, PARSER *parser) {
|
||||
timing_init();
|
||||
|
||||
RRDHOST *host = pluginsd_require_host_from_parent(parser, PLUGINSD_KEYWORD_END_V2);
|
||||
RRDHOST *host = pluginsd_require_scope_host(parser, PLUGINSD_KEYWORD_END_V2);
|
||||
if(unlikely(!host)) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
RRDSET *st = pluginsd_require_chart_from_parent(parser, PLUGINSD_KEYWORD_END_V2, PLUGINSD_KEYWORD_BEGIN_V2);
|
||||
RRDSET *st = pluginsd_require_scope_chart(parser, PLUGINSD_KEYWORD_END_V2, PLUGINSD_KEYWORD_BEGIN_V2);
|
||||
if(unlikely(!st)) return PLUGINSD_DISABLE_PLUGIN(parser, NULL, NULL);
|
||||
|
||||
parser->user.data_collections_count++;
|
||||
|
|
@ -1793,7 +1848,7 @@ static inline PARSER_RC pluginsd_end_v2(char **words __maybe_unused, size_t num_
|
|||
// ------------------------------------------------------------------------
|
||||
// unblock data collection
|
||||
|
||||
pluginsd_unlock_previous_chart(parser, PLUGINSD_KEYWORD_END_V2, false);
|
||||
pluginsd_unlock_previous_scope_chart(parser, PLUGINSD_KEYWORD_END_V2, false);
|
||||
rrdcontext_collected_rrdset(st);
|
||||
store_metric_collection_completed();
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue