ctdb-tunables: Mark tunable MaxRedirectCount obsolete

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

diff --git a/ctdb/doc/ctdb-tunables.7.xml b/ctdb/doc/ctdb-tunables.7.xml
index a6ef435354510a327b02bad9bc7433bc3f47fe3b..38f0069f0549999bfd78b54f3041be339423188b 100644 (file)
--- a/ctdb/doc/ctdb-tunables.7.xml
+++ b/ctdb/doc/ctdb-tunables.7.xml
@@ -281,25 +281,6 @@
       </para>
     </refsect2>
 
-    <refsect2>
-      <title>MaxRedirectCount</title>
-      <para>Default: 3</para>
-      <para>
-       If we are not the DMASTER and need to fetch a record across the
-       network we first send the request to the LMASTER after which the
-       record is passed onto the current DMASTER. If the DMASTER changes
-       before the request has reached that node, the request will be
-       passed onto the "next" DMASTER. For very hot records that migrate
-       rapidly across the cluster this can cause a request to "chase"
-       the record for many hops before it catches up with the record.
-      </para>
-      <para>
-       When chasing a record, this is how many hops we will chase
-       the record for before going back to the LMASTER to ask for
-       new guidance.
-      </para>
-    </refsect2>
-
     <refsect2>
       <title>MonitorInterval</title>
       <para>Default: 15</para>

diff --git a/ctdb/server/ctdb_tunables.c b/ctdb/server/ctdb_tunables.c
index 0cc7be3ad063bbba5778dff4f4d09bd990062e8d..db130d0152e42cfce3f777631e654c6ddc109c25 100644 (file)
--- a/ctdb/server/ctdb_tunables.c
+++ b/ctdb/server/ctdb_tunables.c
@@ -35,7 +35,7 @@ static const struct {
        size_t offset;
        bool obsolete;
 } tunable_map[] = {
-       { "MaxRedirectCount",     3,  offsetof(struct ctdb_tunable_list, max_redirect_count), false },
+       { "MaxRedirectCount",     3,  offsetof(struct ctdb_tunable_list, max_redirect_count), true },
        { "SeqnumInterval",      1000,  offsetof(struct ctdb_tunable_list, seqnum_interval), false },
        { "ControlTimeout",      60, offsetof(struct ctdb_tunable_list, control_timeout), false },
        { "TraverseTimeout",     20, offsetof(struct ctdb_tunable_list, traverse_timeout), false },