CBG-4932 improve ResyncManger test flakes

db/background_mgr.go

@@ -10,10 +10,8 @@ package db
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 	"sync"
-	"testing"
 	"time"
 
 	sgbucket "github.com/couchbase/sg-bucket"
@@ -408,25 +406,6 @@ func (b *BackgroundManager) GetRunState() BackgroundProcessState {
 	return b.State
 }
 
-// For test use only
-// Returns empty string if background process is not cluster aware
-func (b *BackgroundManager) GetHeartbeatDocID(t testing.TB) string {
-	if b.isClusterAware() {
-		return b.clusterAwareOptions.HeartbeatDocID()
-	}
-	return ""
-}
-
-// For test use only
-// Returns error if background process is not cluster aware
-func (b *BackgroundManager) GetHeartbeatDoc(t testing.TB) ([]byte, error) {
-	if b.isClusterAware() {
-		b, _, err := b.clusterAwareOptions.metadataStore.GetRaw(b.GetHeartbeatDocID(t))
-		return b, err
-	}
-	return nil, fmt.Errorf("background process is not cluster aware")
-}
-
 func (b *BackgroundManager) SetError(err error) {
 	b.lock.Lock()
 	defer b.lock.Unlock()

db/background_mgr_attachment_migration_test.go

@@ -55,7 +55,7 @@ func TestAttachmentMigrationTaskMixMigratedAndNonMigratedDocs(t *testing.T) {
 	require.NoError(t, err)
 
 	// wait for task to complete
-	RequireBackgroundManagerState(t, ctx, attachMigrationMgr, BackgroundProcessStateCompleted)
+	RequireBackgroundManagerState(t, attachMigrationMgr, BackgroundProcessStateCompleted)
 
 	// assert that the subset (5) of the docs were changed, all created docs were processed (10)
 	stats := getAttachmentMigrationStats(t, attachMigrationMgr.Process)
@@ -118,7 +118,7 @@ func TestAttachmentMigrationManagerResumeStoppedMigration(t *testing.T) {
 		}
 	}()
 
-	RequireBackgroundManagerState(t, ctx, attachMigrationMgr, BackgroundProcessStateStopped)
+	RequireBackgroundManagerState(t, attachMigrationMgr, BackgroundProcessStateStopped)
 
 	stats := getAttachmentMigrationStats(t, attachMigrationMgr.Process)
 	require.Less(t, stats.DocsProcessed, int64(4000))
@@ -132,7 +132,7 @@ func TestAttachmentMigrationManagerResumeStoppedMigration(t *testing.T) {
 	err = attachMigrationMgr.Start(ctx, nil)
 	require.NoError(t, err)
 
-	RequireBackgroundManagerState(t, ctx, attachMigrationMgr, BackgroundProcessStateCompleted)
+	RequireBackgroundManagerState(t, attachMigrationMgr, BackgroundProcessStateCompleted)
 
 	stats = getAttachmentMigrationStats(t, attachMigrationMgr.Process)
 	require.GreaterOrEqual(t, stats.DocsProcessed, int64(4000))
@@ -169,7 +169,7 @@ func TestAttachmentMigrationManagerNoDocsToMigrate(t *testing.T) {
 	require.NoError(t, err)
 
 	// wait for task to complete
-	RequireBackgroundManagerState(t, ctx, attachMigrationMgr, BackgroundProcessStateCompleted)
+	RequireBackgroundManagerState(t, attachMigrationMgr, BackgroundProcessStateCompleted)
 
 	// assert that the two added docs above were processed but not changed
 	stats := getAttachmentMigrationStats(t, attachMigrationMgr.Process)
@@ -227,7 +227,7 @@ func TestMigrationManagerDocWithSyncAndGlobalAttachmentMetadata(t *testing.T) {
 	require.NoError(t, err)
 
 	// wait for task to complete
-	RequireBackgroundManagerState(t, ctx, attachMigrationMgr, BackgroundProcessStateCompleted)
+	RequireBackgroundManagerState(t, attachMigrationMgr, BackgroundProcessStateCompleted)
 
 	// assert that the two added docs above were processed but not changed
 	stats := getAttachmentMigrationStats(t, attachMigrationMgr.Process)

db/background_mgr_resync_dcp.go

@@ -234,7 +234,10 @@ func (r *ResyncManagerDCP) Run(ctx context.Context, options map[string]any, pers
 			for _, databaseCollection := range db.CollectionByID {
 				collectionNames = append(collectionNames, databaseCollection.ScopeAndCollectionName())
 			}
-			db.invalidateAllPrincipals(ctx, collectionNames, endSeq)
+			err = db.invalidateAllPrincipals(ctx, collectionNames, endSeq)
+			if err != nil {
+				return fmt.Errorf("Could not invalidate principal documents: %w", err)
+			}
 
 		}