[ARVADOS] updated: 2.1.0-826-ge2d0ebb4c

[Git user]

Summary of changes:
 lib/controller/federation/generated.go | 30 ------------------------------
 lib/controller/federation/list.go      | 11 +++++------
 2 files changed, 5 insertions(+), 36 deletions(-)

       via  e2d0ebb4cdeeb572226fc22a46bf60c507e111ea (commit)
      from  f1aec3387f765a3f8a2f3f2c22d3a53fb4f9f1f3 (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 e2d0ebb4cdeeb572226fc22a46bf60c507e111ea
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon May 24 11:14:37 2021 -0400

    17702: Move check for ClusterID into splitListRequest
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/lib/controller/federation/generated.go b/lib/controller/federation/generated.go
index 3ede1f115..49a2e5b75 100755
--- a/lib/controller/federation/generated.go
+++ b/lib/controller/federation/generated.go
@@ -18,12 +18,6 @@ import (
 //
 
 func (conn *Conn) generated_ContainerList(ctx context.Context, options arvados.ListOptions) (arvados.ContainerList, error) {
-	if options.ClusterID != "" {
-		// explicitly selected cluster
-		options.ForwardedFor = conn.cluster.ClusterID + "-" + options.ForwardedFor
-		return conn.chooseBackend(options.ClusterID).ContainerList(ctx, options)
-	}
-
 	var mtx sync.Mutex
 	var merged arvados.ContainerList
 	var needSort atomic.Value
@@ -65,12 +59,6 @@ func (conn *Conn) generated_ContainerList(ctx context.Context, options arvados.L
 }
 
 func (conn *Conn) generated_ContainerRequestList(ctx context.Context, options arvados.ListOptions) (arvados.ContainerRequestList, error) {
-	if options.ClusterID != "" {
-		// explicitly selected cluster
-		options.ForwardedFor = conn.cluster.ClusterID + "-" + options.ForwardedFor
-		return conn.chooseBackend(options.ClusterID).ContainerRequestList(ctx, options)
-	}
-
 	var mtx sync.Mutex
 	var merged arvados.ContainerRequestList
 	var needSort atomic.Value
@@ -112,12 +100,6 @@ func (conn *Conn) generated_ContainerRequestList(ctx context.Context, options ar
 }
 
 func (conn *Conn) generated_GroupList(ctx context.Context, options arvados.ListOptions) (arvados.GroupList, error) {
-	if options.ClusterID != "" {
-		// explicitly selected cluster
-		options.ForwardedFor = conn.cluster.ClusterID + "-" + options.ForwardedFor
-		return conn.chooseBackend(options.ClusterID).GroupList(ctx, options)
-	}
-
 	var mtx sync.Mutex
 	var merged arvados.GroupList
 	var needSort atomic.Value
@@ -159,12 +141,6 @@ func (conn *Conn) generated_GroupList(ctx context.Context, options arvados.ListO
 }
 
 func (conn *Conn) generated_SpecimenList(ctx context.Context, options arvados.ListOptions) (arvados.SpecimenList, error) {
-	if options.ClusterID != "" {
-		// explicitly selected cluster
-		options.ForwardedFor = conn.cluster.ClusterID + "-" + options.ForwardedFor
-		return conn.chooseBackend(options.ClusterID).SpecimenList(ctx, options)
-	}
-
 	var mtx sync.Mutex
 	var merged arvados.SpecimenList
 	var needSort atomic.Value
@@ -206,12 +182,6 @@ func (conn *Conn) generated_SpecimenList(ctx context.Context, options arvados.Li
 }
 
 func (conn *Conn) generated_UserList(ctx context.Context, options arvados.ListOptions) (arvados.UserList, error) {
-	if options.ClusterID != "" {
-		// explicitly selected cluster
-		options.ForwardedFor = conn.cluster.ClusterID + "-" + options.ForwardedFor
-		return conn.chooseBackend(options.ClusterID).UserList(ctx, options)
-	}
-
 	var mtx sync.Mutex
 	var merged arvados.UserList
 	var needSort atomic.Value
diff --git a/lib/controller/federation/list.go b/lib/controller/federation/list.go
index a9ac03ee5..039caac57 100644
--- a/lib/controller/federation/list.go
+++ b/lib/controller/federation/list.go
@@ -22,12 +22,6 @@ import (
 // methods for other types; see generate.go.
 
 func (conn *Conn) generated_CollectionList(ctx context.Context, options arvados.ListOptions) (arvados.CollectionList, error) {
-	if options.ClusterID != "" {
-		// explicitly selected cluster
-		options.ForwardedFor = conn.cluster.ClusterID + "-" + options.ForwardedFor
-		return conn.chooseBackend(options.ClusterID).CollectionList(ctx, options)
-	}
-
 	var mtx sync.Mutex
 	var merged arvados.CollectionList
 	var needSort atomic.Value
@@ -119,6 +113,11 @@ func (conn *Conn) splitListRequest(ctx context.Context, opts arvados.ListOptions
 		_, err := fn(ctx, conn.cluster.ClusterID, conn.local, opts)
 		return err
 	}
+	if opts.ClusterID != "" {
+		// Client explicitly selected cluster
+		_, err := fn(ctx, conn.cluster.ClusterID, conn.chooseBackend(opts.ClusterID), opts)
+		return err
+	}
 
 	cannotSplit := false
 	var matchAllFilters map[string]bool

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


hooks/post-receive
--