stores: address comments

SiaFoundation · Apr 4, 2024 · 56adf02 · 56adf02
1 parent 98626ba
commit 56adf02
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/stores/metadata.go b/stores/metadata.go
@@ -2727,7 +2727,7 @@ func (s *SQLStore) pruneSlabsLoop() {
 			return
 		}
 
-		ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
+		ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second+sumDurations(s.retryTransactionIntervals))
 		err := s.retryTransaction(ctx, pruneSlabs)
 		if err != nil {
 			s.logger.Errorw("failed to prune slabs", zap.Error(err))

diff --git a/stores/metadata_test.go b/stores/metadata_test.go
@@ -4097,7 +4097,6 @@ func TestSlabCleanup(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	time.Sleep(100 * time.Millisecond)
 
 	// check slice count
 	var slabCntr int64
@@ -4115,7 +4114,6 @@ func TestSlabCleanup(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	time.Sleep(100 * time.Millisecond)
 
 	ss.Retry(100, 100*time.Millisecond, func() error {
 		if err := ss.db.Model(&dbSlab{}).Count(&slabCntr).Error; err != nil {
@@ -4164,7 +4162,6 @@ func TestSlabCleanup(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	time.Sleep(100 * time.Millisecond)
 
 	ss.Retry(100, 100*time.Millisecond, func() error {
 		if err := ss.db.Model(&dbSlab{}).Count(&slabCntr).Error; err != nil {

diff --git a/stores/sql.go b/stores/sql.go
@@ -250,8 +250,6 @@ func NewSQLStore(cfg Config) (*SQLStore, modules.ConsensusChangeID, error) {
 	}
 
 	shutdownCtx, shutdownCtxCancel := context.WithCancel(context.Background())
-	slabPruneOngoing := make(chan struct{})
-	close(slabPruneOngoing)
 	ss := &SQLStore{
 		alerts:                 cfg.Alerts,
 		db:                     db,
@@ -622,3 +620,11 @@ func (s *SQLStore) ResetConsensusSubscription(ctx context.Context) error {
 	s.persistMu.Unlock()
 	return nil
 }
+
+func sumDurations(durations []time.Duration) time.Duration {
+	var sum time.Duration
+	for _, d := range durations {
+		sum += d
+	}
+	return sum
+}