[ARVADOS] updated: 1.1.3-106-g01fe37c

[Git user]

Summary of changes:
 lib/dispatchcloud/node_size.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

       via  01fe37c91379764afc9569b5f5b907e79e15001e (commit)
      from  a78ca0e838c13c914367811a6a8fa0ae953a6042 (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 01fe37c91379764afc9569b5f5b907e79e15001e
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Feb 27 17:09:20 2018 -0500

    13078: Accept "no nodes" as an indication that features are OK.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/dispatchcloud/node_size.go b/lib/dispatchcloud/node_size.go
index 50108d7..41c6ff4 100644
--- a/lib/dispatchcloud/node_size.go
+++ b/lib/dispatchcloud/node_size.go
@@ -95,13 +95,14 @@ func SlurmNodeTypeFeatureKludge(cc *arvados.Cluster) {
 var (
 	slurmDummyNode     = "compute0"
 	slurmErrBadFeature = "Invalid feature"
+	slurmErrNoNodes    = "node configuration is not available"
 )
 
 func slurmKludge(features []string) {
 	cmd := exec.Command("srun", "--test-only", "--constraint="+strings.Join(features, "&"), "false")
 	out, err := cmd.CombinedOutput()
 	switch {
-	case err == nil:
+	case err == nil || bytes.Contains(out, []byte(slurmErrNoNodes)):
 		// Evidently our node-type feature names are all valid.
 
 	case bytes.Contains(out, []byte(slurmErrBadFeature)):
@@ -116,6 +117,6 @@ func slurmKludge(features []string) {
 		}
 
 	default:
-		log.Printf("warning: expected srun error %q or success, but output was %q", slurmErrBadFeature, out)
+		log.Printf("warning: expected srun error %q, %q, or success, but output was %q", slurmErrBadFeature, slurmErrNoNodes, out)
 	}
 }

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


hooks/post-receive
--