X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/55aafbb07904ca24390dd47ea960eae7cb2b909a..2f66d4cc05e9442a9bb69969744d0750a02a1ed4:/services/keep-web/cache_test.go

diff --git a/services/keep-web/cache_test.go b/services/keep-web/cache_test.go
index 77eaf0cd0b..0a0eef6e44 100644
--- a/services/keep-web/cache_test.go
+++ b/services/keep-web/cache_test.go
@@ -5,51 +5,89 @@
 package main
 
 import (
-	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
+	"bytes"
+
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvadosclient"
+	"git.arvados.org/arvados.git/sdk/go/arvadostest"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/common/expfmt"
 	"gopkg.in/check.v1"
 )
 
+func (s *UnitSuite) checkCacheMetrics(c *check.C, reg *prometheus.Registry, regs ...string) {
+	mfs, err := reg.Gather()
+	c.Check(err, check.IsNil)
+	buf := &bytes.Buffer{}
+	enc := expfmt.NewEncoder(buf, expfmt.FmtText)
+	for _, mf := range mfs {
+		c.Check(enc.Encode(mf), check.IsNil)
+	}
+	mm := buf.String()
+	for _, reg := range regs {
+		c.Check(mm, check.Matches, `(?ms).*collectioncache_`+reg+`\n.*`)
+	}
+}
+
 func (s *UnitSuite) TestCache(c *check.C) {
 	arv, err := arvadosclient.MakeArvadosClient()
 	c.Assert(err, check.Equals, nil)
 
-	cache := DefaultConfig().Cache
+	cache := newConfig(s.Config).Cache
+	cache.registry = prometheus.NewRegistry()
 
 	// Hit the same collection 5 times using the same token. Only
 	// the first req should cause an API call; the next 4 should
 	// hit all caches.
 	arv.ApiToken = arvadostest.AdminToken
+	var coll *arvados.Collection
 	for i := 0; i < 5; i++ {
-		coll, err := cache.Get(arv, arvadostest.FooCollection, false)
+		coll, err = cache.Get(arv, arvadostest.FooCollection, false)
 		c.Check(err, check.Equals, nil)
 		c.Assert(coll, check.NotNil)
-		c.Check(coll.PortableDataHash, check.Equals, arvadostest.FooPdh)
+		c.Check(coll.PortableDataHash, check.Equals, arvadostest.FooCollectionPDH)
 		c.Check(coll.ManifestText[:2], check.Equals, ". ")
 	}
-	c.Check(cache.Stats().Requests, check.Equals, uint64(5))
-	c.Check(cache.Stats().CollectionHits, check.Equals, uint64(4))
-	c.Check(cache.Stats().PermissionHits, check.Equals, uint64(4))
-	c.Check(cache.Stats().PDHHits, check.Equals, uint64(4))
-	c.Check(cache.Stats().APICalls, check.Equals, uint64(1))
+	s.checkCacheMetrics(c, cache.registry,
+		"requests 5",
+		"hits 4",
+		"permission_hits 4",
+		"pdh_hits 4",
+		"api_calls 1")
 
 	// Hit the same collection 2 more times, this time requesting
 	// it by PDH and using a different token. The first req should
-	// miss the permission cache. Both reqs should hit the
-	// Collection cache and skip the API lookup.
+	// miss the permission cache and fetch the new manifest; the
+	// second should hit the Collection cache and skip the API
+	// lookup.
 	arv.ApiToken = arvadostest.ActiveToken
-	for i := 0; i < 2; i++ {
-		coll, err := cache.Get(arv, arvadostest.FooPdh, false)
-		c.Check(err, check.Equals, nil)
-		c.Assert(coll, check.NotNil)
-		c.Check(coll.PortableDataHash, check.Equals, arvadostest.FooPdh)
-		c.Check(coll.ManifestText[:2], check.Equals, ". ")
-	}
-	c.Check(cache.Stats().Requests, check.Equals, uint64(5+2))
-	c.Check(cache.Stats().CollectionHits, check.Equals, uint64(4+2))
-	c.Check(cache.Stats().PermissionHits, check.Equals, uint64(4+1))
-	c.Check(cache.Stats().PDHHits, check.Equals, uint64(4+0))
-	c.Check(cache.Stats().APICalls, check.Equals, uint64(1+1))
+
+	coll2, err := cache.Get(arv, arvadostest.FooCollectionPDH, false)
+	c.Check(err, check.Equals, nil)
+	c.Assert(coll2, check.NotNil)
+	c.Check(coll2.PortableDataHash, check.Equals, arvadostest.FooCollectionPDH)
+	c.Check(coll2.ManifestText[:2], check.Equals, ". ")
+	c.Check(coll2.ManifestText, check.Not(check.Equals), coll.ManifestText)
+
+	s.checkCacheMetrics(c, cache.registry,
+		"requests 6",
+		"hits 4",
+		"permission_hits 4",
+		"pdh_hits 4",
+		"api_calls 2")
+
+	coll2, err = cache.Get(arv, arvadostest.FooCollectionPDH, false)
+	c.Check(err, check.Equals, nil)
+	c.Assert(coll2, check.NotNil)
+	c.Check(coll2.PortableDataHash, check.Equals, arvadostest.FooCollectionPDH)
+	c.Check(coll2.ManifestText[:2], check.Equals, ". ")
+
+	s.checkCacheMetrics(c, cache.registry,
+		"requests 7",
+		"hits 5",
+		"permission_hits 5",
+		"pdh_hits 4",
+		"api_calls 2")
 
 	// Alternating between two collections N times should produce
 	// only 2 more API calls.
@@ -64,45 +102,50 @@ func (s *UnitSuite) TestCache(c *check.C) {
 		_, err := cache.Get(arv, target, false)
 		c.Check(err, check.Equals, nil)
 	}
-	c.Check(cache.Stats().Requests, check.Equals, uint64(5+2+20))
-	c.Check(cache.Stats().CollectionHits, check.Equals, uint64(4+2+18))
-	c.Check(cache.Stats().PermissionHits, check.Equals, uint64(4+1+18))
-	c.Check(cache.Stats().PDHHits, check.Equals, uint64(4+0+18))
-	c.Check(cache.Stats().APICalls, check.Equals, uint64(1+1+2))
+	s.checkCacheMetrics(c, cache.registry,
+		"requests 27",
+		"hits 23",
+		"permission_hits 23",
+		"pdh_hits 22",
+		"api_calls 4")
 }
 
 func (s *UnitSuite) TestCacheForceReloadByPDH(c *check.C) {
 	arv, err := arvadosclient.MakeArvadosClient()
 	c.Assert(err, check.Equals, nil)
 
-	cache := DefaultConfig().Cache
+	cache := newConfig(s.Config).Cache
+	cache.registry = prometheus.NewRegistry()
 
 	for _, forceReload := range []bool{false, true, false, true} {
-		_, err := cache.Get(arv, arvadostest.FooPdh, forceReload)
+		_, err := cache.Get(arv, arvadostest.FooCollectionPDH, forceReload)
 		c.Check(err, check.Equals, nil)
 	}
 
-	c.Check(cache.Stats().Requests, check.Equals, uint64(4))
-	c.Check(cache.Stats().CollectionHits, check.Equals, uint64(3))
-	c.Check(cache.Stats().PermissionHits, check.Equals, uint64(1))
-	c.Check(cache.Stats().PDHHits, check.Equals, uint64(0))
-	c.Check(cache.Stats().APICalls, check.Equals, uint64(3))
+	s.checkCacheMetrics(c, cache.registry,
+		"requests 4",
+		"hits 3",
+		"permission_hits 1",
+		"pdh_hits 0",
+		"api_calls 3")
 }
 
 func (s *UnitSuite) TestCacheForceReloadByUUID(c *check.C) {
 	arv, err := arvadosclient.MakeArvadosClient()
 	c.Assert(err, check.Equals, nil)
 
-	cache := DefaultConfig().Cache
+	cache := newConfig(s.Config).Cache
+	cache.registry = prometheus.NewRegistry()
 
 	for _, forceReload := range []bool{false, true, false, true} {
 		_, err := cache.Get(arv, arvadostest.FooCollection, forceReload)
 		c.Check(err, check.Equals, nil)
 	}
 
-	c.Check(cache.Stats().Requests, check.Equals, uint64(4))
-	c.Check(cache.Stats().CollectionHits, check.Equals, uint64(3))
-	c.Check(cache.Stats().PermissionHits, check.Equals, uint64(1))
-	c.Check(cache.Stats().PDHHits, check.Equals, uint64(3))
-	c.Check(cache.Stats().APICalls, check.Equals, uint64(3))
+	s.checkCacheMetrics(c, cache.registry,
+		"requests 4",
+		"hits 3",
+		"permission_hits 1",
+		"pdh_hits 3",
+		"api_calls 3")
 }