X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e087a608834328786d0aec7956646fdf63b5ed44..dc021c3b57dcdebe464c148d55f9990a74e8246b:/lib/controller/federation/list.go

diff --git a/lib/controller/federation/list.go b/lib/controller/federation/list.go
index 54f59812a0..97c201e742 100644
--- a/lib/controller/federation/list.go
+++ b/lib/controller/federation/list.go
@@ -12,8 +12,8 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/httpserver"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/httpserver"
 )
 
 //go:generate go run generate.go
@@ -21,7 +21,7 @@ import (
 // CollectionList is used as a template to auto-generate List()
 // methods for other types; see generate.go.
 
-func (conn *Conn) CollectionList(ctx context.Context, options arvados.ListOptions) (arvados.CollectionList, error) {
+func (conn *Conn) generated_CollectionList(ctx context.Context, options arvados.ListOptions) (arvados.CollectionList, error) {
 	var mtx sync.Mutex
 	var merged arvados.CollectionList
 	var needSort atomic.Value
@@ -237,7 +237,7 @@ func (conn *Conn) splitListRequest(ctx context.Context, opts arvados.ListOptions
 
 				done, err := fn(ctx, clusterID, backend, remoteOpts)
 				if err != nil {
-					errs <- err
+					errs <- httpErrorf(http.StatusBadGateway, err.Error())
 					return
 				}
 				progress := false
@@ -247,8 +247,13 @@ func (conn *Conn) splitListRequest(ctx context.Context, opts arvados.ListOptions
 						delete(todo, uuid)
 					}
 				}
-				if !progress {
-					errs <- httpErrorf(http.StatusBadGateway, "cannot make progress in federated list query: cluster %q returned none of the requested UUIDs", clusterID)
+				if len(done) == 0 {
+					// Zero items == no more
+					// results exist, no need to
+					// get another page.
+					break
+				} else if !progress {
+					errs <- httpErrorf(http.StatusBadGateway, "cannot make progress in federated list query: cluster %q returned %d items but none had the requested UUIDs", clusterID, len(done))
 					return
 				}
 			}