From 1c235e096d9b51c2ee228d8727eabf0020114b45 Mon Sep 17 00:00:00 2001 From: teastep Date: Wed, 24 Jul 2002 14:34:28 +0000 Subject: [PATCH] Document MUTEX_TIMEOUT in release notes and change log git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@153 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall/changelog.txt | 2 ++ Shorewall/releasenotes.txt | 17 +++++++++++++++++ Shorewall/shorewall.conf | 3 +++ 3 files changed, 22 insertions(+) diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 68130106e..17c61eeb4 100755 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -17,3 +17,5 @@ Changes since 1.3.4 7. Centralize the adding of IP aliases +8. Added MUTEX_TIMEOUT variable. + diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 285a4bd2e..af7501a9b 100755 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -14,3 +14,20 @@ In this release: 3. The time that the counters were last reset is now displayed in the heading of the 'status' and 'show' commands. +4. Added MUTEX_TIMEOUT variable in shorewall.conf and changed the way + in which Shorewall protects itself from concurrent state + changes. + + Previously, if a state-changing operation (like restart) + found a lock file, it would wait for 30 seconds for the lock file to + be removed. If the file was not removed within 30 seconds, a message + was issued and the operation was aborted. + + With the new code, the wait time is determined by the value of + MUTEX_TIMEOUT (default 60 seconds). If the file is not removed + within MUTEX_TIMEOUT, the state-changing operation will assume that + the lock file is stale and will issue a message and continue. + + An appopriate setting for MUTEX_TIMEOUT is twice the time that it takes + your firewall system to process a "shorewall restart" command. + diff --git a/Shorewall/shorewall.conf b/Shorewall/shorewall.conf index 394f8be06..8d68535ec 100755 --- a/Shorewall/shorewall.conf +++ b/Shorewall/shorewall.conf @@ -300,6 +300,9 @@ MERGE_HOSTS=Yes # that the last program to hold the lock died without releasing the lock. # # If not set or set to the empty value, a value of 60 (60 seconds) is assumed. +# +# An appropriate value for this parameter would be twice the length of time +# that it takes your firewall system to process a "shorewall restart" command. MUTEX_TIMEOUT=60