[arvados] updated: 2.6.0-379-g9b055a03a

[git repository hosting]

Summary of changes:
 lib/crunchrun/singularity.go | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

       via  9b055a03a8a6b516854459cbf6cda97917b73e91 (commit)
      from  28a733a8823fedadc34a560935abdd17039cb100 (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 9b055a03a8a6b516854459cbf6cda97917b73e91
Author: Tom Clegg <tom at curii.com>
Date:   Wed Jul 19 10:40:07 2023 -0400

    17244: Fix singularity reporting host stats as container stats.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchrun/singularity.go b/lib/crunchrun/singularity.go
index daa0bfe94..fd2629771 100644
--- a/lib/crunchrun/singularity.go
+++ b/lib/crunchrun/singularity.go
@@ -354,11 +354,8 @@ func (e *singularityExecutor) Start() error {
 }
 
 func (e *singularityExecutor) Pid() int {
-	pid, err := e.containedProcess()
-	if err != nil {
-		return -1
-	}
-	return pid
+	// see https://dev.arvados.org/issues/17244#note-21
+	return 0
 }
 
 func (e *singularityExecutor) Stop() error {

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


hooks/post-receive
--