brett/Zordon
1
0
Fork 0
mirror of https://github.com/blw1138/Zordon.git synced 2025-12-17 08:48:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue where jobs would get stuck waiting for subjobs to finish

Browse Source
This commit is contained in:
Brett Williams
2023-06-16 01:42:54 -05:00
parent 76e413c18d
commit 9791715b25
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/server/api_server.py
View File

@@ -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.start_frame = max(server_data['frame_range'][0], worker.start_frame)
worker.end_frame = min(server_data['frame_range'][-1], worker.end_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}") 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. # check that job posts were all successful.
if not all(d.get('submission_results') is not None for d in subjob_servers): 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 # start subjobs
logger.debug(f"Starting {len(subjob_servers) - 1} attempted subjobs") logger.debug(f"Starting {len(subjob_servers) - 1} attempted subjobs")
for server_data in subjob_servers: 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}]" worker.name = f"{worker.name}[{worker.start_frame}-{worker.end_frame}]"
except Exception as e: except Exception as e: