Merge branch '21541-arv-mount-keyerror-rebase' refs #21541

[arvados.git] / services / keep-web / cache.go

diff --git a/services/keep-web/cache.go b/services/keep-web/cache.go
index 604efd29d9139e2fe4963709f64503a0d8d7e6f3..d443bc0829f81098715254e4b0e08cd7f5ac87bb 100644 (file)
--- a/services/keep-web/cache.go
+++ b/services/keep-web/cache.go
@@ -221,7 +221,7 @@ func (c *cache) GetSession(token string) (arvados.CustomFileSystem, *cachedSessi
                // using the new fs).
                sess.inuse.Lock()
                if !sess.userLoaded || refresh {
-                       err := sess.client.RequestAndDecode(&sess.user, "GET", "/arvados/v1/users/current", nil, nil)
+                       err := sess.client.RequestAndDecode(&sess.user, "GET", "arvados/v1/users/current", nil, nil)
                        if he := errorWithHTTPStatus(nil); errors.As(err, &he) && he.HTTPStatus() == http.StatusForbidden {
                                // token is OK, but "get user id" api is out
                                // of scope -- use existing/expired info if
@@ -303,7 +303,7 @@ func (c *cache) pruneSessions() {
        // Mark more sessions for deletion until reaching desired
        // memory size limit, starting with the oldest entries.
        for i, snap := range snaps {
-               if size <= c.cluster.Collections.WebDAVCache.MaxCollectionBytes {
+               if size <= int64(c.cluster.Collections.WebDAVCache.MaxCollectionBytes) {
                        break
                }
                if snap.prune {