20318: Bypass disk cache in certain tests, keepstore, and keepproxy.

[arvados.git] / services / keepstore / proxy_remote.go

diff --git a/services/keepstore/proxy_remote.go b/services/keepstore/proxy_remote.go
index 8c88a406f4f39fb998be7edcab8cf16d598caa3f..325f1cf485bd6738305040bbb197e050ba55dee3 100644 (file)
--- a/services/keepstore/proxy_remote.go
+++ b/services/keepstore/proxy_remote.go
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-package main
+package keepstore
 
 import (
        "context"
@@ -119,6 +119,7 @@ func (rp *remoteProxy) remoteClient(remoteID string, remoteCluster arvados.Remot
                if err != nil {
                        return nil, err
                }
+               kc.DiskCacheSize = keepclient.DiskCacheDisabled
 
                rp.mtx.Lock()
                if rp.clients == nil {
@@ -130,14 +131,14 @@ func (rp *remoteProxy) remoteClient(remoteID string, remoteCluster arvados.Remot
        }
        accopy := *kc.Arvados
        accopy.ApiToken = token
-       kccopy := *kc
+       kccopy := kc.Clone()
        kccopy.Arvados = &accopy
        token, err := auth.SaltToken(token, remoteID)
        if err != nil {
                return nil, err
        }
        kccopy.Arvados.ApiToken = token
-       return &kccopy, nil
+       return kccopy, nil
 }
 
 var localOrRemoteSignature = regexp.MustCompile(`\+[AR][^\+]*`)