From 6861d004fb7cbf87b01ed04f50806a2b58fdddc0 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Mon, 25 Sep 2023 10:52:10 +0200 Subject: [PATCH] Rename setting and adapt docs text, as suggested by @ragogne --- pdns/recursordist/rec-main.cc | 2 +- pdns/recursordist/settings/table.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc index 43d125f236..fcf617d70d 100644 --- a/pdns/recursordist/rec-main.cc +++ b/pdns/recursordist/rec-main.cc @@ -1641,7 +1641,7 @@ static int initSyncRes(Logr::log_t log) SyncRes::s_serverdownmaxfails = ::arg().asNum("server-down-max-fails"); SyncRes::s_serverdownthrottletime = ::arg().asNum("server-down-throttle-time"); - SyncRes::s_unthrottle_n = ::arg().asNum("server-down-use-probability"); + SyncRes::s_unthrottle_n = ::arg().asNum("bypass-server-throttling-probability"); SyncRes::s_nonresolvingnsmaxfails = ::arg().asNum("non-resolving-ns-max-fails"); SyncRes::s_nonresolvingnsthrottletime = ::arg().asNum("non-resolving-ns-throttle-time"); SyncRes::s_serverID = ::arg()["server-id"]; diff --git a/pdns/recursordist/settings/table.py b/pdns/recursordist/settings/table.py index ab7e1ceb8e..e833fb6564 100644 --- a/pdns/recursordist/settings/table.py +++ b/pdns/recursordist/settings/table.py @@ -2155,15 +2155,15 @@ Throttle a server that has failed to respond :ref:`setting-server-down-max-fails ''', }, { - 'name' : 'server_down_use_probability', + 'name' : 'bypass_server_throttling_probability', 'section' : 'recursor', 'type' : LType.Uint64, 'default' : '25', 'help' : 'Determines the probability of a server marked down to be used anyway', 'doc' : ''' This setting determines the probability of a server marked down to be used anyway. -A value of ``n`` means that the chance of a server marked down being used after it wins speed selection is is ``1/n``. -If this setting is zero this mechanism is not active. +A value of ``n`` means that the chance of a server marked down still being used after it wins speed selection is is ``1/n``. +If this setting is zero throttled servers will never be selected to be used anyway. ''', 'versionadded': '5.0.0' }, -- 2.47.2