From bc3041f1271c1ff87d251bdf3886888b380349b0 Mon Sep 17 00:00:00 2001 From: dbeltran Date: Thu, 13 Jun 2024 08:36:08 +0200 Subject: [PATCH 1/2] Changelog --- CHANGELOG | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 0947279a6..e83498ae5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,12 @@ -4.1.7 - X11, Migrate, script and Bug fixes +4.1.8 - Bug fixes. +===================== +- Fixed an issue with a socket connection left open. +- Fixed an issue with log recovery being disabled by default. +- Added exclusive parameter +- Fixed some X11 routines called by default + + +4.1.7 - X11, Migrate, script and Bug fixes ===================================== - Migrate added, a feature to change the ownership of the experiments (/scratch and autosubmit_data paths) - X11 added ( If you have to use an older version, after using this one. Autosubmit will complain until you perform create -f and recovery) -- GitLab From caf1d82efcc923107533928aa97d300d79be48fc Mon Sep 17 00:00:00 2001 From: Edgar Garriga Date: Wed, 3 Jul 2024 10:17:54 +0200 Subject: [PATCH 2/2] replce .conf to .yml on comments/messages fix messages fix consistency --- README.md | 8 ++++---- autosubmit/job/job_list.py | 2 +- autosubmit/job/job_packager.py | 2 +- autosubmit/platforms/paramiko_platform.py | 6 +++--- autosubmit/platforms/paramiko_submitter.py | 2 +- autosubmit/platforms/pjmplatform.py | 2 +- autosubmit/platforms/platform.py | 2 +- autosubmit/platforms/slurmplatform.py | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 7a948547d..c0d2768d9 100644 --- a/README.md +++ b/README.md @@ -70,13 +70,13 @@ HOW TO USE AUTOSUBMIT Say for example, "cxxx" is 4 character based expid generated by system automatically. First character is a letter, the other three alfa-numeric characters allow to identify uniquely the experiment. -> vi /cfu/autosubmit/cxxx/conf/expdef_cxxx.conf +> vi /cfu/autosubmit/cxxx/conf/expdef_cxxx.yml -> vi /cfu/autosubmit/cxxx/conf/autosubmit_cxxx.conf +> vi /cfu/autosubmit/cxxx/conf/autosubmit_cxxx.yml -> vi /cfu/autosubmit/cxxx/conf/platforms_cxxx.conf +> vi /cfu/autosubmit/cxxx/conf/platforms_cxxx.yml -> vi /cfu/autosubmit/cxxx/conf/jobs_cxxx.conf +> vi /cfu/autosubmit/cxxx/conf/jobs_cxxx.yml > autosubmit create cxxx diff --git a/autosubmit/job/job_list.py b/autosubmit/job/job_list.py index d369aae7e..f334bb1b0 100644 --- a/autosubmit/job/job_list.py +++ b/autosubmit/job/job_list.py @@ -309,7 +309,7 @@ class JobList(object): self._ordered_jobs_by_date_member[wrapper_section] = {} except BaseException as e: raise AutosubmitCritical( - "Some section jobs of the wrapper:{0} are not in the current job_list defined in jobs.conf".format( + "Some section jobs of the wrapper:{0} are missing from your JOBS definition in YAML".format( wrapper_section), 7014, str(e)) # divide job_list per platform name job_list_per_platform = self.split_by_platform() diff --git a/autosubmit/job/job_packager.py b/autosubmit/job/job_packager.py index a79fd60fb..761f3ccd0 100644 --- a/autosubmit/job/job_packager.py +++ b/autosubmit/job/job_packager.py @@ -325,7 +325,7 @@ class JobPackager(object): def error_message_policy(self,min_h,min_v,wrapper_limits,wallclock_sum,balanced): message = f"Wrapper couldn't be formed under {self.wrapper_policy[self.current_wrapper_section]} POLICY due minimum limit not being reached: [wrappable:{wrapper_limits['min']} < defined_min:{min_h*min_v}] [wrappable_h:{min_h} < defined_min_h:{wrapper_limits['min_h']}]|[wrappeable_v:{min_v} < defined_min_v:{wrapper_limits['min_v']}] " if min_v > 1: - message += f"\nCheck your configuration: Check if current {wallclock_sum} vertical wallclock has reached the max defined on platforms.conf." + message += f"\nCheck your configuration: Check if current {wallclock_sum} vertical wallclock has reached the max defined on PLATFORMS definition in YAML." else: message += "\nCheck your configuration: Only jobs_in_wrappers are active, check your jobs_in_wrapper dependencies." if not balanced: diff --git a/autosubmit/platforms/paramiko_platform.py b/autosubmit/platforms/paramiko_platform.py index 7dda872db..ca77ae39a 100644 --- a/autosubmit/platforms/paramiko_platform.py +++ b/autosubmit/platforms/paramiko_platform.py @@ -170,7 +170,7 @@ class ParamikoPlatform(Platform): pass retry += 1 if not self.connected: - trace = 'Can not create ssh or sftp connection to {0}: Connection could not be established to platform {1}\n Please, check your expid platform.conf to see if there are mistakes in the configuration\n Also Ensure that the login node listed on HOST parameter is available(try to connect via ssh on a terminal)\n Also you can put more than one host using a comma as separator'.format( + trace = 'Can not create ssh or sftp connection to {0}: Connection could not be established to platform {1}\n Please, check your expid on the PLATFORMS definition in YAML to see if there are mistakes in the configuration\n Also Ensure that the login node listed on HOST parameter is available(try to connect via ssh on a terminal)\n Also you can put more than one host using a comma as separator'.format( self.host, self.name) raise AutosubmitCritical( 'Experiment cant no continue without unexpected behaviour, Stopping Autosubmit', 7050, trace) @@ -320,7 +320,7 @@ class ParamikoPlatform(Platform): except BaseException as e: self.connected = False if "Authentication failed." in str(e): - raise AutosubmitCritical("Authentication Failed, please check the platform.conf of {0}".format( + raise AutosubmitCritical("Authentication Failed, please check the definition of PLATFORMS in YAML of {0}".format( self._host_config['hostname']), 7050, str(e)) if not reconnect and "," in self._host_config['hostname']: self.restore_connection(as_conf) @@ -464,7 +464,7 @@ class ParamikoPlatform(Platform): os.path.join(self.get_files_path(), filename))) if str(e).lower().find("garbage") != -1: raise AutosubmitCritical( - "Wrong User or invalid .ssh/config. Or invalid user in platform.conf or public key not set ", 7051, str(e)) + "Wrong User or invalid .ssh/config. Or invalid user in the definition of PLATFORMS in YAML or public key not set ", 7051, str(e)) def move_file(self, src, dest, must_exist=False): """ diff --git a/autosubmit/platforms/paramiko_submitter.py b/autosubmit/platforms/paramiko_submitter.py index 4ee256be2..dffb013ab 100644 --- a/autosubmit/platforms/paramiko_submitter.py +++ b/autosubmit/platforms/paramiko_submitter.py @@ -215,7 +215,7 @@ class ParamikoSubmitter(Submitter): platforms[section] = remote_platform except Exception as e: - raise_message = "Error in platform.conf: SCRATCH_DIR, PROJECT, USER, EXPID must be defined for platform {0}".format(section) + raise_message = "Error in the definition of PLATFORM in YAML: SCRATCH_DIR, PROJECT, USER, EXPID must be defined for platform {0}".format(section) # Executes update_cmds() from corresponding Platform Object # Save platform into result dictionary diff --git a/autosubmit/platforms/pjmplatform.py b/autosubmit/platforms/pjmplatform.py index c8f520258..086861654 100644 --- a/autosubmit/platforms/pjmplatform.py +++ b/autosubmit/platforms/pjmplatform.py @@ -123,7 +123,7 @@ class PJMPlatform(ParamikoPlatform): if job_tmp.section not in error_msg: error_msg += job_tmp.section + "&" if has_trace_bad_parameters: - error_message+="Check job and queue specified in jobs.conf. Sections that could be affected: {0}".format(error_msg[:-1]) + error_message+="Check job and queue specified in your JOBS defintion in YAML. Sections that could be affected: {0}".format(error_msg[:-1]) else: error_message+="\ncheck that {1} platform has set the correct scheduler. Sections that could be affected: {0}".format( error_msg[:-1], self.name) diff --git a/autosubmit/platforms/platform.py b/autosubmit/platforms/platform.py index 5ccf6e91e..4722ccf87 100644 --- a/autosubmit/platforms/platform.py +++ b/autosubmit/platforms/platform.py @@ -331,7 +331,7 @@ class Platform(object): if job_tmp.section not in error_msg: error_msg += job_tmp.section + "&" if e.message.lower().find("bad parameters") != -1: - error_message += "\ncheck job and queue specified in jobs.conf. Sections that could be affected: {0}".format( + error_message += "\ncheck job and queue specified in your JOBS defintion in YAML. Sections that could be affected: {0}".format( error_msg[:-1]) else: error_message += "\ncheck that {1} platform has set the correct scheduler. Sections that could be affected: {0}".format( diff --git a/autosubmit/platforms/slurmplatform.py b/autosubmit/platforms/slurmplatform.py index 970ee6916..8b1330eee 100644 --- a/autosubmit/platforms/slurmplatform.py +++ b/autosubmit/platforms/slurmplatform.py @@ -135,7 +135,7 @@ class SlurmPlatform(ParamikoPlatform): if job_tmp.section not in error_msg: error_msg += job_tmp.section + "&" if has_trace_bad_parameters: - error_message+="Check job and queue specified in jobs.conf. Sections that could be affected: {0}".format(error_msg[:-1]) + error_message+="Check job and queue specified in your JOBS defintion in YAML. Sections that could be affected: {0}".format(error_msg[:-1]) else: error_message+="\ncheck that {1} platform has set the correct scheduler. Sections that could be affected: {0}".format( error_msg[:-1], self.name) -- GitLab