From: Tom Clegg <tom@curoverse.com>
Date: Fri, 7 Jul 2017 20:11:53 +0000 (-0400)
Subject: Merge branch '11945-disable-cache'
X-Git-Tag: 1.1.0~148
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/13d40db2d01ab306e171d2b5c540e51796bdfa44?hp=ad47ed8a7e7847a60ca775916a707d515ed256e9

Merge branch '11945-disable-cache'

refs #11945

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

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)