Merge branch 'master' into benc-flake8-bugbear

Parsl · Oct 26, 2023 · 8a4c5fa · 8a4c5fa
2 parents 3321067 + eeb8952
commit 8a4c5fa
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/parsl/executors/taskvine/executor.py b/parsl/executors/taskvine/executor.py
@@ -643,14 +643,22 @@ def _collect_taskvine_results(self):
                         with open(task_report.result_file, 'rb') as f_in:
                             result = deserialize(f_in.read())
                     except Exception as e:
-                        logger.debug(f'Cannot load result from result file {task_report.result_file}. Exception: {e}')
-                        future.set_exception(TaskVineTaskFailure('Cannot load result from result file', None))
+                        logger.error(f'Cannot load result from result file {task_report.result_file}. Exception: {e}')
+                        ex = TaskVineTaskFailure('Cannot load result from result file', None)
+                        ex.__cause__ = e
+                        future.set_exception(ex)
                     else:
-                        future.set_result(result)
+                        if isinstance(result, Exception):
+                            ex = TaskVineTaskFailure('Task execution raises an exception', result)
+                            ex.__cause__ = result
+                            future.set_exception(ex)
+                        else:
+                            future.set_result(result)
                 else:
                     # If there are no results, then the task failed according to one of
                     # taskvine modes, such as resource exhaustion.
-                    future.set_exception(TaskVineTaskFailure(task_report.reason, None))
+                    ex = TaskVineTaskFailure(task_report.reason, None)
+                    future.set_exception(ex)
 
                 # decrement outstanding task counter
                 with self._outstanding_tasks_lock: