From 8ff3a370205980e8ab47e76488fb661eb81ec282 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Mon, 2 Apr 2018 22:12:57 +0200 Subject: lib/mysql-functions: mysql_cleanup: remove last_action from build_slaves without an assignment, too --- lib/mysql-functions | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/mysql-functions b/lib/mysql-functions index 0625616..a1e5a64 100755 --- a/lib/mysql-functions +++ b/lib/mysql-functions @@ -863,15 +863,17 @@ mysql_cleanup() { fi printf ' WHERE `build_slaves`.`currently_building` IS NOT NULL' printf ' AND TIMEDIFF(NOW(),`build_slaves`.`last_connection`) > "1:00:00";\n' - # remove `logged_lines` from buildslaves without an assignment + # remove `last_action` and `logged_lines` from buildslaves without an assignment if [ "${operator}" = 'DELETE' ]; then printf 'UPDATE `build_slaves`' - printf ' SET `build_slaves`.`logged_lines`=NULL' + printf ' SET `build_slaves`.`last_action`=NULL,' + printf ' `build_slaves`.`logged_lines`=NULL' else printf 'SELECT COUNT(*) FROM `build_slaves`' fi printf ' WHERE `build_slaves`.`currently_building` IS NULL' - printf ' AND `build_slaves`.`logged_lines` IS NOT NULL;\n' + printf ' AND (`build_slaves`.`last_action` IS NOT NULL' + printf ' OR `build_slaves`.`logged_lines` IS NOT NULL);\n' for partition in $(seq 0 $((mysql_files_table_partitions-1))); do # remove obsolete file_providers printf '%s FROM `file_providers` PARTITION (p%s)' \ -- cgit v1.2.3-54-g00ecf