diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2013-07-08 15:49:58 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-07-10 14:33:18 +1000 |
| commit | d46c24f4d090b24bdbe551f44a5f5c3b3f651fdc (patch) | |
| tree | 52e4a6bb3a2f298e97431054cbd619dcc0fd4e75 | |
| parent | ae0afad8ee1176099cfd14676e553251fe58b4c7 (diff) | |
| download | samba-d46c24f4d090b24bdbe551f44a5f5c3b3f651fdc.tar.gz samba-d46c24f4d090b24bdbe551f44a5f5c3b3f651fdc.tar.xz samba-d46c24f4d090b24bdbe551f44a5f5c3b3f651fdc.zip | |
ctdbd: No need for DeadlockTimeout tunable
The code for deadlock detection and killing smbd process causing deadlock
has been removed and replaced with external debug script.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
(This used to be ctdb commit 2211cd94bea266547d3e6f167d3160a6b23bec88)
| -rw-r--r-- | ctdb/doc/ctdbd.1.xml | 16 | ||||
| -rw-r--r-- | ctdb/include/ctdb_private.h | 1 | ||||
| -rw-r--r-- | ctdb/server/ctdb_tunables.c | 1 |
3 files changed, 0 insertions, 18 deletions
diff --git a/ctdb/doc/ctdbd.1.xml b/ctdb/doc/ctdbd.1.xml index dd5e732f9f0..1053d9b2c5c 100644 --- a/ctdb/doc/ctdbd.1.xml +++ b/ctdb/doc/ctdbd.1.xml @@ -1086,22 +1086,6 @@ </para> </refsect2> - <refsect2><title>DeadlockTimeout</title> - <para>Default: 60</para> - <para> - Number of seconds to determine if ctdb is in deadlock with samba. - </para> - <para> - When ctdb daemon is blocked waiting for a lock on a database which is - blocked by some other process, ctdb logs a warning every 10 seconds. Most - often this is caused by samba locking databases and waiting on ctdb and - result in a deadlock. If the lock is not obtained by ctdb before deadlock - timeout expires, ctdb will detect it as a deadlock and terminate the - blocking samba process. Setting this value to 0 disables deadlock - detection. - </para> - </refsect2> - <refsect2><title>Samba3AvoidDeadlocks</title> <para>Default: 0</para> <para> diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index b7f6db7ec85..b3d98d910dc 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -136,7 +136,6 @@ struct ctdb_tunable { uint32_t db_size_warn; uint32_t pulldb_preallocation_size; uint32_t no_ip_host_on_all_disabled; - uint32_t deadlock_timeout; uint32_t samba3_hack; }; diff --git a/ctdb/server/ctdb_tunables.c b/ctdb/server/ctdb_tunables.c index 365c6ba5584..7d06d831a24 100644 --- a/ctdb/server/ctdb_tunables.c +++ b/ctdb/server/ctdb_tunables.c @@ -85,7 +85,6 @@ static const struct { { "DBSizeWarn", 100000000, offsetof(struct ctdb_tunable, db_size_warn), false }, { "PullDBPreallocation", 10*1024*1024, offsetof(struct ctdb_tunable, pulldb_preallocation_size), false }, { "NoIPHostOnAllDisabled", 0, offsetof(struct ctdb_tunable, no_ip_host_on_all_disabled), false }, - { "DeadlockTimeout", 300, offsetof(struct ctdb_tunable, deadlock_timeout), false }, { "Samba3AvoidDeadlocks", 0, offsetof(struct ctdb_tunable, samba3_hack), false }, }; |