[ARVADOS] updated: 2.1.0-1423-g03daef40e

[Git user]

Summary of changes:
 lib/config/export.go        |  1 +
 lib/crunchrun/background.go | 32 ++++++++++++++++++--------------
 2 files changed, 19 insertions(+), 14 deletions(-)

       via  03daef40ed4885189b602523e6aa4ca618281fb0 (commit)
       via  09d97a76597d83955151a26ced7e996670c9b849 (commit)
      from  0fc72d87c64606685f9882c4f1dc76ef071290a3 (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 03daef40ed4885189b602523e6aa4ca618281fb0
Author: Tom Clegg <tom at curii.com>
Date:   Wed Oct 6 14:47:19 2021 -0400

    16347: Add new config key to whitelist map.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/config/export.go b/lib/config/export.go
index 92e2d7b4d..f400dabbf 100644
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -119,6 +119,7 @@ var whitelist = map[string]bool{
 	"Containers.JobsAPI":                                  true,
 	"Containers.JobsAPI.Enable":                           true,
 	"Containers.JobsAPI.GitInternalDir":                   false,
+	"Containers.LocalKeepBlobBuffersPerVCPU":              false,
 	"Containers.Logging":                                  false,
 	"Containers.LogReuseDecisions":                        false,
 	"Containers.LSF":                                      false,

commit 09d97a76597d83955151a26ced7e996670c9b849
Author: Tom Clegg <tom at curii.com>
Date:   Wed Oct 6 14:44:19 2021 -0400

    16347: Skip journald logging if systemd-cat is not installed.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchrun/background.go b/lib/crunchrun/background.go
index 07f8f5b88..8a919bc5e 100644
--- a/lib/crunchrun/background.go
+++ b/lib/crunchrun/background.go
@@ -77,20 +77,24 @@ func detach(uuid string, prog string, args []string, stdin io.Reader, stdout io.
 		// invoked as "/path/to/crunch-run"
 		execargs = append([]string{prog}, execargs...)
 	}
-	execargs = append([]string{
-		// Here, if the inner systemd-cat can't exec
-		// crunch-run, it writes an error message to stderr,
-		// and the outer systemd-cat writes it to the journal
-		// where the operator has a chance to discover it. (If
-		// we only used one systemd-cat command, it would be
-		// up to us to report the error -- but we are going to
-		// detach and exit, not wait for something to appear
-		// on stderr.)  Note these systemd-cat calls don't
-		// result in additional processes -- they just connect
-		// stderr/stdout to sockets and call exec().
-		"systemd-cat", "--identifier=crunch-run",
-		"systemd-cat", "--identifier=crunch-run",
-	}, execargs...)
+	if _, err := exec.LookPath("systemd-cat"); err == nil {
+		execargs = append([]string{
+			// Here, if the inner systemd-cat can't exec
+			// crunch-run, it writes an error message to
+			// stderr, and the outer systemd-cat writes it
+			// to the journal where the operator has a
+			// chance to discover it. (If we only used one
+			// systemd-cat command, it would be up to us
+			// to report the error -- but we are going to
+			// detach and exit, not wait for something to
+			// appear on stderr.)  Note these systemd-cat
+			// calls don't result in additional processes
+			// -- they just connect stderr/stdout to
+			// sockets and call exec().
+			"systemd-cat", "--identifier=crunch-run",
+			"systemd-cat", "--identifier=crunch-run",
+		}, execargs...)
+	}
 
 	cmd := exec.Command(execargs[0], execargs[1:]...)
 	// Child inherits lockfile.

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


hooks/post-receive
--