From 9791715b25f043cc417fec76a4e0da3565b09894 Mon Sep 17 00:00:00 2001 From: Brett Williams Date: Fri, 16 Jun 2023 01:42:54 -0500 Subject: [PATCH] Fix issue where jobs would get stuck waiting for subjobs to finish --- lib/server/api_server.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/server/api_server.py b/lib/server/api_server.py index 093e6eb..98ccbfd 100755 --- a/lib/server/api_server.py +++ b/lib/server/api_server.py @@ -448,6 +448,7 @@ def create_subjobs(worker, job_data, project_path): worker.start_frame = max(server_data['frame_range'][0], worker.start_frame) worker.end_frame = min(server_data['frame_range'][-1], worker.end_frame) logger.info(f"Local job now rendering from {worker.start_frame} to {worker.end_frame}") + server_data['submission_results'] = worker.json() # check that job posts were all successful. if not all(d.get('submission_results') is not None for d in subjob_servers): @@ -456,7 +457,8 @@ def create_subjobs(worker, job_data, project_path): # start subjobs logger.debug(f"Starting {len(subjob_servers) - 1} attempted subjobs") for server_data in subjob_servers: - worker.children[server_data['hostname']] = server_data['results']['id'] + if server_data['hostname'] != local_hostname: + worker.children[server_data['hostname']] = server_data['submission_results']['id'] worker.name = f"{worker.name}[{worker.start_frame}-{worker.end_frame}]" except Exception as e: