[ARVADOS] updated: 2.1.0-2363-gc22d90571

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/arvcontainer.py |  2 +-
 sdk/cwl/arvados_cwl/executor.py     | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

       via  c22d90571a1fcb4b52e5387a791e3aefff5be6af (commit)
      from  96f176d43e03de4ba9dbb8a446a9339cb5032cec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c22d90571a1fcb4b52e5387a791e3aefff5be6af
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Wed Apr 20 09:46:50 2022 -0400

    17301: Fold subsequent messages into details
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index c85443a23..b04fb190e 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -394,7 +394,7 @@ class ArvadosContainer(JobBase):
                     processStatus = "permanentFail"
 
                 if rcode == 137:
-                    logger.warning("%s job was killed on the compute instance.  The most common reason is that it attempted to allocate too much RAM and was targeted by the Out Of Memory (OOM) killer.  Try resubmitting with a higher 'ramMin'.",
+                    logger.warning("%s This container was killed on the compute instance.  The most common reason is that it attempted to allocate too much RAM and was targeted by the Out Of Memory (OOM) killer.  Try resubmitting with a higher 'ramMin'.",
                                  self.arvrunner.label(self))
             else:
                 processStatus = "permanentFail"
diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index f04f30476..6cc971afa 100644
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -264,16 +264,16 @@ The 'jobs' API is no longer supported.
             # In case of status being an error, only report the first one.
             if kind in ('error', 'warning', 'activity'):
                 updatemessage = runtime_status.get(kind, "")
-                if updatemessage:
-                    updatemessage += "\n"
-                updatemessage += message
+                if not updatemessage:
+                    updatemessage = message;
 
-                # Subsequent messages tacked on as detail
+                # Subsequent messages tacked on in detail
                 updatedetail = runtime_status.get(kind+'Detail', "")
                 if updatedetail:
-                   updatedetail += "\n"
+                    updatedetail += "\n"
+                updatedetail += message + "\n"
                 if detail:
-                    updatedetail += message + "\n" + detail
+                    updatedetail += detail + "\n"
                 runtime_status.update({
                     kind: updatemessage,
                     kind+'Detail': updatedetail,

-----------------------------------------------------------------------


hooks/post-receive
--