Merge branch '3125-log-hard-quota-when-not-accepting-the-connection' into 'main'

Add log message when hard quota is reached in TCP accept

Closes #3125

See merge request isc-projects/bind9!5788
This commit is contained in:
Ondřej Surý 2022-02-01 20:38:01 +00:00
commit 01bd7d1024
5 changed files with 9 additions and 3 deletions

View file

@ -1,3 +1,6 @@
5801. [bug] Log "quota reached" message when hard quota
is reached when accepting a connection. [GL #3125]
5800. [func] Add ECS support to the DLZ interface. [GL #3082]
5799. [bug] Use L1 cache-line size detected at runtime. [GL #3108]

View file

@ -49,3 +49,6 @@ Bug Fixes
- A failed view configuration during a named reconfiguration procedure could
cause inconsistencies in BIND internal structures, causing a crash or other
unexpected errors. This has been fixed. :gl:`#3060`
- Restore logging "quota reached" message when accepting connection is over
hard quota. :gl:`#3125`

View file

@ -628,7 +628,7 @@ tcp_connection_cb(uv_stream_t *server, int status) {
&ssock->quotacb);
if (result == ISC_R_QUOTA) {
isc__nm_incstats(ssock, STATID_ACCEPTFAIL);
return;
goto done;
}
}

View file

@ -597,7 +597,7 @@ tcpdns_connection_cb(uv_stream_t *server, int status) {
&ssock->quotacb);
if (result == ISC_R_QUOTA) {
isc__nm_incstats(ssock, STATID_ACCEPTFAIL);
return;
goto done;
}
}

View file

@ -670,7 +670,7 @@ tlsdns_connection_cb(uv_stream_t *server, int status) {
&ssock->quotacb);
if (result == ISC_R_QUOTA) {
isc__nm_incstats(ssock, STATID_ACCEPTFAIL);
return;
goto done;
}
}