The branch, master has been updated
via 19ed816 ctdb-tests: Stop cross-talk between reclock tests
from 5462a1e VERSION: Bump version up to 4.6.0pre1
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 19ed8165bbe374e1ea277fd4dd5a65ee932b4f05
Author: Martin Schwenke <[email protected]>
Date: Mon Aug 1 14:07:04 2016 +1000
ctdb-tests: Stop cross-talk between reclock tests
On a busy system the backgrounded counter reset can survive into the
next test and interfere with its result.
To avoid this, wait until all forks of 01.reclock exit before
continuing on to the next test.
Signed-off-by: Martin Schwenke <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Mon Aug 1 17:53:27 CEST 2016 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
ctdb/tests/eventscripts/scripts/local.sh | 11 +++++++++++
1 file changed, 11 insertions(+)
Changeset truncated at 500 lines:
diff --git a/ctdb/tests/eventscripts/scripts/local.sh
b/ctdb/tests/eventscripts/scripts/local.sh
index 7f6c91d..61a033a 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -1132,10 +1132,21 @@ program $_rpc_service${_ver:+ version }${_ver} is not
available"
# Recovery lock fakery
+cleanup_reclock ()
+{
+ _pattern="${script_dir}/${script}"
+ while pgrep -f "$_pattern" >/dev/null ; do
+ echo "Waiting for backgrounded ${script} to exit..."
+ (FAKE_SLEEP_REALLY=yes sleep 1)
+ done
+}
+
setup_reclock ()
{
CTDB_RECOVERY_LOCK=$(mktemp --tmpdir="$EVENTSCRIPTS_TESTS_VAR_DIR")
export CTDB_RECOVERY_LOCK
+
+ test_cleanup cleanup_reclock
}
######################################################################
--
Samba Shared Repository
