From 2bce9cb72f3ac7efc2f4f48b0cffa1876364ae8c Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Sun, 9 Jul 2017 16:20:11 +0200 Subject: [PATCH] ctdb: enable mutexes for volatile TDBs by default Bug: https://bugzilla.samba.org/show_bug.cgi?id=12891 Signed-off-by: Ralph Boehme Reviewed-by: Amitay Isaacs --- ctdb/common/tunable.c | 2 +- ctdb/config/ctdbd.conf | 2 +- ctdb/doc/ctdb-tunables.7.xml | 2 +- ctdb/doc/ctdb.1.xml | 2 +- ctdb/tests/tool/ctdb.listvars.001.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ctdb/common/tunable.c b/ctdb/common/tunable.c index ed7a52da153..14f6828bd15 100644 --- a/ctdb/common/tunable.c +++ b/ctdb/common/tunable.c @@ -145,7 +145,7 @@ static struct { offsetof(struct ctdb_tunable_list, no_ip_host_on_all_disabled) }, { "Samba3AvoidDeadlocks", 0, true, offsetof(struct ctdb_tunable_list, samba3_hack) }, - { "TDBMutexEnabled", 0, false, + { "TDBMutexEnabled", 1, false, offsetof(struct ctdb_tunable_list, mutex_enabled) }, { "LockProcessesPerDB", 200, false, offsetof(struct ctdb_tunable_list, lock_processes_per_db) }, diff --git a/ctdb/config/ctdbd.conf b/ctdb/config/ctdbd.conf index e75c65c7fd7..2d525c528fd 100644 --- a/ctdb/config/ctdbd.conf +++ b/ctdb/config/ctdbd.conf @@ -29,4 +29,4 @@ # CTDB_DEBUGLEVEL=ERR # Set some CTDB tunable variables during CTDB startup? -# CTDB_SET_TDBMutexEnabled=1 +# CTDB_SET_TDBMutexEnabled=0 diff --git a/ctdb/doc/ctdb-tunables.7.xml b/ctdb/doc/ctdb-tunables.7.xml index d0bb4508e24..7b059b75a9e 100644 --- a/ctdb/doc/ctdb-tunables.7.xml +++ b/ctdb/doc/ctdb-tunables.7.xml @@ -658,7 +658,7 @@ TDBMutexEnabled - Default: 0 + Default: 1 This parameter enables TDB_MUTEX_LOCKING feature on volatile databases if the robust mutexes are supported. This optimizes the diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml index 1af1f5048c5..3aceb7369ac 100644 --- a/ctdb/doc/ctdb.1.xml +++ b/ctdb/doc/ctdb.1.xml @@ -843,7 +843,7 @@ DBRecordSizeWarn = 10000000 DBSizeWarn = 100000000 PullDBPreallocation = 10485760 NoIPHostOnAllDisabled = 0 -TDBMutexEnabled = 0 +TDBMutexEnabled = 1 LockProcessesPerDB = 200 RecBufferSizeLimit = 1000000 QueueBufferSize = 1024 diff --git a/ctdb/tests/tool/ctdb.listvars.001.sh b/ctdb/tests/tool/ctdb.listvars.001.sh index f6010a45c77..fc8f42ce067 100755 --- a/ctdb/tests/tool/ctdb.listvars.001.sh +++ b/ctdb/tests/tool/ctdb.listvars.001.sh @@ -59,7 +59,7 @@ DBRecordSizeWarn = 10000000 DBSizeWarn = 100000000 PullDBPreallocation = 10485760 NoIPHostOnAllDisabled = 0 -TDBMutexEnabled = 0 +TDBMutexEnabled = 1 LockProcessesPerDB = 200 RecBufferSizeLimit = 1000000 QueueBufferSize = 1024 -- 2.34.1