mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '3137-create-new-log-messages-when-entering-and-exiting-exlusive-task-mode' into 'main'

Browse Source 
Log when entering and exiting task exclusive mode

Closes #3137

See merge request isc-projects/bind9!5814
This commit is contained in:
Ondřej Surý
2022-02-10 20:21:18 +00:00
parent 47b6e5d038 44aa8ef997
commit 62cf6a77cf
3 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
5804. [func] Add a debug log message when starting and ending
the task exclusive mode. [GL #3137]
5803. [func] Use compile-time paths in the documentation. 5803. [func] Use compile-time paths in the documentation.
[GL #2717] [GL #2717]

5
doc/notes/notes-current.rst
View File

@@ -41,6 +41,11 @@ Feature Changes
by a client are now included in the client information sent to DLZ by a client are now included in the client information sent to DLZ
modules when processing queries. :gl:`#3082` modules when processing queries. :gl:`#3082`
- Add DEBUG(1) level messages when starting and ending BIND 9 task exclusive mode
that stops the normal DNS operation (f.e. for reconfiguration, interface
scans, and other events that require exclusive access to a shared resources).
:gl:`#3137`
Bug Fixes Bug Fixes
~~~~~~~~~ ~~~~~~~~~

26
lib/isc/task.c
View File

@@ -25,6 +25,7 @@
#include <isc/atomic.h> #include <isc/atomic.h>
#include <isc/condition.h> #include <isc/condition.h>
#include <isc/event.h> #include <isc/event.h>
#include <isc/log.h>
#include <isc/magic.h> #include <isc/magic.h>
#include <isc/mem.h> #include <isc/mem.h>
#include <isc/once.h> #include <isc/once.h>
@@ -1107,8 +1108,20 @@ isc_task_beginexclusive(isc_task_t *task) {
return (ISC_R_LOCKBUSY); return (ISC_R_LOCKBUSY);
} }
if (isc_log_wouldlog(isc_lctx, ISC_LOG_DEBUG(1))) {
isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
ISC_LOGMODULE_OTHER, ISC_LOG_DEBUG(1),
"exclusive task mode: %s", "starting");
}
isc_nm_pause(manager->netmgr); isc_nm_pause(manager->netmgr);
if (isc_log_wouldlog(isc_lctx, ISC_LOG_DEBUG(1))) {
isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
ISC_LOGMODULE_OTHER, ISC_LOG_DEBUG(1),
"exclusive task mode: %s", "started");
}
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
} }
@@ -1120,7 +1133,20 @@ isc_task_endexclusive(isc_task_t *task) {
REQUIRE(task->state == task_state_running); REQUIRE(task->state == task_state_running);
manager = task->manager; manager = task->manager;
if (isc_log_wouldlog(isc_lctx, ISC_LOG_DEBUG(1))) {
isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
ISC_LOGMODULE_OTHER, ISC_LOG_DEBUG(1),
"exclusive task mode: %s", "ending");
}
isc_nm_resume(manager->netmgr); isc_nm_resume(manager->netmgr);
if (isc_log_wouldlog(isc_lctx, ISC_LOG_DEBUG(1))) {
isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL,
ISC_LOGMODULE_OTHER, ISC_LOG_DEBUG(1),
"exclusive task mode: %s", "ended");
}
REQUIRE(atomic_compare_exchange_strong(&manager->exclusive_req, REQUIRE(atomic_compare_exchange_strong(&manager->exclusive_req,
&(bool){ true }, false)); &(bool){ true }, false));
} }