github/distribution
1
0
Fork 0
mirror of https://github.com/distribution/distribution.git synced 2025-08-12 12:12:19 +00:00
Code Issues Projects Releases Wiki Activity

TestProxyManifestsMetrics: use actual size of manifest (#4467)

Browse Source
This commit is contained in:
Milos Gajdos 2024-10-03 10:02:30 +01:00 committed by GitHub
commit 44be16a883
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
registry/proxy/proxymanifeststore_test.go
View File

@ -27,6 +27,7 @@ type statsManifest struct {
type manifestStoreTestEnv struct { type manifestStoreTestEnv struct {
manifestDigest digest.Digest // digest of the signed manifest in the local storage manifestDigest digest.Digest // digest of the signed manifest in the local storage
manifestSize uint64
manifests proxyManifestStore manifests proxyManifestStore
} }
@ -106,7 +107,7 @@ func newManifestStoreTestEnv(t *testing.T, name, tag string) *manifestStoreTestE
stats: make(map[string]int), stats: make(map[string]int),
} }
manifestDigest, err := populateRepo(ctx, t, truthRepo, name, tag) manifestDigest, manifestSize, err := populateRepo(ctx, t, truthRepo, name, tag)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -133,6 +134,7 @@ func newManifestStoreTestEnv(t *testing.T, name, tag string) *manifestStoreTestE
s := scheduler.New(ctx, inmemory.New(), "/scheduler-state.json") s := scheduler.New(ctx, inmemory.New(), "/scheduler-state.json")
return &manifestStoreTestEnv{ return &manifestStoreTestEnv{
manifestDigest: manifestDigest, manifestDigest: manifestDigest,
manifestSize: manifestSize,
manifests: proxyManifestStore{ manifests: proxyManifestStore{
ctx: ctx, ctx: ctx,
localManifests: localManifests, localManifests: localManifests,
@ -144,7 +146,7 @@ func newManifestStoreTestEnv(t *testing.T, name, tag string) *manifestStoreTestE
} }
} }
func populateRepo(ctx context.Context, t *testing.T, repository distribution.Repository, name, tag string) (digest.Digest, error) { func populateRepo(ctx context.Context, t *testing.T, repository distribution.Repository, name, tag string) (manifestDigest digest.Digest, manifestSize uint64, _ error) {
config := []byte(`{"name": "foo"}`) config := []byte(`{"name": "foo"}`)
configDigest := digest.FromBytes(config) configDigest := digest.FromBytes(config)
configReader := bytes.NewReader(config) configReader := bytes.NewReader(config)
@ -181,12 +183,17 @@ func populateRepo(ctx context.Context, t *testing.T, repository distribution.Rep
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
smJSON, err := sm.MarshalJSON()
if err != nil {
t.Fatal(err)
}
dgst, err := ms.Put(ctx, sm) dgst, err := ms.Put(ctx, sm)
if err != nil { if err != nil {
t.Fatalf("unexpected errors putting manifest: %v", err) t.Fatalf("unexpected errors putting manifest: %v", err)
} }
return dgst, nil return dgst, uint64(len(smJSON)), nil
} }
// TestProxyManifests contains basic acceptance tests // TestProxyManifests contains basic acceptance tests
@ -304,11 +311,11 @@ func TestProxyManifestsMetrics(t *testing.T) {
if proxyMetrics.manifestMetrics.Misses != 1 { if proxyMetrics.manifestMetrics.Misses != 1 {
t.Errorf("Expected manifestMetrics.Misses %d but got %d", 1, proxyMetrics.manifestMetrics.Misses) t.Errorf("Expected manifestMetrics.Misses %d but got %d", 1, proxyMetrics.manifestMetrics.Misses)
} }
if proxyMetrics.manifestMetrics.BytesPulled != 257 { if proxyMetrics.manifestMetrics.BytesPulled != env.manifestSize {
t.Errorf("Expected manifestMetrics.BytesPulled %d but got %d", 257, proxyMetrics.manifestMetrics.BytesPulled) t.Errorf("Expected manifestMetrics.BytesPulled %d but got %d", env.manifestSize, proxyMetrics.manifestMetrics.BytesPulled)
} }
if proxyMetrics.manifestMetrics.BytesPushed != 257 { if proxyMetrics.manifestMetrics.BytesPushed != env.manifestSize {
t.Errorf("Expected manifestMetrics.BytesPushed %d but got %d", 257, proxyMetrics.manifestMetrics.BytesPushed) t.Errorf("Expected manifestMetrics.BytesPushed %d but got %d", env.manifestSize, proxyMetrics.manifestMetrics.BytesPushed)
} }
// Get proxied - manifest comes from local // Get proxied - manifest comes from local
@ -326,10 +333,10 @@ func TestProxyManifestsMetrics(t *testing.T) {
if proxyMetrics.manifestMetrics.Misses != 1 { if proxyMetrics.manifestMetrics.Misses != 1 {
t.Errorf("Expected manifestMetrics.Misses %d but got %d", 1, proxyMetrics.manifestMetrics.Misses) t.Errorf("Expected manifestMetrics.Misses %d but got %d", 1, proxyMetrics.manifestMetrics.Misses)
} }
if proxyMetrics.manifestMetrics.BytesPulled != 257 { if proxyMetrics.manifestMetrics.BytesPulled != env.manifestSize {
t.Errorf("Expected manifestMetrics.BytesPulled %d but got %d", 257, proxyMetrics.manifestMetrics.BytesPulled) t.Errorf("Expected manifestMetrics.BytesPulled %d but got %d", env.manifestSize, proxyMetrics.manifestMetrics.BytesPulled)
} }
if proxyMetrics.manifestMetrics.BytesPushed != 514 { if proxyMetrics.manifestMetrics.BytesPushed != (env.manifestSize * 2) {
t.Errorf("Expected manifestMetrics.BytesPushed %d but got %d", 514, proxyMetrics.manifestMetrics.BytesPushed) t.Errorf("Expected manifestMetrics.BytesPushed %d but got %d", env.manifestSize*2, proxyMetrics.manifestMetrics.BytesPushed)
} }
} }