[arvados] updated: 2.6.0-383-g24662d47c

[git repository hosting]

Summary of changes:
 doc/install/crunch2-slurm/install-dispatch.html.textile.liquid | 4 +++-
 lib/crunchrun/crunchrun.go                                     | 2 +-
 lib/crunchstat/crunchstat.go                                   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

       via  24662d47cee534f72787667620451358d95ab5ec (commit)
       via  78a0788d7d110e4b1309b920fdaab93bba6eb007 (commit)
      from  31779a06b28e21a9409ec7c6310f0871b65d13ff (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 24662d47cee534f72787667620451358d95ab5ec
Author: Tom Clegg <tom at curii.com>
Date:   Mon Jul 31 15:52:50 2023 -0400

    17244: Update docs for -cgroup-parent-subsystem flag.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/doc/install/crunch2-slurm/install-dispatch.html.textile.liquid b/doc/install/crunch2-slurm/install-dispatch.html.textile.liquid
index 9b664ec9e..554f53dd3 100644
--- a/doc/install/crunch2-slurm/install-dispatch.html.textile.liquid
+++ b/doc/install/crunch2-slurm/install-dispatch.html.textile.liquid
@@ -125,7 +125,9 @@ If your Slurm cluster uses the @task/cgroup@ TaskPlugin, you can configure Crunc
 </pre>
 </notextile>
 
-The choice of subsystem ("memory" in this example) must correspond to one of the resource types enabled in Slurm's @cgroup.conf at . Limits for other resource types will also be respected.  The specified subsystem is singled out only to let Crunch determine the name of the cgroup provided by Slurm.  When doing this, you should also set "ReserveExtraRAM":#ReserveExtraRAM .
+When using cgroups v1, the choice of subsystem ("memory" in this example) must correspond to one of the resource types enabled in Slurm's @cgroup.conf at .  The specified subsystem is singled out only to let Crunch determine the name of the cgroup provided by Slurm.  Limits for other resource types will also be respected.
+
+When doing this, you should also set "ReserveExtraRAM":#ReserveExtraRAM .
 
 {% include 'notebox_begin' %}
 
diff --git a/lib/crunchrun/crunchrun.go b/lib/crunchrun/crunchrun.go
index 9add35335..80258ec2a 100644
--- a/lib/crunchrun/crunchrun.go
+++ b/lib/crunchrun/crunchrun.go
@@ -1911,7 +1911,7 @@ func (command) RunCommand(prog string, args []string, stdin io.Reader, stdout, s
 	statInterval := flags.Duration("crunchstat-interval", 10*time.Second, "sampling period for periodic resource usage reporting")
 	flags.String("cgroup-root", "/sys/fs/cgroup", "path to sysfs cgroup tree (obsolete, ignored)")
 	flags.String("cgroup-parent", "docker", "name of container's parent cgroup (obsolete, ignored)")
-	cgroupParentSubsystem := flags.String("cgroup-parent-subsystem", "", "use current cgroup for given `subsystem` as parent cgroup for container (subsystem argument is only relevant for cgroups v1; in cgroups v2 / unified mode, any non-empty value means use current cgroup)")
+	cgroupParentSubsystem := flags.String("cgroup-parent-subsystem", "", "use current cgroup for given `subsystem` as parent cgroup for container (subsystem argument is only relevant for cgroups v1; in cgroups v2 / unified mode, any non-empty value means use current cgroup); if empty, use the docker daemon's default cgroup parent. See https://doc.arvados.org/main/install/crunch2-slurm/install-dispatch.html#CrunchRunCommand-cgroups")
 	caCertsPath := flags.String("ca-certs", "", "Path to TLS root certificates")
 	detach := flags.Bool("detach", false, "Detach from parent process and run in the background")
 	stdinConfig := flags.Bool("stdin-config", false, "Load config and environment variables from JSON message on stdin")

commit 78a0788d7d110e4b1309b920fdaab93bba6eb007
Author: Tom Clegg <tom at curii.com>
Date:   Mon Jul 31 15:33:18 2023 -0400

    17244: Clarify log message.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchstat/crunchstat.go b/lib/crunchstat/crunchstat.go
index ed10c7ba2..7e6a180b5 100644
--- a/lib/crunchstat/crunchstat.go
+++ b/lib/crunchstat/crunchstat.go
@@ -320,7 +320,7 @@ func (r *Reporter) findStatFiles() {
 			}
 			*try.statFile = target
 			done[try.statFile] = true
-			r.Logger.Printf("using /%s", target)
+			r.Logger.Printf("notice: reading stats from /%s", target)
 			break
 		}
 	}

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


hooks/post-receive
--