ctdb-config: Change option "no realtime" option to "realtime scheduling"

Negative options can be confusing, so switch to a positive option.

This was supposed to be done months ago but was forgotten.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13589

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

diff --git a/ctdb/doc/ctdb.conf.5.xml b/ctdb/doc/ctdb.conf.5.xml
index bcb67b357959059d96d54a0a78635d9fa37ea31f..840d46d86a3a21b5e4f26b97ad2c042c6eb13ef5 100644 (file)
--- a/ctdb/doc/ctdb.conf.5.xml
+++ b/ctdb/doc/ctdb.conf.5.xml
@@ -436,17 +436,17 @@
       </varlistentry>
 
       <varlistentry>
-       <term>no realtime = true|false</term>
+       <term>realtime scheduling = true|false</term>
        <listitem>
          <para>
            Usually CTDB runs with real-time priority. This helps it
            to perform effectively on a busy system, such as when
            there are thousands of Samba clients. If you are running
            CTDB on a platform that does not support real-time
-           priority, you can set this to <literal>true</literal>.
+           priority, you can set this to <literal>false</literal>.
          </para>
          <para>
-           Default: <literal>false</literal>
+           Default: <literal>true</literal>
          </para>
        </listitem>
       </varlistentry>

diff --git a/ctdb/server/ctdb_config.c b/ctdb/server/ctdb_config.c
index 58bf975abfd95147899d4bfd6e6507770f823d16..1254a996b3b330cba74d585024cedafd59966637 100644 (file)
--- a/ctdb/server/ctdb_config.c
+++ b/ctdb/server/ctdb_config.c
@@ -88,8 +88,8 @@ static void setup_config_pointers(struct conf_context *conf)
 
        conf_assign_boolean_pointer(conf,
                                    LEGACY_CONF_SECTION,
-                                   LEGACY_CONF_NO_REALTIME,
-                                   &ctdb_config.no_realtime);
+                                   LEGACY_CONF_REALTIME_SCHEDULING,
+                                   &ctdb_config.realtime_scheduling);
        conf_assign_boolean_pointer(conf,
                                    LEGACY_CONF_SECTION,
                                    LEGACY_CONF_RECMASTER_CAPABILITY,

diff --git a/ctdb/server/ctdb_config.h b/ctdb/server/ctdb_config.h
index 51342a4a2698458b7fc26ca8f1072a47dbb1877f..1c06e83f6c705dda850cf470019f3634a28d2a08 100644 (file)
--- a/ctdb/server/ctdb_config.h
+++ b/ctdb/server/ctdb_config.h
@@ -38,7 +38,7 @@ struct ctdb_config {
        const char *event_debug_script;
 
        /* Legacy */
-       bool no_realtime;
+       bool realtime_scheduling;
        bool recmaster_capability;
        bool lmaster_capability;
        bool start_as_stopped;

diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index bfdc5e032eb342bb800cf846e54fad486482a476..ef829e5b2331d4d87bc41cb6bb8f6f388cf77398 100644 (file)
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -328,7 +328,7 @@ int main(int argc, const char *argv[])
                ctdb->capabilities &= ~CTDB_CAP_RECMASTER;
        }
 
-       ctdb->do_setsched = !ctdb_config.no_realtime;
+       ctdb->do_setsched = ctdb_config.realtime_scheduling;
 
        /*
         * Miscellaneous setup

diff --git a/ctdb/server/legacy_conf.c b/ctdb/server/legacy_conf.c
index c435dae3dfb1e9d4f6ce558c4118b331e3eb9a32..5be8da0dab02a2d446258446c08feb759b5eeead 100644 (file)
--- a/ctdb/server/legacy_conf.c
+++ b/ctdb/server/legacy_conf.c
@@ -54,8 +54,8 @@ void legacy_conf_init(struct conf_context *conf)
 
        conf_define_boolean(conf,
                            LEGACY_CONF_SECTION,
-                           LEGACY_CONF_NO_REALTIME,
-                           false,
+                           LEGACY_CONF_REALTIME_SCHEDULING,
+                           true,
                            NULL);
        conf_define_boolean(conf,
                            LEGACY_CONF_SECTION,

diff --git a/ctdb/server/legacy_conf.h b/ctdb/server/legacy_conf.h
index 6592b176df2fa5c8e91fb27f3d291c9afbeabfa9..5551f12d76c8278a99ecab0181787b1513e6da95 100644 (file)
--- a/ctdb/server/legacy_conf.h
+++ b/ctdb/server/legacy_conf.h
@@ -24,7 +24,7 @@
 
 #define LEGACY_CONF_SECTION "legacy"
 
-#define LEGACY_CONF_NO_REALTIME          "no realtime"
+#define LEGACY_CONF_REALTIME_SCHEDULING  "realtime scheduling"
 #define LEGACY_CONF_RECMASTER_CAPABILITY "recmaster capability"
 #define LEGACY_CONF_LMASTER_CAPABILITY   "lmaster capability"
 #define LEGACY_CONF_START_AS_STOPPED     "start as stopped"

diff --git a/ctdb/tests/cunit/config_test_001.sh b/ctdb/tests/cunit/config_test_001.sh
index a3ddaabc09b917bd1ba26a56b6dc6884399343cf..27e88888270c4d7617533b4ac18188c7d4adfadb 100755 (executable)
--- a/ctdb/tests/cunit/config_test_001.sh
+++ b/ctdb/tests/cunit/config_test_001.sh
@@ -43,7 +43,7 @@ ok <<EOF
 [event]
        # debug script = 
 [legacy]
-       # no realtime = false
+       # realtime scheduling = true
        # recmaster capability = true
        # lmaster capability = true
        # start as stopped = false

diff --git a/ctdb/tests/cunit/config_test_006.sh b/ctdb/tests/cunit/config_test_006.sh
index bfbd917221c457ccbc1346c2bbcc5913d0887168..d367cd48c2ef457bf9e071a4bcc97c80a60331b8 100755 (executable)
--- a/ctdb/tests/cunit/config_test_006.sh
+++ b/ctdb/tests/cunit/config_test_006.sh
@@ -19,9 +19,9 @@ cat > "$conffile" <<EOF
 EOF
 
 ok <<EOF
-false
+true
 EOF
-unit_test ctdb-config get "legacy" "no realtime"
+unit_test ctdb-config get "legacy" "realtime scheduling"
 
 ok <<EOF
 true