X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6d95130da47af9fd0290d3c8f80a0364faf74957..adbbe252483b5442707c1e2e03f5347f913e1125:/lib/controller/federation/list.go

diff --git a/lib/controller/federation/list.go b/lib/controller/federation/list.go
index 97c201e742..039caac574 100644
--- a/lib/controller/federation/list.go
+++ b/lib/controller/federation/list.go
@@ -27,6 +27,7 @@ func (conn *Conn) generated_CollectionList(ctx context.Context, options arvados.
 	var needSort atomic.Value
 	needSort.Store(false)
 	err := conn.splitListRequest(ctx, options, func(ctx context.Context, _ string, backend arvados.API, options arvados.ListOptions) ([]string, error) {
+		options.ForwardedFor = conn.cluster.ClusterID + "-" + options.ForwardedFor
 		cl, err := backend.CollectionList(ctx, options)
 		if err != nil {
 			return nil, err
@@ -84,7 +85,7 @@ func (conn *Conn) generated_CollectionList(ctx context.Context, options arvados.
 //
 // * len(Order)==0
 //
-// * Each filter must be either "uuid = ..." or "uuid in [...]".
+// * Each filter is either "uuid = ..." or "uuid in [...]".
 //
 // * The maximum possible response size (total number of objects that
 //   could potentially be matched by all of the specified filters)
@@ -106,6 +107,18 @@ func (conn *Conn) generated_CollectionList(ctx context.Context, options arvados.
 // corresponding options argument suitable for sending to that
 // backend.
 func (conn *Conn) splitListRequest(ctx context.Context, opts arvados.ListOptions, fn func(context.Context, string, arvados.API, arvados.ListOptions) ([]string, error)) error {
+
+	if opts.BypassFederation || opts.ForwardedFor != "" {
+		// Client requested no federation.  Pass through.
+		_, 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
 	for _, f := range opts.Filters {
@@ -181,28 +194,27 @@ func (conn *Conn) splitListRequest(ctx context.Context, opts arvados.ListOptions
 		}
 	}
 
-	if len(todoByRemote) > 1 {
-		if cannotSplit {
-			return httpErrorf(http.StatusBadRequest, "cannot execute federated list query: each filter must be either 'uuid = ...' or 'uuid in [...]'")
-		}
-		if opts.Count != "none" {
-			return httpErrorf(http.StatusBadRequest, "cannot execute federated list query unless count==\"none\"")
-		}
-		if opts.Limit >= 0 || opts.Offset != 0 || len(opts.Order) > 0 {
-			return httpErrorf(http.StatusBadRequest, "cannot execute federated list query with limit, offset, or order parameter")
-		}
-		if max := conn.cluster.API.MaxItemsPerResponse; nUUIDs > max {
-			return httpErrorf(http.StatusBadRequest, "cannot execute federated list query because number of UUIDs (%d) exceeds page size limit %d", nUUIDs, max)
-		}
-		selectingUUID := false
-		for _, attr := range opts.Select {
-			if attr == "uuid" {
-				selectingUUID = true
-			}
-		}
-		if opts.Select != nil && !selectingUUID {
-			return httpErrorf(http.StatusBadRequest, "cannot execute federated list query with a select parameter that does not include uuid")
-		}
+	if len(todoByRemote) == 0 {
+		return nil
+	}
+	if len(todoByRemote) == 1 && todoByRemote[conn.cluster.ClusterID] != nil {
+		// All UUIDs are local, so proxy a single request. The
+		// generic case has some limitations (see below) which
+		// we don't want to impose on local requests.
+		_, err := fn(ctx, conn.cluster.ClusterID, conn.local, opts)
+		return err
+	}
+	if cannotSplit {
+		return httpErrorf(http.StatusBadRequest, "cannot execute federated list query: each filter must be either 'uuid = ...' or 'uuid in [...]'")
+	}
+	if opts.Count != "none" {
+		return httpErrorf(http.StatusBadRequest, "cannot execute federated list query unless count==\"none\"")
+	}
+	if (opts.Limit >= 0 && opts.Limit < int64(nUUIDs)) || opts.Offset != 0 || len(opts.Order) > 0 {
+		return httpErrorf(http.StatusBadRequest, "cannot execute federated list query with limit (%d) < nUUIDs (%d), offset (%d) > 0, or order (%v) parameter", opts.Limit, nUUIDs, opts.Offset, opts.Order)
+	}
+	if max := conn.cluster.API.MaxItemsPerResponse; nUUIDs > max {
+		return httpErrorf(http.StatusBadRequest, "cannot execute federated list query because number of UUIDs (%d) exceeds page size limit %d", nUUIDs, max)
 	}
 
 	ctx, cancel := context.WithCancel(ctx)
@@ -225,6 +237,12 @@ func (conn *Conn) splitListRequest(ctx context.Context, opts arvados.ListOptions
 				return
 			}
 			remoteOpts := opts
+			if remoteOpts.Select != nil {
+				// We always need to select UUIDs to
+				// use the response, even if our
+				// caller doesn't.
+				remoteOpts.Select = append([]string{"uuid"}, remoteOpts.Select...)
+			}
 			for len(todo) > 0 {
 				if len(batch) > len(todo) {
 					// Reduce batch to just the todo's
@@ -237,7 +255,7 @@ func (conn *Conn) splitListRequest(ctx context.Context, opts arvados.ListOptions
 
 				done, err := fn(ctx, clusterID, backend, remoteOpts)
 				if err != nil {
-					errs <- httpErrorf(http.StatusBadGateway, err.Error())
+					errs <- httpErrorf(http.StatusBadGateway, "%s", err.Error())
 					return
 				}
 				progress := false