fixup

Author: torcolvin

db/background_mgr_resync_dcp.go

@@ -81,12 +81,17 @@ func (r *ResyncManagerDCP) Init(ctx context.Context, options map[string]any, clu
 		return errors.New("collections option is required and must be of type base.CollectionNames")
 	}
 
-	// Get collectionIds and store in manager for use in DCP client later
-	collections, err := getResyncCollections(db, resyncCollections)
-	if err != nil {
-		return err
+	var collections DatabaseCollections
+	if len(resyncCollections) > 0 {
+		var err error
+		collections, err = db.collections(resyncCollections)
+		if err != nil {
+			return err
+		}
+	} else {
+		collections = slices.Collect(maps.Values(db.CollectionByID))
+		r.hasAllCollections = true
 	}
-	r.hasAllCollections = len(resyncCollections) == 0
 	// add collection list to manager for use in status call
 	r.setCollectionStatus(collections)
 
@@ -443,7 +448,6 @@ func (r *ResyncManagerDCP) Run(ctx context.Context, options map[string]any, pers
 	return nil
 }
 
-// getResyncCollections returns collections requested for resync. If no collections are specified, it returns all collections.
 func getResyncCollections(db *Database, resyncCollections base.CollectionNames) (collections DatabaseCollections, err error) {
 	if len(resyncCollections) == 0 {
 		return slices.Collect(maps.Values(db.CollectionByID)), nil

db/database.go

@@ -2615,3 +2615,18 @@ func (db *DatabaseContext) InitializeOfflineMode() {
 	db.DBStateManager.SetResyncFunc(TempResyncHandler)
 	db.DBStateManager.StartPolling(db.CancelContext)
 }
+
+// colletions returns the DatabaseCollection objects matching the following collection names.
+func (db *DatabaseContext) collections(names base.CollectionNames) (DatabaseCollections, error) {
+	collections := make(DatabaseCollections, 0, len(names))
+	for scopeName, collectionsName := range names {
+		for _, collectionName := range collectionsName {
+			collection, err := db.GetDatabaseCollection(scopeName, collectionName)
+			if err != nil {
+				return nil, base.RedactErrorf("failed to find ID for collection %s.%s", base.MD(scopeName).Redact(), base.MD(collectionName).Redact())
+			}
+			collections = append(collections, collection)
+		}
+	}
+	return collections, nil
+}

docs/api/components/schemas.yaml

@@ -2014,6 +2014,7 @@ Resync-status:
       type: integer
     docs_errored:
       description: The number of documents which have errored running resync.
+      type: integer
     collections_processing:
       description: The collections that the resync operation is running on.
       allOf: