[ARVADOS] updated: 1.3.0-2495-gf6753e7ab

[Git user]

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

  discards  6b6008fc8996174145936d40284caaa5c1306fe9 (commit)
  discards  29e4223baf6aa8ef2c66bb5258a7586dd6c38a75 (commit)
  discards  727b97086f9ec060b9411b887d635017852d17cd (commit)
       via  f6753e7ab025399eae891c7cdabd8204c6400d84 (commit)
       via  8c4a0d0daa0d7cdad24404947ae6b2be1fd78297 (commit)
       via  533ec23ed1f94c83b78a8dc27c3084a7bb18f0d8 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (6b6008fc8996174145936d40284caaa5c1306fe9)
            \
             N -- N -- N (f6753e7ab025399eae891c7cdabd8204c6400d84)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 f6753e7ab025399eae891c7cdabd8204c6400d84
Author: Ward Vandewege <ward at jhvc.com>
Date:   Mon Apr 13 17:57:03 2020 -0400

    If config.yml is available, use the keepstores defined there instead of
    the legacy autodiscover mechanism via the API server.
    
    refs #16328
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at jhvc.com>

diff --git a/services/keepproxy/keepproxy.go b/services/keepproxy/keepproxy.go
index 2b15d7994..0ccb6cba5 100644
--- a/services/keepproxy/keepproxy.go
+++ b/services/keepproxy/keepproxy.go
@@ -116,6 +116,12 @@ func run(logger log.FieldLogger, cluster *arvados.Cluster) error {
 		return fmt.Errorf("Error setting up arvados client %v", err)
 	}
 
+	// If a config file is available, use the keepstores defined there
+	// instead of the legacy autodiscover mechanism via the API server
+	for k,_ := range cluster.Services.Keepstore.InternalURLs {
+		arv.KeepServiceURIs = append(arv.KeepServiceURIs,k.String())
+	}
+
 	if cluster.SystemLogs.LogLevel == "debug" {
 		keepclient.DebugPrintf = log.Printf
 	}

commit 8c4a0d0daa0d7cdad24404947ae6b2be1fd78297
Author: Ward Vandewege <ward at jhvc.com>
Date:   Mon Apr 13 19:23:48 2020 -0400

    Fix typo in error message.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at jhvc.com>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index cbcf7438b..4e1dc7374 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -403,7 +403,7 @@ func identifyOS() (osversion, error) {
 	}
 	osv.Major, err = strconv.Atoi(vstr)
 	if err != nil {
-		return osv, fmt.Errorf("incomprehensible VERSION_ID in /etc/os/release: %q", kv["VERSION_ID"])
+		return osv, fmt.Errorf("incomprehensible VERSION_ID in /etc/os-release: %q", kv["VERSION_ID"])
 	}
 	return osv, nil
 }

commit 533ec23ed1f94c83b78a8dc27c3084a7bb18f0d8
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Mon Apr 13 15:34:12 2020 -0300

    16313: Updates minimum requestd ram on docker containers from 4 to 16 MB.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/lib/crunchrun/crunchrun.go b/lib/crunchrun/crunchrun.go
index b0a4007f7..c8f171ca9 100644
--- a/lib/crunchrun/crunchrun.go
+++ b/lib/crunchrun/crunchrun.go
@@ -1074,9 +1074,10 @@ func (runner *ContainerRunner) CreateContainer() error {
 	runner.ContainerConfig.Volumes = runner.Volumes
 
 	maxRAM := int64(runner.Container.RuntimeConstraints.RAM)
-	if maxRAM < 4*1024*1024 {
-		// Docker daemon won't let you set a limit less than 4 MiB
-		maxRAM = 4 * 1024 * 1024
+	minDockerRAM := int64(16)
+	if maxRAM < minDockerRAM*1024*1024 {
+		// Docker daemon won't let you set a limit less than ~10 MiB
+		maxRAM = minDockerRAM * 1024 * 1024
 	}
 	runner.HostConfig = dockercontainer.HostConfig{
 		Binds: runner.Binds,

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


hooks/post-receive
--