Skip to content

Commit 826daf5

Browse files
committed
Miyabi platform fully finctional, but issue of None has no 'set' attribute persiste here, need to be fixed before merging
1 parent 6075bd7 commit 826daf5

File tree

8 files changed

+232
-318
lines changed

8 files changed

+232
-318
lines changed

autosubmit/autosubmit.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2283,7 +2283,8 @@ def refresh_log_recovery_process(platforms: list[Platform], as_conf: AutosubmitC
22832283
if not p.log_recovery_process or not p.log_recovery_process.is_alive():
22842284
p.clean_log_recovery_process()
22852285
p.spawn_log_retrieval_process(as_conf)
2286-
p.work_event.set()
2286+
if p.work_event:
2287+
p.work_event.set()
22872288

22882289
@staticmethod
22892290
def run_experiment(expid: str, start_time: Optional[str] = None, start_after: Optional[str] = None,
@@ -2436,9 +2437,9 @@ def run_experiment(expid: str, start_time: Optional[str] = None, start_after: Op
24362437
job_list.save()
24372438
as_conf.save()
24382439
time.sleep(safetysleeptime)
2439-
except AutosubmitError as e: # If an error is detected, restore all connections and job_list
2440-
Log.error(f"Trace: {e.trace}")
2441-
Log.error(f"{e.message} [eCode={e.code}]")
2440+
except AutosubmitError as ae: # If an error is detected, restore all connections and job_list
2441+
Log.error(f"Trace: {ae.trace}")
2442+
Log.error(f"{ae.message} [eCode={ae.code}]")
24422443
# No need to wait until the remote platform reconnection
24432444
recovery = False
24442445
as_conf = AutosubmitConfig(expid, BasicConfig, YAMLParserFactory())
@@ -2509,8 +2510,9 @@ def run_experiment(expid: str, start_time: Optional[str] = None, start_after: Op
25092510
except BaseException:
25102511
reconnected = False
25112512
if recovery_retrials == max_recovery_retrials and max_recovery_retrials > 0:
2512-
raise AutosubmitCritical(f"Autosubmit Encounter too much errors during running time, limit of {max_recovery_retrials*120} reached",
2513-
7051, e.message)
2513+
raise AutosubmitCritical(
2514+
f"Autosubmit Encounter too much errors during running time, limit of {max_recovery_retrials * 120} reached",
2515+
7051, ae.message)
25142516
except AutosubmitCritical as e: # Critical errors can't be recovered. Failed configuration or autosubmit error
25152517
raise AutosubmitCritical(e.message, e.code, e.trace)
25162518
except BaseException:

autosubmit/config/configcommon.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -831,6 +831,7 @@ def parse_data_loops(self, experiment_data):
831831
last_data_section[key] = value[name_index]
832832
pass
833833
except IndexError as e:
834+
Log.warning("Found TRACE in parse_data_loops 838 [2]")
834835
Log.printlog(f"A job has an issue related to a FOR configuration. \n Please revise that the"
835836
f" number of elements matches, or if there is an unintended indentation."
836837
f"\n Trace: {str(e)}", Log.ERROR)
@@ -2496,7 +2497,7 @@ def get_notifications(self) -> str:
24962497

24972498
# based on https://github.com/cbirajdar/properties-to-yaml-converter/blob/master/properties_to_yaml.py
24982499
@staticmethod
2499-
def ini_to_yaml(root_dir: Path, ini_file: Path) -> None:
2500+
def ini_to_yaml(root_dir: Path, ini_file: str) -> None:
25002501
# Based on http://stackoverflow.com/a/3233356
25012502
def update_dict(original_dict: dict, updated_dict: collections.abc.Mapping) -> dict:
25022503
for k, v in updated_dict.items():

0 commit comments

Comments
 (0)