Merge branch 'master' into 9352-many-nodes-make-workbench-faster

[arvados.git] / sdk / cwl / arvados_cwl / arvjob.py

diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py
index 397b6d58c06c6f35a33878954effbf5b9dad8f22..f129dfa80436451b0e0fc04dd0aef93df60f3417 100644 (file)
--- a/sdk/cwl/arvados_cwl/arvjob.py
+++ b/sdk/cwl/arvados_cwl/arvjob.py
@@ -26,6 +26,7 @@ class ArvadosJob(object):
     def __init__(self, runner):
         self.arvrunner = runner
         self.running = False
+        self.uuid = None
 
     def run(self, dry_run=False, pull_image=True, **kwargs):
         script_parameters = {
@@ -42,7 +43,7 @@ class ArvadosJob(object):
                     vwd.copy(rest, t, source_collection=src)
                 else:
                     with vwd.open(t, "w") as f:
-                        f.write(self.generatefiles[t])
+                        f.write(self.generatefiles[t].encode('utf-8'))
             vwd.save_new()
             for t in self.generatefiles:
                 script_parameters["task.vwd"][t] = "$(task.keep)/%s/%s" % (vwd.portable_data_hash(), t)
@@ -90,7 +91,7 @@ class ArvadosJob(object):
                 find_or_create=kwargs.get("enable_reuse", True)
             ).execute(num_retries=self.arvrunner.num_retries)
 
-            self.arvrunner.jobs[response["uuid"]] = self
+            self.arvrunner.processes[response["uuid"]] = self
 
             self.update_pipeline_component(response)
 
@@ -171,7 +172,7 @@ class ArvadosJob(object):
 
             self.output_callback(outputs, processStatus)
         finally:
-            del self.arvrunner.jobs[record["uuid"]]
+            del self.arvrunner.processes[record["uuid"]]
 
 
 class RunnerJob(Runner):
@@ -208,7 +209,7 @@ class RunnerJob(Runner):
         ).execute(num_retries=self.arvrunner.num_retries)
 
         self.uuid = response["uuid"]
-        self.arvrunner.jobs[self.uuid] = self
+        self.arvrunner.processes[self.uuid] = self
 
         logger.info("Submitted job %s", response["uuid"])