From ce2e944353b2e546643ad0bb826abe67aa1f2fb8 Mon Sep 17 00:00:00 2001 From: PJ Date: Mon, 21 Oct 2024 13:32:52 +0200 Subject: [PATCH] testing: add more debug logging --- .github/workflows/test.yml | 4 ++-- stores/metadata.go | 5 ++++- stores/slabbuffer.go | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c402df9ac..1b2159aa8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -72,7 +72,7 @@ jobs: uses: n8maninger/action-golang-test@v1 with: package: "./internal/test/e2e/..." - args: "-failfast;-race;-timeout=60m" + args: "-failfast;-race;-timeout=60m;-count=20;run='TestUploadPacking'" - name: Test Integration - MySQL if: matrix.os == 'ubuntu-latest' uses: n8maninger/action-golang-test@v1 @@ -82,6 +82,6 @@ jobs: RENTERD_DB_PASSWORD: test with: package: "./internal/test/e2e/..." - args: "-failfast;-race;-timeout=60m" + args: "-failfast;-race;-timeout=60m;-count=20;run='TestUploadPacking'" - name: Build run: go build -o bin/ ./cmd/renterd diff --git a/stores/metadata.go b/stores/metadata.go index f19661ad4..e3e2b96a1 100644 --- a/stores/metadata.go +++ b/stores/metadata.go @@ -664,7 +664,9 @@ func (s *SQLStore) ObjectMetadata(ctx context.Context, bucket, path string) (obj func (s *SQLStore) PackedSlabsForUpload(ctx context.Context, lockingDuration time.Duration, minShards, totalShards uint8, set string, limit int) ([]api.PackedSlab, error) { packed, err := s.slabBufferMgr.SlabsForUpload(ctx, lockingDuration, minShards, totalShards, set, limit) if len(packed) > 0 { - fmt.Println("DEBUG PJ: bus returning packed slab") + for _, p := range packed { + fmt.Println("DEBUG PJ: BUS returning packed slab", p.BufferID) + } } return packed, err } @@ -690,6 +692,7 @@ func (s *SQLStore) PrunableContractRoots(ctx context.Context, fcid types.FileCon func (s *SQLStore) MarkPackedSlabsUploaded(ctx context.Context, slabs []api.UploadedPackedSlab) error { // Sanity check input. for i, ss := range slabs { + fmt.Println("DEBUG PJ: BUS: MarkPackedSlabsUploaded", ss.BufferID) for _, shard := range ss.Shards { // Verify that all hosts have a contract. if len(shard.Contracts) == 0 { diff --git a/stores/slabbuffer.go b/stores/slabbuffer.go index 5e8a542b8..28051282f 100644 --- a/stores/slabbuffer.go +++ b/stores/slabbuffer.go @@ -148,6 +148,8 @@ func (mgr *SlabBufferManager) Close() error { } func (mgr *SlabBufferManager) AddPartialSlab(ctx context.Context, data []byte, minShards, totalShards uint8, contractSet string) ([]object.SlabSlice, int64, error) { + fmt.Println("DEBUG PJ: BUS: add partial slab", len(data)) + defer fmt.Println("DEBUG PJ: BUS: done adding partial slab", len(data)) var set int64 err := mgr.db.Transaction(ctx, func(tx sql.DatabaseTx) (err error) { set, err = tx.ContractSetID(ctx, contractSet)