[ARVADOS] updated: 1.3.0-1656-g110580d07

[Git user]

Summary of changes:
 build/package-build-dockerfiles/centos7/Dockerfile    | 6 +++---
 build/run-build-packages.sh                           | 2 +-
 doc/admin/upgrading.html.textile.liquid               | 6 ++++++
 lib/config/deprecated_keepstore.go                    | 4 ++++
 lib/config/load.go                                    | 1 -
 sdk/python/tests/run_test_server.py                   | 1 +
 services/dockercleaner/arvados-docker-cleaner.service | 2 +-
 services/nodemanager/setup.py                         | 7 ++-----
 8 files changed, 18 insertions(+), 11 deletions(-)

       via  110580d079cdb0b0a773ecf1671c1f97f1736cc6 (commit)
       via  7c0257925a75185937c4a84dfd077458a24c53f9 (commit)
       via  0bb53c1cbcbcb8b3be50e6ecf3fdf0bb7cbd96b5 (commit)
       via  5bbf25e6e165455a9edc639fa4096e2aa7b35703 (commit)
       via  91e6b4f16baa92a234007fd7442976cf2340a7cc (commit)
       via  474c0be6cf3beb536e83a42a08220313e303decf (commit)
       via  8da39e55beb95fa6f2408c86803e5a003bcd8ae5 (commit)
       via  d04751846aa221610a463bce1efaf624c36eaffc (commit)
      from  6527c64378ebd1970be69f6502db181c8272da5a (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 110580d079cdb0b0a773ecf1671c1f97f1736cc6
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Fri Sep 27 13:38:35 2019 -0400

    13647: Don't check pending keepstore migrations during API startup.
    
    Fixes deadlock: If controller is already up when RailsAPI boots,
    RailsAPI runs "config-dump -skip-legacy", which (until this change)
    requests .../keep_services; controller forwards the request to
    RailsAPI; and passenger queues the request until RailsAPI finishes
    booting.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/config/deprecated_keepstore.go b/lib/config/deprecated_keepstore.go
index 04e937cc5..a7d41e985 100644
--- a/lib/config/deprecated_keepstore.go
+++ b/lib/config/deprecated_keepstore.go
@@ -227,6 +227,10 @@ func (ldr *Loader) loadOldKeepstoreConfig(cfg *arvados.Config) error {
 		}
 	}
 
+	if err := ldr.checkPendingKeepstoreMigrations(cluster); err != nil {
+		return err
+	}
+
 	cfg.Clusters[cluster.ClusterID] = *cluster
 	return nil
 }
diff --git a/lib/config/load.go b/lib/config/load.go
index 93c36f69e..d9ee97b51 100644
--- a/lib/config/load.go
+++ b/lib/config/load.go
@@ -262,7 +262,6 @@ func (ldr *Loader) Load() (*arvados.Config, error) {
 	for id, cc := range cfg.Clusters {
 		for _, err = range []error{
 			checkKeyConflict(fmt.Sprintf("Clusters.%s.PostgreSQL.Connection", id), cc.PostgreSQL.Connection),
-			ldr.checkPendingKeepstoreMigrations(cc),
 			ldr.checkEmptyKeepstores(cc),
 			ldr.checkUnlistedKeepstores(cc),
 		} {

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


hooks/post-receive
--