Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add configurable wakeup delay for dnstap queues #967

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add configurable wakeup delay for dnstap queues #967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion daemon/worker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2160,7 +2160,10 @@ worker_init(struct worker* worker, struct config_file *cfg,
if(cfg->dnstap) {
log_assert(worker->daemon->dtenv != NULL);
memcpy(&worker->dtenv, worker->daemon->dtenv, sizeof(struct dt_env));
if(!dt_init(&worker->dtenv, worker->base))
struct timeval tv;
tv.tv_sec = (time_t)(cfg->dnstap_wakeup_delay / 1000);
tv.tv_usec = (time_t)((cfg->dnstap_wakeup_delay % 1000) * 1000);
if(!dt_init(&worker->dtenv, worker->base, &tv))
fatal_exit("dt_init failed");
}
#endif
Expand Down
5 changes: 3 additions & 2 deletions dnstap/dnstap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,9 +244,10 @@ dt_apply_cfg(struct dt_env *env, struct config_file *cfg)
}

int
dt_init(struct dt_env *env, struct comm_base* base)
dt_init(struct dt_env *env, struct comm_base* base,
struct timeval* wakeup_delay)
{
env->msgqueue = dt_msg_queue_create(base);
env->msgqueue = dt_msg_queue_create(base, wakeup_delay);
if(!env->msgqueue) {
log_err("malloc failure");
return 0;
Expand Down
3 changes: 2 additions & 1 deletion dnstap/dnstap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ dt_apply_cfg(struct dt_env *env, struct config_file *cfg);
* @return: true on success, false on failure.
*/
int
dt_init(struct dt_env *env, struct comm_base* base);
dt_init(struct dt_env *env, struct comm_base* base,
struct timeval* wakeup_delay);

/**
* Deletes the per-worker state created by dt_init
Expand Down
6 changes: 3 additions & 3 deletions dnstap/dtstream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,15 @@ static int dtio_enable_brief_write(struct dt_io_thread* dtio);
#endif

struct dt_msg_queue*
dt_msg_queue_create(struct comm_base* base)
dt_msg_queue_create(struct comm_base* base, struct timeval* wakeup_delay)
{
struct dt_msg_queue* mq = calloc(1, sizeof(*mq));
if(!mq) return NULL;
mq->maxsize = 1*1024*1024; /* set max size of buffer, per worker,
about 1 M should contain 64K messages with some overhead,
or a whole bunch smaller ones */
mq->wakeup_timer = comm_timer_create(base, mq_wakeup_cb, mq);
mq->wakeup_delay = *wakeup_delay;
if(!mq->wakeup_timer) {
free(mq);
return NULL;
Expand Down Expand Up @@ -219,8 +220,7 @@ dt_msg_queue_start_timer(struct dt_msg_queue* mq, int wakeupnow)

/* start the timer, in mq, in the event base of our worker */
if(!wakeupnow) {
tv.tv_sec = 1;
tv.tv_usec = 0;
tv = mq->wakeup_delay;
}
comm_timer_set(mq->wakeup_timer, &tv);
lock_basic_unlock(&mq->dtio->wakeup_timer_lock);
Expand Down
5 changes: 4 additions & 1 deletion dnstap/dtstream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ struct dt_msg_queue {
struct dt_io_thread* dtio;
/** the wakeup timer for dtio, on worker event base */
struct comm_timer* wakeup_timer;
/** the wakeup delay to use when waking up the worker */
struct timeval wakeup_delay;
};

/**
Expand Down Expand Up @@ -245,7 +247,8 @@ struct dt_io_list_item {
* @param base: event base for wakeup timer.
* @return NULL on malloc failure or a new queue (not locked).
*/
struct dt_msg_queue* dt_msg_queue_create(struct comm_base* base);
struct dt_msg_queue* dt_msg_queue_create(struct comm_base* base,
struct timeval* wakeup_delay);

/**
* Delete a worker message queue. It has to be unlinked from access,
Expand Down
1 change: 1 addition & 0 deletions doc/example.conf.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1286,6 +1286,7 @@ remote-control:
# dnstap-identity: ""
# # if "" it uses the package version.
# dnstap-version: ""
# dnstap-wakeup-delay: 1000
# dnstap-log-resolver-query-messages: no
# dnstap-log-resolver-response-messages: no
# dnstap-log-client-query-messages: no
Expand Down
5 changes: 5 additions & 0 deletions doc/unbound.conf.5.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2797,6 +2797,11 @@ Default is "".
The version to send with messages, if "" the package version is used.
Default is "".
.TP
.B dnstap-wakeup-delay: \fI<msec>
Delay before the dnstap message queue worker will handle incoming
messages. This reduces performance overhead, but increases latency.
Default is 1000 milliseconds.
.TP
.B dnstap-log-resolver-query-messages: \fI<yes or no>
Enable to log resolver query messages. Default is no.
These are messages from Unbound to upstream servers.
Expand Down
3 changes: 3 additions & 0 deletions util/config_file.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ config_create(void)
goto error_exit;
#endif
cfg->dnstap_bidirectional = 1;
cfg->dnstap_wakeup_delay = 1000;
cfg->dnstap_tls = 1;
cfg->disable_dnssec_lame_check = 0;
cfg->ip_ratelimit_cookie = 0;
Expand Down Expand Up @@ -755,6 +756,7 @@ int config_set_option(struct config_file* cfg, const char* opt,
else S_YNO("dnstap-send-version:", dnstap_send_version)
else S_STR("dnstap-identity:", dnstap_identity)
else S_STR("dnstap-version:", dnstap_version)
else S_SIZET_OR_ZERO("dnstap-wakeup-delay:", dnstap_wakeup_delay)
else S_YNO("dnstap-log-resolver-query-messages:",
dnstap_log_resolver_query_messages)
else S_YNO("dnstap-log-resolver-response-messages:",
Expand Down Expand Up @@ -1226,6 +1228,7 @@ config_get_option(struct config_file* cfg, const char* opt,
else O_YNO(opt, "dnstap-send-version", dnstap_send_version)
else O_STR(opt, "dnstap-identity", dnstap_identity)
else O_STR(opt, "dnstap-version", dnstap_version)
else O_UNS(opt, "dnstap-wakeup-delay", dnstap_wakeup_delay)
else O_YNO(opt, "dnstap-log-resolver-query-messages",
dnstap_log_resolver_query_messages)
else O_YNO(opt, "dnstap-log-resolver-response-messages",
Expand Down
2 changes: 2 additions & 0 deletions util/config_file.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,8 @@ struct config_file {
char* dnstap_identity;
/** dnstap "version", package version is used if "". */
char* dnstap_version;
/** dnstap worker wakeup delay */
size_t dnstap_wakeup_delay;

/** true to log dnstap RESOLVER_QUERY message events */
int dnstap_log_resolver_query_messages;
Expand Down
1 change: 1 addition & 0 deletions util/configlexer.lex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,6 +494,7 @@ dnstap-send-identity{COLON} { YDVAR(1, VAR_DNSTAP_SEND_IDENTITY) }
dnstap-send-version{COLON} { YDVAR(1, VAR_DNSTAP_SEND_VERSION) }
dnstap-identity{COLON} { YDVAR(1, VAR_DNSTAP_IDENTITY) }
dnstap-version{COLON} { YDVAR(1, VAR_DNSTAP_VERSION) }
dnstap-wakeup-delay{COLON} { YDVAR(1, VAR_DNSTAP_WAKEUP_DELAY) }
dnstap-log-resolver-query-messages{COLON} {
YDVAR(1, VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES) }
dnstap-log-resolver-response-messages{COLON} {
Expand Down
13 changes: 11 additions & 2 deletions util/configparser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ extern struct config_parser_state* cfg_parser;
%token VAR_DNSTAP_TLS VAR_DNSTAP_TLS_SERVER_NAME VAR_DNSTAP_TLS_CERT_BUNDLE
%token VAR_DNSTAP_TLS_CLIENT_KEY_FILE VAR_DNSTAP_TLS_CLIENT_CERT_FILE
%token VAR_DNSTAP_SEND_IDENTITY VAR_DNSTAP_SEND_VERSION VAR_DNSTAP_BIDIRECTIONAL
%token VAR_DNSTAP_IDENTITY VAR_DNSTAP_VERSION
%token VAR_DNSTAP_IDENTITY VAR_DNSTAP_VERSION VAR_DNSTAP_WAKEUP_DELAY
%token VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES
%token VAR_DNSTAP_LOG_RESOLVER_RESPONSE_MESSAGES
%token VAR_DNSTAP_LOG_CLIENT_QUERY_MESSAGES
Expand Down Expand Up @@ -3354,7 +3354,7 @@ content_dt: dt_dnstap_enable | dt_dnstap_socket_path | dt_dnstap_bidirectional |
dt_dnstap_tls_cert_bundle |
dt_dnstap_tls_client_key_file | dt_dnstap_tls_client_cert_file |
dt_dnstap_send_identity | dt_dnstap_send_version |
dt_dnstap_identity | dt_dnstap_version |
dt_dnstap_identity | dt_dnstap_version | dt_dnstap_wakeup_delay |
dt_dnstap_log_resolver_query_messages |
dt_dnstap_log_resolver_response_messages |
dt_dnstap_log_client_query_messages |
Expand Down Expand Up @@ -3464,6 +3464,15 @@ dt_dnstap_version: VAR_DNSTAP_VERSION STRING_ARG
cfg_parser->cfg->dnstap_version = $2;
}
;
dt_dnstap_wakeup_delay: VAR_DNSTAP_WAKEUP_DELAY STRING_ARG
{
OUTYY(("P(dt_dnstap_wakeup_delay:%s)\n", $2));
if(atoi($2) == 0 && strcmp($2, "0") != 0)
yyerror("number expected");
else cfg_parser->cfg->dnstap_wakeup_delay = atoi($2);
free($2);
}
;
dt_dnstap_log_resolver_query_messages: VAR_DNSTAP_LOG_RESOLVER_QUERY_MESSAGES STRING_ARG
{
OUTYY(("P(dt_dnstap_log_resolver_query_messages:%s)\n", $2));
Expand Down