From 0f650530237e998c0733d45ed8eadda0534f1c76 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Fri, 7 Jul 2017 16:04:56 -0400 Subject: [PATCH] 11945: Disable collection cache. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- services/keep-web/cache.go | 15 ++++++++------- services/keep-web/cache_test.go | 6 ++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/services/keep-web/cache.go b/services/keep-web/cache.go index 174e370c13..d72effc075 100644 --- a/services/keep-web/cache.go +++ b/services/keep-web/cache.go @@ -170,13 +170,14 @@ func (c *cache) Get(arv *arvadosclient.ArvadosClient, targetID string, forceRelo expire: exp, pdh: collection.PortableDataHash, }) - c.collections.Add(collection.PortableDataHash, &cachedCollection{ - expire: exp, - collection: collection, - }) - if int64(len(collection.ManifestText)) > c.MaxCollectionBytes/int64(c.MaxCollectionEntries) { - go c.pruneCollections() - } + // Disabled, see #11945 + // c.collections.Add(collection.PortableDataHash, &cachedCollection{ + // expire: exp, + // collection: collection, + // }) + // if int64(len(collection.ManifestText)) > c.MaxCollectionBytes/int64(c.MaxCollectionEntries) { + // go c.pruneCollections() + // } return collection, nil } diff --git a/services/keep-web/cache_test.go b/services/keep-web/cache_test.go index 77eaf0cd0b..05325270e6 100644 --- a/services/keep-web/cache_test.go +++ b/services/keep-web/cache_test.go @@ -11,6 +11,8 @@ import ( ) func (s *UnitSuite) TestCache(c *check.C) { + c.Skip("see #11945") + arv, err := arvadosclient.MakeArvadosClient() c.Assert(err, check.Equals, nil) @@ -72,6 +74,8 @@ func (s *UnitSuite) TestCache(c *check.C) { } func (s *UnitSuite) TestCacheForceReloadByPDH(c *check.C) { + c.Skip("see #11945") + arv, err := arvadosclient.MakeArvadosClient() c.Assert(err, check.Equals, nil) @@ -90,6 +94,8 @@ func (s *UnitSuite) TestCacheForceReloadByPDH(c *check.C) { } func (s *UnitSuite) TestCacheForceReloadByUUID(c *check.C) { + c.Skip("see #11945") + arv, err := arvadosclient.MakeArvadosClient() c.Assert(err, check.Equals, nil) -- 2.30.2