rename option, default to off

diff --git a/docs/settings.rst b/docs/settings.rst
index fdbe04ffd96529b46042288e0dd124d01357552f..928e7444057063d89021b6c0dc2d480587469b90 100644 (file)
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -116,22 +116,6 @@ When notifying a domain, also notify these nameservers. Example:
 ``also-notify`` always receive a notification. Even if they do not match
 the list in :ref:`setting-only-notify`.
 
-.. _setting-any-lookups-only:
-
-``any-lookups-only``
---------------------
-
--  Boolean
--  Default: yes
-
-.. versionadded:: 4.4.0
-
-Whether PowerDNS will only send ANY lookups to its backends, instead of sometimes requesting the exact needed type.
-This reduces the load on backends by retrieving all the types for a given name at once, adding all of them to the cache.
-It improves performance significantly for latency-sensitive backends, like SQL ones, where a round-trip takes serious time.
-This behaviour is enabled by default but can be disabled by setting this option to "no" for the few multi-backends setups
-that do not support it.
-
 .. _setting-any-to-tcp:
 
 ``any-to-tcp``
@@ -323,6 +307,22 @@ compile-time.
 Name of this virtual configuration - will rename the binary image. See
 :doc:`guides/virtual-instances`.
 
+.. _setting-consistent-backends:
+
+``consistent-backends``
+--------------------
+
+-  Boolean
+-  Default: no
+
+.. versionadded:: 4.4.0
+
+When this is set, PowerDNS assumes that any single domain lives in only one backend.
+This allows PowerDNS to send ANY lookups to its backends, instead of sometimes requesting the exact needed type.
+This reduces the load on backends by retrieving all the types for a given name at once, adding all of them to the cache.
+It improves performance significantly for latency-sensitive backends, like SQL ones, where a round-trip takes serious time.
+This behaviour will be enabled by default in a future release.
+
 .. _setting-control-console:
 
 ``control-console``

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 2cf6de6c3e59b5957aaa4d010d23f87f74efd3a8..3700ce7bc66760a385bb48c39739cd84334aa344 100644 (file)
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -240,7 +240,7 @@ void declareArguments()
   ::arg().set("max-generate-steps", "Maximum number of $GENERATE steps when loading a zone from a file")="0";
   ::arg().setSwitch("upgrade-unknown-types","Transparently upgrade known TYPExxx records. Recommended to keep off, except for PowerDNS upgrades until data sources are cleaned up")="no";
 
-  ::arg().set("any-lookups-only", "Send only ANY lookup operations to the backend to reduce the number of lookups")="yes";
+  ::arg().set("consistent-backends", "Assume individual domains are not divided over backends. Send only ANY lookup operations to the backend to reduce the number of lookups")="yes";
 
   ::arg().set("rng", "Specify the random number generator to use. Valid values are auto,sodium,openssl,getrandom,arc4random,urandom.")="auto";
   ::arg().setDefaults();

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index b61f8c5800a273ede536744ef78b112b1baa3880..43eae0785bfde9ac4657f3ed443651b2f2a99052 100644 (file)
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -131,7 +131,7 @@ static void loadMainConfig(const std::string& configdir)
   ::arg().set("chroot","Switch to this chroot jail")="";
   ::arg().set("dnssec-key-cache-ttl","Seconds to cache DNSSEC keys from the database")="30";
   ::arg().set("domain-metadata-cache-ttl","Seconds to cache domain metadata from the database")="60";
-  ::arg().set("any-lookups-only","Send only ANY lookup operations to the backend to reduce the number of lookups")="yes";
+  ::arg().set("consistent-backends", "Assume individual domains are not divided over backends. Send only ANY lookup operations to the backend to reduce the number of lookups")="yes";
 
   // Keep this line below all ::arg().set() statements
   if (! ::arg().laxFile(configname.c_str()))

diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc
index fa55f3e4678a47914621efc61636af9b9d65ba24..2b1764e23f01ae8f557def235a8f86803ad2594b 100644 (file)
--- a/pdns/ueberbackend.cc
+++ b/pdns/ueberbackend.cc
@@ -95,7 +95,7 @@ bool UeberBackend::loadModules(const vector<string>& modules, const string& path
 
 void UeberBackend::go(void)
 {
-  if (::arg().mustDo("any-lookups-only")) {
+  if (::arg().mustDo("consistent-backends")) {
     s_doANYLookupsOnly = true;
   }