Unverified Commit 4d4db979 authored by Huang Zhw's avatar Huang Zhw Committed by GitHub
Browse files

Cleanup: sentinel config, latency extra time() (#8810)

parent d32fd315
......@@ -137,7 +137,7 @@ void latencyAddSample(const char *event, mstime_t latency) {
return;
}
ts->samples[ts->idx].time = time(NULL);
ts->samples[ts->idx].time = now;
ts->samples[ts->idx].latency = latency;
ts->idx++;
......
......@@ -1845,24 +1845,21 @@ void loadSentinelConfigFromQueue(void) {
listNode *ln;
int linenum = 0;
sds line = NULL;
unsigned int j;
/* if there is no sentinel_config entry, we can return immediately */
if (server.sentinel_config == NULL) return;
/* loading from pre monitor config queue first to avoid dependency issues */
listRewind(server.sentinel_config->pre_monitor_cfg,&li);
while((ln = listNext(&li))) {
struct sentinelLoadQueueEntry *entry = ln->value;
err = sentinelHandleConfiguration(entry->argv,entry->argc);
if (err) {
linenum = entry->linenum;
line = entry->line;
goto loaderr;
}
}
/* loading from monitor config queue */
listRewind(server.sentinel_config->monitor_cfg,&li);
list *sentinel_configs[3] = {
server.sentinel_config->pre_monitor_cfg,
server.sentinel_config->monitor_cfg,
server.sentinel_config->post_monitor_cfg
};
/* loading from pre monitor config queue first to avoid dependency issues
* loading from monitor config queue
* loading from the post monitor config queue */
for (j = 0; j < sizeof(sentinel_configs) / sizeof(sentinel_configs[0]); j++) {
listRewind(sentinel_configs[j],&li);
while((ln = listNext(&li))) {
struct sentinelLoadQueueEntry *entry = ln->value;
err = sentinelHandleConfiguration(entry->argv,entry->argc);
......@@ -1872,17 +1869,6 @@ void loadSentinelConfigFromQueue(void) {
goto loaderr;
}
}
/* loading from the post monitor config queue */
listRewind(server.sentinel_config->post_monitor_cfg,&li);
while((ln = listNext(&li))) {
struct sentinelLoadQueueEntry *entry = ln->value;
err = sentinelHandleConfiguration(entry->argv,entry->argc);
if (err) {
linenum = entry->linenum;
line = entry->line;
goto loaderr;
}
}
/* free sentinel_config when config loading is finished */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment