mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

ignore reload request if in a reload process

Browse Source 
Ignore an 'rndc reload' or 'rndc reconfig' command if received by named
while the server is currently reloading itself.
This commit is contained in:
Colin Vidal
2025-04-22 15:41:39 +02:00
committed by Evan Hunt
parent d7de2ba084
commit d7416bb472
3 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/named/control.c
View File

@@ -252,7 +252,7 @@ named_control_docommand(isccc_sexpr_t *message, bool readonly,
"query logging", "query logging",
NS_SERVER_LOGQUERIES, lex); NS_SERVER_LOGQUERIES, lex);
} else if (command_compare(command, NAMED_COMMAND_RECONFIG)) { } else if (command_compare(command, NAMED_COMMAND_RECONFIG)) {
result = named_server_reconfigcommand(named_g_server); result = named_server_reconfigcommand(named_g_server, *text);
} else if (command_compare(command, NAMED_COMMAND_RECURSING)) { } else if (command_compare(command, NAMED_COMMAND_RECURSING)) {
result = named_server_dumprecursing(named_g_server); result = named_server_dumprecursing(named_g_server);
} else if (command_compare(command, NAMED_COMMAND_REFRESH)) { } else if (command_compare(command, NAMED_COMMAND_REFRESH)) {

2
bin/named/include/named/server.h
View File

@@ -161,7 +161,7 @@ named_server_resetstatscommand(named_server_t *server, isc_lex_t *lex,
*/ */
isc_result_t isc_result_t
named_server_reconfigcommand(named_server_t *server); named_server_reconfigcommand(named_server_t *server, isc_buffer_t *text);
/*%< /*%<
* Act on a "reconfig" command from the command channel. * Act on a "reconfig" command from the command channel.
*/ */

36
bin/named/server.c
View File

@@ -9924,8 +9924,16 @@ loadconfig(named_server_t *server) {
static isc_result_t static isc_result_t
reload(named_server_t *server) { reload(named_server_t *server) {
isc_result_t result; isc_result_t result;
int reloadstatus = atomic_exchange(&server->reload_status,
NAMED_RELOAD_IN_PROGRESS);
atomic_store(&server->reload_status, NAMED_RELOAD_IN_PROGRESS); if (reloadstatus == NAMED_RELOAD_IN_PROGRESS) {
isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER,
ISC_LOG_WARNING,
"reload request ignored: already running");
result = ISC_R_ALREADYRUNNING;
goto cleanup;
}
named_os_notify_systemd("RELOADING=1\n" named_os_notify_systemd("RELOADING=1\n"
"MONOTONIC_USEC=%" PRIu64 "\n" "MONOTONIC_USEC=%" PRIu64 "\n"
@@ -10325,8 +10333,16 @@ named_server_reloadcommand(named_server_t *server, isc_lex_t *lex,
} }
if (zone == NULL) { if (zone == NULL) {
result = reload(server); result = reload(server);
if (result == ISC_R_SUCCESS) { switch (result) {
case ISC_R_SUCCESS:
msg = "server reload successful"; msg = "server reload successful";
break;
case ISC_R_ALREADYRUNNING:
msg = "reload request ignored as the server is "
"currently being reloaded or reconfigured";
break;
default:
break;
} }
} else { } else {
type = dns_zone_gettype(zone); type = dns_zone_gettype(zone);
@@ -10416,9 +10432,21 @@ named_server_resetstatscommand(named_server_t *server, isc_lex_t *lex,
* Act on a "reconfig" command from the command channel. * Act on a "reconfig" command from the command channel.
*/ */
isc_result_t isc_result_t
named_server_reconfigcommand(named_server_t *server) { named_server_reconfigcommand(named_server_t *server, isc_buffer_t *text) {
isc_result_t result; isc_result_t result;
atomic_store(&server->reload_status, NAMED_RELOAD_IN_PROGRESS); int reloadstatus = atomic_exchange(&server->reload_status,
NAMED_RELOAD_IN_PROGRESS);
if (reloadstatus == NAMED_RELOAD_IN_PROGRESS) {
isc_log_write(NAMED_LOGCATEGORY_GENERAL, NAMED_LOGMODULE_SERVER,
ISC_LOG_WARNING,
"reconfig request ignored: already running");
result = ISC_R_ALREADYRUNNING;
isc_buffer_printf(text,
"reconfig request ignored as the server is "
"currently being reloaded or reconfigured");
goto cleanup;
}
named_os_notify_systemd("RELOADING=1\n" named_os_notify_systemd("RELOADING=1\n"
"MONOTONIC_USEC=%" PRIu64 "\n" "MONOTONIC_USEC=%" PRIu64 "\n"