[ARVADOS] updated: 13d40db2d01ab306e171d2b5c540e51796bdfa44

[Git user]

Summary of changes:
 services/keep-web/cache.go      | 15 ++++++++-------
 services/keep-web/cache_test.go |  6 ++++++
 2 files changed, 14 insertions(+), 7 deletions(-)

       via  13d40db2d01ab306e171d2b5c540e51796bdfa44 (commit)
       via  0f650530237e998c0733d45ed8eadda0534f1c76 (commit)
      from  ad47ed8a7e7847a60ca775916a707d515ed256e9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 13d40db2d01ab306e171d2b5c540e51796bdfa44
Merge: ad47ed8 0f65053
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 7 16:11:53 2017 -0400

    Merge branch '11945-disable-cache'
    
    refs #11945
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>


commit 0f650530237e998c0733d45ed8eadda0534f1c76
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Jul 7 16:04:56 2017 -0400

    11945: Disable collection cache.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/services/keep-web/cache.go b/services/keep-web/cache.go
index 174e370..d72effc 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 77eaf0c..0532527 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)
 

-----------------------------------------------------------------------


hooks/post-receive
--