20318: Merge branch 'main' into 20318-disk-cache

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

diff --cc sdk/go/arvados/api.go
Simple merge

diff --cc sdk/go/arvadostest/api.go
Simple merge

diff --cc sdk/go/keepclient/keepclient.go
index 4e935812be85d951c578794379e8ebcb7d99aff0,86001c01e04a41a6f382aa09e93544c69fd53821..08fa455ff42233d5d4418e4495ba93ac77178c37
--- 1/sdk/go/keepclient/keepclient.go
--- 2/sdk/go/keepclient/keepclient.go
+++ b/sdk/go/keepclient/keepclient.go
@@@ -122,10 -118,29 +122,31 @@@ type KeepClient struct 
  
        // Disable automatic discovery of keep services
        disableDiscovery bool
 +
 +      gatewayStack arvados.KeepGateway
  }
  
+ func (kc *KeepClient) Clone() *KeepClient {
+       kc.lock.Lock()
+       defer kc.lock.Unlock()
+       return &KeepClient{
+               Arvados:               kc.Arvados,
+               Want_replicas:         kc.Want_replicas,
+               localRoots:            kc.localRoots,
+               writableLocalRoots:    kc.writableLocalRoots,
+               gatewayRoots:          kc.gatewayRoots,
+               HTTPClient:            kc.HTTPClient,
+               Retries:               kc.Retries,
+               BlockCache:            kc.BlockCache,
+               RequestID:             kc.RequestID,
+               StorageClasses:        kc.StorageClasses,
+               DefaultStorageClasses: kc.DefaultStorageClasses,
+               replicasPerService:    kc.replicasPerService,
+               foundNonDiskSvc:       kc.foundNonDiskSvc,
+               disableDiscovery:      kc.disableDiscovery,
+       }
+ }
+ 
  func (kc *KeepClient) loadDefaultClasses() error {
        scData, err := kc.Arvados.ClusterConfig("StorageClasses")
        if err != nil {