15954: Ignore entry for own cluster ID in RemoteClusters config.
authorTom Clegg <tom@tomclegg.ca>
Mon, 24 Feb 2020 15:24:28 +0000 (10:24 -0500)
committerTom Clegg <tom@tomclegg.ca>
Mon, 24 Feb 2020 20:30:07 +0000 (15:30 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

lib/controller/federation/conn.go

index 42083cb83df10918cdbc9f14869d0c2e49e51442..3eca637058d82bdff4a8cb5e36af7baeaaf2fc4e 100644 (file)
@@ -35,7 +35,7 @@ func New(cluster *arvados.Cluster) *Conn {
        local := localdb.NewConn(cluster)
        remotes := map[string]backend{}
        for id, remote := range cluster.RemoteClusters {
-               if !remote.Proxy {
+               if !remote.Proxy || id == cluster.ClusterID {
                        continue
                }
                conn := rpc.NewConn(id, &url.URL{Scheme: remote.Scheme, Host: remote.Host}, remote.Insecure, saltedTokenProvider(local, id))