[ARVADOS] created: 1.3.0-1747-g5307952e6

[Git user]

        at  5307952e63be3ea4d1f3ab552c1697ebcfa98542 (commit)


commit 5307952e63be3ea4d1f3ab552c1697ebcfa98542
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Tue Oct 15 11:37:24 2019 -0400

    15717: If there are several InternalURLs for the same host, try them all
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 0391c5a04..70892cfc3 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -164,23 +164,26 @@ func getListenAddr(svcs arvados.Services, prog arvados.ServiceName, log logrus.F
 	if !ok {
 		return arvados.URL{}, fmt.Errorf("unknown service name %q", prog)
 	}
+	errors := []string{}
 	for url := range svc.InternalURLs {
-		if strings.HasPrefix(url.Host, "localhost:") {
-			return url, nil
-		}
 		listener, err := net.Listen("tcp", url.Host)
 		if err == nil {
 			listener.Close()
 			return url, nil
 		} else if strings.Contains(err.Error(), "cannot assign requested address") {
+			// If 'Host' specifies a different server than
+			// the current one, it'll resolve the hostname
+			// to IP address, and then fail because it
+			// can't bind an IP address it doesn't own.
 			continue
-		} else if strings.Contains(err.Error(), "address already in use") {
-			return url, err
 		} else {
-			log.Warn(err)
+			errors = append(errors, fmt.Sprintf("tried %v, got %v", url, err))
 		}
 	}
-	return arvados.URL{}, fmt.Errorf("configuration does not enable the %s service on this host", prog)
+	if len(errors) > 0 {
+		return arvados.URL{}, fmt.Errorf("could not enable the %q service on this host: %s", prog, strings.Join(errors, "; "))
+	}
+	return arvados.URL{}, fmt.Errorf("configuration does not enable the %q service on this host", prog)
 }
 
 type contextKeyURL struct{}

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


hooks/post-receive
--