From 35b67857937a8b92b70ac147ebafc03f3d2cecf4 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 19 Jul 2019 13:36:39 +0200 Subject: bin/slave-build-connect: do not IGNORE on insert - there is no unique key being inserted anyways --- bin/slave-build-connect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/slave-build-connect b/bin/slave-build-connect index 13fcf18..e40dc32 100755 --- a/bin/slave-build-connect +++ b/bin/slave-build-connect @@ -47,7 +47,7 @@ if [ "x${SSH_ORIGINAL_COMMAND%% *}" = 'xget-assignment' ] || \ ssh_log_id=$( # shellcheck disable=SC2016 { - printf 'INSERT IGNORE INTO `ssh_log` (`build_slave`,`action`,`parameters`)' + printf 'INSERT INTO `ssh_log` (`build_slave`,`action`,`parameters`)' printf ' VALUES (%s' \ "${slave_id}" printf ',from_base64("%s")' \ -- cgit v1.2.3-54-g00ecf From 9543b27cf3737c8f2b52cf0b9824fd0c9fc0b595 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Fri, 19 Jul 2019 14:11:07 +0200 Subject: some increased waits after return-assignment --- bin/build-packages | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/build-packages b/bin/build-packages index a54287a..b6dad36 100755 --- a/bin/build-packages +++ b/bin/build-packages @@ -948,7 +948,7 @@ while [ "${count}" -ne 0 ] && \ ;; 1) >&2 echo '"return-assignment" was running already.' - wait_some_time 15 + wait_some_time 60 ;; 2) >&2 echo 'I was too slow, the package is outdated. I will continue ...' @@ -1011,7 +1011,7 @@ while [ "${count}" -ne 0 ] && \ ;; 1) >&2 echo '"return-assignment" was running already.' - wait_some_time 15 + wait_some_time 60 ;; 2) >&2 echo 'I was too slow, the package is outdated. I will continue ...' @@ -1049,7 +1049,7 @@ while [ "${count}" -ne 0 ] && \ >&2 echo 'get-assignment told me:' >&2 echo ' come back (shortly) later - I was running already' - wait_some_time 15 + wait_some_time 60 continue ;; -- cgit v1.2.3-54-g00ecf