From: Martin Schwenke <martin@meltin.net>
Date: Wed, 2 Oct 2019 07:52:31 +0000 (+1000)
Subject: ctdb-common: Mark VacuumLimit tunable as obsolete
X-Git-Tag: talloc-2.3.1~498
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c54f6df7164d6263624a1ed72485bf4e6690bb6;p=thirdparty%2Fsamba.git

ctdb-common: Mark VacuumLimit tunable as obsolete

Use of this tunable was dropped over 5 years ago in commit
16837bc309aa9a86fc21d7f59a8fce0b947428a3.

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

Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Fri Oct  4 07:07:21 UTC 2019 on sn-devel-184
---

diff --git a/ctdb/common/tunable.c b/ctdb/common/tunable.c
index 8d475858c5f..70412b7f979 100644
--- a/ctdb/common/tunable.c
+++ b/ctdb/common/tunable.c
@@ -105,7 +105,7 @@ static struct {
 		offsetof(struct ctdb_tunable_list, vacuum_max_run_time) },
 	{ "RepackLimit", 10*1000, false,
 		offsetof(struct ctdb_tunable_list, repack_limit) },
-	{ "VacuumLimit", 5*1000, false,
+	{ "VacuumLimit", 5*1000, true,
 		offsetof(struct ctdb_tunable_list, vacuum_limit) },
 	{ "VacuumFastPathCount", 60, false,
 		offsetof(struct ctdb_tunable_list, vacuum_fast_path_count) },
diff --git a/ctdb/doc/ctdb-tunables.7.xml b/ctdb/doc/ctdb-tunables.7.xml
index 191bcaffe46..289b1d7324b 100644
--- a/ctdb/doc/ctdb-tunables.7.xml
+++ b/ctdb/doc/ctdb-tunables.7.xml
@@ -574,10 +574,6 @@ MonitorInterval=20
         <varname>RepackLimit</varname>, then the database is repacked
         to get rid of the freelist records to avoid fragmentation.
       </para>
-      <para>
-        Databases are repacked only if both <varname>RepackLimit</varname>
-        and <varname>VacuumLimit</varname> are exceeded.
-      </para>
     </refsect2>
 
     <refsect2>
@@ -683,20 +679,6 @@ MonitorInterval=20
       </para>
     </refsect2>
 
-    <refsect2>
-      <title>VacuumLimit</title>
-      <para>Default: 5000</para>
-      <para>
-        During vacuuming, if the number of deleted records are more than
-        <varname>VacuumLimit</varname>, then databases are repacked to
-        avoid fragmentation.
-      </para>
-      <para>
-        Databases are repacked only if both <varname>RepackLimit</varname>
-        and <varname>VacuumLimit</varname> are exceeded.
-      </para>
-    </refsect2>
-
     <refsect2>
       <title>VacuumMaxRunTime</title>
       <para>Default: 120</para>
diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml
index 157dfad9dc1..e355752d1db 100644
--- a/ctdb/doc/ctdb.1.xml
+++ b/ctdb/doc/ctdb.1.xml
@@ -809,7 +809,6 @@ RecoveryDropAllIPs      = 120
 VacuumInterval          = 10
 VacuumMaxRunTime        = 120
 RepackLimit             = 10000
-VacuumLimit             = 5000
 VacuumFastPathCount     = 60
 MaxQueueDropMsg         = 1000000
 AllowUnhealthyDBRead    = 0
diff --git a/ctdb/doc/examples/config_migrate.sh b/ctdb/doc/examples/config_migrate.sh
index e0d01e77057..8983105f1c9 100755
--- a/ctdb/doc/examples/config_migrate.sh
+++ b/ctdb/doc/examples/config_migrate.sh
@@ -323,7 +323,6 @@ TickleUpdateInterval
 TraverseTimeout
 VacuumFastPathCount
 VacuumInterval
-VacuumLimit
 VacuumMaxRunTime
 VerboseMemoryNames
 EOF
@@ -336,6 +335,7 @@ check_removed_tunable ()
 
 	grep -Fiqx "$_tunable" <<EOF
 NoIPHostOnAllDisabled
+VacuumLimit
 EOF
 }
 
diff --git a/ctdb/tests/UNIT/tool/ctdb.listvars.001.sh b/ctdb/tests/UNIT/tool/ctdb.listvars.001.sh
index a304942af43..88f0fa4daec 100755
--- a/ctdb/tests/UNIT/tool/ctdb.listvars.001.sh
+++ b/ctdb/tests/UNIT/tool/ctdb.listvars.001.sh
@@ -41,7 +41,6 @@ RecoveryDropAllIPs         = 120
 VacuumInterval             = 10
 VacuumMaxRunTime           = 120
 RepackLimit                = 10000
-VacuumLimit                = 5000
 VacuumFastPathCount        = 60
 MaxQueueDropMsg            = 1000000
 AllowUnhealthyDBRead       = 0