20425: Merge branch 'main' into 20425-fed-pdh-retry

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --cc lib/controller/integration_test.go
Simple merge

diff --cc services/keep-web/cache.go
index 115abb9a0fc2dc05f19bace4931c667c53ec026b,c44a2eb73985ba5fd0494e99d27b6792c402838d..c77a1b4bb6dca0390b79793225f713459db76ce3
--- 1/services/keep-web/cache.go
--- 2/services/keep-web/cache.go
+++ b/services/keep-web/cache.go
@@@ -141,7 -141,11 +141,12 @@@ func (c *cache) GetSession(token string
                        return nil, nil, nil, err
                }
                sess.client.AuthToken = token
 +              sess.client.Timeout = time.Minute
+               // A non-empty origin header tells controller to
+               // prioritize our traffic as interactive, which is
+               // true most of the time.
+               origin := c.cluster.Services.WebDAVDownload.ExternalURL
+               sess.client.SendHeader = http.Header{"Origin": {origin.Scheme + "://" + origin.Host}}
                sess.arvadosclient, err = arvadosclient.New(sess.client)
                if err != nil {
                        return nil, nil, nil, err