projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 94cf0f9)
19362: Remove dead code.
authorTom Clegg <tom@curii.com>
Mon, 12 Sep 2022 20:32:12 +0000 (16:32 -0400)
committerTom Clegg <tom@curii.com>
Mon, 12 Sep 2022 20:32:12 +0000 (16:32 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

services/keep-web/handler.go patch | blob | history

diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go
index 0eecb1af186c2697e2aed948bc9063f94ddf90da..bc62a2a39a9ff397c7f52c578db1671e509e9c96 100644 (file)
--- a/services/keep-web/handler.go
+++ b/services/keep-web/handler.go
@@ -30,11 +30,10 @@ import (
 )
 
 type handler struct {
-       Cache      cache
-       Cluster    *arvados.Cluster
-       clientPool *arvadosclient.ClientPool
-       setupOnce  sync.Once
-       webdavLS   webdav.LockSystem
+       Cache     cache
+       Cluster   *arvados.Cluster
+       setupOnce sync.Once
+       webdavLS  webdav.LockSystem
 }
 
 var urlPDHDecoder = strings.NewReplacer(" ", "+", "-", "+")
@@ -56,10 +55,6 @@ func parseCollectionIDFromURL(s string) string {
 }
 
 func (h *handler) setup() {
-       // Errors will be handled at the client pool.
-       arv, _ := arvados.NewClientFromConfig(h.Cluster)
-       h.clientPool = arvadosclient.MakeClientPoolWith(arv)
-
        keepclient.DefaultBlockCache.MaxBlocks = h.Cluster.Collections.WebDAVCache.MaxBlockEntries
 
        // Even though we don't accept LOCK requests, every webdav
@@ -373,13 +368,6 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
                stripParts++
        }
 
-       arv := h.clientPool.Get()
-       if arv == nil {
-               http.Error(w, "client pool error: "+h.clientPool.Err().Error(), http.StatusInternalServerError)
-               return
-       }
-       defer h.clientPool.Put(arv)
-
        dirOpenMode := os.O_RDONLY
        if writeMethod[r.Method] {
                dirOpenMode = os.O_RDWR
@@ -597,28 +585,6 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) {
        }
 }
 
-func (h *handler) getClients(reqID, token string) (arv *arvadosclient.ArvadosClient, kc *keepclient.KeepClient, client *arvados.Client, release func(), err error) {
-       arv = h.clientPool.Get()
-       if arv == nil {
-               err = h.clientPool.Err()
-               return
-       }
-       release = func() { h.clientPool.Put(arv) }
-       arv.ApiToken = token
-       kc, err = keepclient.MakeKeepClient(arv)
-       if err != nil {
-               release()
-               return
-       }
-       kc.RequestID = reqID
-       client = (&arvados.Client{
-               APIHost:   arv.ApiServer,
-               AuthToken: arv.ApiToken,
-               Insecure:  arv.ApiInsecure,
-       }).WithRequestID(reqID)
-       return
-}
-
 var dirListingTemplate = `<!DOCTYPE HTML>
 <HTML><HEAD>
   <META name="robots" content="NOINDEX">