- "git.curoverse.com/arvados.git/sdk/go/arvados"
- "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
- "git.curoverse.com/arvados.git/sdk/go/arvadostest"
+ "git.arvados.org/arvados.git/sdk/go/arvados"
+ "git.arvados.org/arvados.git/sdk/go/arvadosclient"
+ "git.arvados.org/arvados.git/sdk/go/arvadostest"
+ "git.arvados.org/arvados.git/sdk/go/ctxlog"
arv, err := arvadosclient.MakeArvadosClient()
c.Assert(err, check.Equals, nil)
arv, err := arvadosclient.MakeArvadosClient()
c.Assert(err, check.Equals, nil)
- cache := DefaultConfig().Cache
- cache.registry = prometheus.NewRegistry()
+ cache := &cache{
+ cluster: s.cluster,
+ logger: ctxlog.TestLogger(c),
+ 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 the same collection 5 times using the same token. Only
// the first req should cause an API call; the next 4 should
coll, err = cache.Get(arv, arvadostest.FooCollection, false)
c.Check(err, check.Equals, nil)
c.Assert(coll, check.NotNil)
coll, err = cache.Get(arv, arvadostest.FooCollection, false)
c.Check(err, check.Equals, nil)
c.Assert(coll, check.NotNil)
c.Check(coll.ManifestText[:2], check.Equals, ". ")
}
s.checkCacheMetrics(c, cache.registry,
"requests 5",
"hits 4",
c.Check(coll.ManifestText[:2], check.Equals, ". ")
}
s.checkCacheMetrics(c, cache.registry,
"requests 5",
"hits 4",
- coll2, err := cache.Get(arv, arvadostest.FooPdh, false)
+ coll2, err := cache.Get(arv, arvadostest.FooCollectionPDH, false)
c.Check(err, check.Equals, nil)
c.Assert(coll2, check.NotNil)
c.Check(err, check.Equals, nil)
c.Assert(coll2, check.NotNil)
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",
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",
- coll2, err = cache.Get(arv, arvadostest.FooPdh, false)
+ coll2, err = cache.Get(arv, arvadostest.FooCollectionPDH, false)
c.Check(err, check.Equals, nil)
c.Assert(coll2, check.NotNil)
c.Check(err, check.Equals, nil)
c.Assert(coll2, check.NotNil)
c.Check(coll2.ManifestText[:2], check.Equals, ". ")
s.checkCacheMetrics(c, cache.registry,
"requests 7",
"hits 5",
c.Check(coll2.ManifestText[:2], check.Equals, ". ")
s.checkCacheMetrics(c, cache.registry,
"requests 7",
"hits 5",
arv, err := arvadosclient.MakeArvadosClient()
c.Assert(err, check.Equals, nil)
arv, err := arvadosclient.MakeArvadosClient()
c.Assert(err, check.Equals, nil)
- cache := DefaultConfig().Cache
- cache.registry = prometheus.NewRegistry()
+ cache := &cache{
+ cluster: s.cluster,
+ logger: ctxlog.TestLogger(c),
+ registry: prometheus.NewRegistry(),
+ }
for _, forceReload := range []bool{false, true, false, true} {
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)
}
s.checkCacheMetrics(c, cache.registry,
"requests 4",
"hits 3",
c.Check(err, check.Equals, nil)
}
s.checkCacheMetrics(c, cache.registry,
"requests 4",
"hits 3",
}
func (s *UnitSuite) TestCacheForceReloadByUUID(c *check.C) {
arv, err := arvadosclient.MakeArvadosClient()
c.Assert(err, check.Equals, nil)
}
func (s *UnitSuite) TestCacheForceReloadByUUID(c *check.C) {
arv, err := arvadosclient.MakeArvadosClient()
c.Assert(err, check.Equals, nil)
- cache := DefaultConfig().Cache
- cache.registry = prometheus.NewRegistry()
+ cache := &cache{
+ cluster: s.cluster,
+ logger: ctxlog.TestLogger(c),
+ registry: prometheus.NewRegistry(),
+ }
for _, forceReload := range []bool{false, true, false, true} {
_, err := cache.Get(arv, arvadostest.FooCollection, forceReload)
for _, forceReload := range []bool{false, true, false, true} {
_, err := cache.Get(arv, arvadostest.FooCollection, forceReload)