[arvados] updated: 2.6.0-459-g0b296b5a9

git repository hosting git at public.arvados.org
Tue Aug 8 14:19:25 UTC 2023


Summary of changes:
 lib/crunchrun/docker.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  0b296b5a965890a01e392e96161a61156a1f6155 (commit)
      from  912fd82a23277fc4f0dbd2c1587c8dfd6af52aa5 (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 0b296b5a965890a01e392e96161a61156a1f6155
Author: Tom Clegg <tom at curii.com>
Date:   Tue Aug 8 10:18:29 2023 -0400

    Fix error check.
    
    refs #17244
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchrun/docker.go b/lib/crunchrun/docker.go
index 1fd8c4fd2..4f449133f 100644
--- a/lib/crunchrun/docker.go
+++ b/lib/crunchrun/docker.go
@@ -199,7 +199,7 @@ func (e *dockerExecutor) Pid() int {
 	ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(10*time.Second))
 	defer cancel()
 	ctr, err := e.dockerclient.ContainerInspect(ctx, e.containerID)
-	if err != nil && ctr.State != nil {
+	if err == nil && ctr.State != nil {
 		return ctr.State.Pid
 	} else {
 		return 0

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list