diff --git a/CHANGES b/CHANGES index 42f6eade62..f1640c52db 100644 --- a/CHANGES +++ b/CHANGES @@ -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] diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst index eb9aab095a..b6ab999f21 100644 --- a/doc/notes/notes-current.rst +++ b/doc/notes/notes-current.rst @@ -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` diff --git a/lib/isc/netmgr/tcp.c b/lib/isc/netmgr/tcp.c index d97c2b486c..b0034b9cbf 100644 --- a/lib/isc/netmgr/tcp.c +++ b/lib/isc/netmgr/tcp.c @@ -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; } } diff --git a/lib/isc/netmgr/tcpdns.c b/lib/isc/netmgr/tcpdns.c index 8999207e0a..21d1ab5bc6 100644 --- a/lib/isc/netmgr/tcpdns.c +++ b/lib/isc/netmgr/tcpdns.c @@ -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; } } diff --git a/lib/isc/netmgr/tlsdns.c b/lib/isc/netmgr/tlsdns.c index 135a854662..d56c82857a 100644 --- a/lib/isc/netmgr/tlsdns.c +++ b/lib/isc/netmgr/tlsdns.c @@ -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; } }