From 66d06f2e7a7a0c851a0448a40ae20d8bee1c0ab3 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Sat, 3 Dec 2016 00:15:46 +0100 Subject: merge_sth: Don't try to go back in time. Due to a recent change in get_nfetched(), merge_sth lacking the 'sth' file could go back to a tree size of zero. It's rejected by frontend nodes with a newer tree, but it's still a severe error to produce that piece of data. We add tools/initlog.py which creates an 'sth' file with tree size 0 and have tests invoke it after starting the erlang nodes, before starting the continous merge processes. --- test/scripts/continuous-merge-test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test/scripts/continuous-merge-test.sh') diff --git a/test/scripts/continuous-merge-test.sh b/test/scripts/continuous-merge-test.sh index 3bb6de2..1e944b6 100755 --- a/test/scripts/continuous-merge-test.sh +++ b/test/scripts/continuous-merge-test.sh @@ -5,12 +5,13 @@ set -o errexit top_srcdir=$(cd $(dirname $0)/../..; pwd) -. ${top_srcdir}/test/test.shvars +. ${top_srcdir}/test/scripts/testutils.sh SCRIPTS=${top_srcdir}/test/scripts tests_start() { ${SCRIPTS}/light-system-test-start.sh + init_log ${SCRIPTS}/continuous-merge-start.sh & } -- cgit v1.1