From f822d014afa5a48a0335bd5babd97ecf137d9e76 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 14 Feb 2018 11:25:25 +0100 Subject: bin/build-master-status-from-mysql: should take sanity-check lock (so it currently cannot be run in parallel with sanity-check) --- bin/build-master-status-from-mysql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin/build-master-status-from-mysql') diff --git a/bin/build-master-status-from-mysql b/bin/build-master-status-from-mysql index cd85156..7a6605a 100755 --- a/bin/build-master-status-from-mysql +++ b/bin/build-master-status-from-mysql @@ -11,8 +11,8 @@ tmp_dir=$(mktemp -d 'tmp.build-master-status-from-mysql.XXXXXXXXXX' --tmpdir) trap 'rm -rf --one-file-system "${tmp_dir}"' EXIT # always block if locked -exec 9> "${build_list_lock_file}" -if ! flock -n -s 9; then +exec 9> "${sanity_check_lock_file}" +if ! flock -n 9; then >&2 echo 'Mysql-Sanity check skipped, cannot acquire lock.' exit fi -- cgit v1.2.3-70-g09d2