From 7c16e42198249923606ffc01d69cfba82d09c20b Mon Sep 17 00:00:00 2001 From: Jonas Bardino Date: Wed, 24 Sep 2025 16:47:40 +0200 Subject: [PATCH 1/2] This is a WiP PR to address a number of old linting errors in mig/server/X.py modules. They trigger spurious linting errors e.g. for PR329 despite no real changes to the code there. --- mig/server/grid_events.py | 1 + mig/server/grid_ftps.py | 1 + mig/server/grid_openid.py | 1 + mig/server/grid_script.py | 1 + mig/server/grid_sftp.py | 1 + mig/server/grid_webdavs-3.x.py | 1 + 6 files changed, 6 insertions(+) diff --git a/mig/server/grid_events.py b/mig/server/grid_events.py index 5c4da0e53..c0694d9a7 100755 --- a/mig/server/grid_events.py +++ b/mig/server/grid_events.py @@ -2044,3 +2044,4 @@ def monitor(configuration, vgrid_name): logger.info('(%s) Event handler daemon shutting down' % main_pid) sys.exit(0) + diff --git a/mig/server/grid_ftps.py b/mig/server/grid_ftps.py index 8b845492a..738386565 100755 --- a/mig/server/grid_ftps.py +++ b/mig/server/grid_ftps.py @@ -619,3 +619,4 @@ def start_service(conf): info_msg = "Leaving with no more workers active" logger.info(info_msg) print(info_msg) + diff --git a/mig/server/grid_openid.py b/mig/server/grid_openid.py index d5517fa61..aeb18e2ec 100755 --- a/mig/server/grid_openid.py +++ b/mig/server/grid_openid.py @@ -1792,3 +1792,4 @@ def start_service(configuration): info_msg = "Leaving with no more workers active" logger.info(info_msg) print(info_msg) + diff --git a/mig/server/grid_script.py b/mig/server/grid_script.py index b48078f00..0f789af97 100755 --- a/mig/server/grid_script.py +++ b/mig/server/grid_script.py @@ -1742,3 +1742,4 @@ def graceful_shutdown(): sys.stdout.flush() loop_counter += 1 logger.debug('loop ended') + diff --git a/mig/server/grid_sftp.py b/mig/server/grid_sftp.py index 197be7521..a2240f255 100755 --- a/mig/server/grid_sftp.py +++ b/mig/server/grid_sftp.py @@ -2135,3 +2135,4 @@ def start_service(configuration): info_msg = "Leaving with no more workers active" logger.info(info_msg) print(info_msg) + diff --git a/mig/server/grid_webdavs-3.x.py b/mig/server/grid_webdavs-3.x.py index 3de1ece31..297f5710c 100755 --- a/mig/server/grid_webdavs-3.x.py +++ b/mig/server/grid_webdavs-3.x.py @@ -2139,3 +2139,4 @@ def run(configuration): except Exception as exc: logger.error("exiting on unexpected exception: %s" % exc) logger.info(traceback.format_exc()) + From 54af4b65a566386a3aec5b33c528a8d06b8a2c08 Mon Sep 17 00:00:00 2001 From: Jonas Bardino Date: Mon, 13 Oct 2025 13:18:58 +0200 Subject: [PATCH 2/2] Cherry-pick fix for grid_script pylint warning. --- mig/server/grid_script.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mig/server/grid_script.py b/mig/server/grid_script.py index 0f789af97..aa490a3bd 100755 --- a/mig/server/grid_script.py +++ b/mig/server/grid_script.py @@ -4,7 +4,7 @@ # --- BEGIN_HEADER --- # # grid_script - the core job handling daemon on a MiG server -# Copyright (C) 2003-2023 The MiG Project lead by Brian Vinter +# Copyright (C) 2003-2025 The MiG Project by the Science HPC Center at UCPH # # This file is part of MiG. # @@ -20,7 +20,8 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. # # -- END_HEADER --- # @@ -693,11 +694,9 @@ def graceful_shutdown(): exe_job = \ executing_queue.get_job_by_id(job_dict['JOB_ID' ]) + # Ignore missing fields + (last_res, last_exe) = ('', '') if exe_job: - - # Ignore missing fields - - (last_res, last_exe) = ('', '') if 'UNIQUE_RESOURCE_NAME' in exe_job: last_res = exe_job['UNIQUE_RESOURCE_NAME'] if 'EXE' in exe_job: @@ -799,7 +798,8 @@ def graceful_shutdown(): vgrids_in_prioritized_order = [] - list_indices = [(last_vgrid + i) % len(exe_vgrids) for i in range(len(exe_vgrids))] + list_indices = [(last_vgrid + i) % len(exe_vgrids) + for i in range(len(exe_vgrids))] for index in list_indices: # replace "" with default_vgrid