X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5cc1710b57f98905469225c68d975ad2e3e7e56d..6d1c41d6fd83824669cd1a6d714ea6da1ae7ab4c:/lib/controller/federation/conn.go

diff --git a/lib/controller/federation/conn.go b/lib/controller/federation/conn.go
index 430c189a29..b4b7476440 100644
--- a/lib/controller/federation/conn.go
+++ b/lib/controller/federation/conn.go
@@ -178,20 +178,29 @@ func (conn *Conn) tryLocalThenRemotes(ctx context.Context, forwardedFor string,
 			errchan <- fn(ctx, remoteID, be)
 		}()
 	}
-	all404 := true
+	returncode := http.StatusNotFound
 	var errs []error
 	for i := 0; i < cap(errchan); i++ {
 		err := <-errchan
 		if err == nil {
 			return nil
 		}
-		all404 = all404 && errStatus(err) == http.StatusNotFound
 		errs = append(errs, err)
+		if code := errStatus(err); code >= 500 || code == http.StatusTooManyRequests {
+			// If any of the remotes have a retryable
+			// error (and none succeed) we'll return 502.
+			returncode = http.StatusBadGateway
+		} else if code != http.StatusNotFound && returncode != http.StatusBadGateway {
+			// If some of the remotes have non-retryable
+			// non-404 errors (and none succeed or have
+			// retryable errors) we'll return 422.
+			returncode = http.StatusUnprocessableEntity
+		}
 	}
-	if all404 {
+	if returncode == http.StatusNotFound {
 		return notFoundError{}
 	}
-	return httpErrorf(http.StatusBadGateway, "errors: %v", errs)
+	return httpErrorf(returncode, "errors: %v", errs)
 }
 
 func (conn *Conn) CollectionCreate(ctx context.Context, options arvados.CreateOptions) (arvados.Collection, error) {
@@ -270,6 +279,26 @@ func (conn *Conn) Logout(ctx context.Context, options arvados.LogoutOptions) (ar
 	return arvados.LogoutResponse{RedirectLocation: target.String()}, nil
 }
 
+func (conn *Conn) AuthorizedKeyCreate(ctx context.Context, options arvados.CreateOptions) (arvados.AuthorizedKey, error) {
+	return conn.chooseBackend(options.ClusterID).AuthorizedKeyCreate(ctx, options)
+}
+
+func (conn *Conn) AuthorizedKeyUpdate(ctx context.Context, options arvados.UpdateOptions) (arvados.AuthorizedKey, error) {
+	return conn.chooseBackend(options.UUID).AuthorizedKeyUpdate(ctx, options)
+}
+
+func (conn *Conn) AuthorizedKeyGet(ctx context.Context, options arvados.GetOptions) (arvados.AuthorizedKey, error) {
+	return conn.chooseBackend(options.UUID).AuthorizedKeyGet(ctx, options)
+}
+
+func (conn *Conn) AuthorizedKeyList(ctx context.Context, options arvados.ListOptions) (arvados.AuthorizedKeyList, error) {
+	return conn.generated_AuthorizedKeyList(ctx, options)
+}
+
+func (conn *Conn) AuthorizedKeyDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.AuthorizedKey, error) {
+	return conn.chooseBackend(options.UUID).AuthorizedKeyDelete(ctx, options)
+}
+
 func (conn *Conn) CollectionGet(ctx context.Context, options arvados.GetOptions) (arvados.Collection, error) {
 	if len(options.UUID) == 27 {
 		// UUID is really a UUID