Fix compact tests.

Author: rkistner

modules/module-mongodb-storage/src/storage/implementation/MongoCompactor.ts

@@ -61,6 +61,7 @@ export interface MongoCompactOptions extends storage.CompactOptions {}
 const DEFAULT_CLEAR_BATCH_LIMIT = 5000;
 const DEFAULT_MOVE_BATCH_LIMIT = 2000;
 const DEFAULT_MOVE_BATCH_QUERY_LIMIT = 10_000;
+const DEFAULT_MIN_BUCKET_CHANGES = 10;
 
 /** This default is primarily for tests. */
 const DEFAULT_MEMORY_LIMIT_MB = 64;
@@ -73,6 +74,7 @@ export class MongoCompactor {
   private moveBatchLimit: number;
   private moveBatchQueryLimit: number;
   private clearBatchLimit: number;
+  private minBucketChanges: number;
   private maxOpId: bigint;
   private buckets: string[] | undefined;
   private signal?: AbortSignal;
@@ -88,6 +90,7 @@ export class MongoCompactor {
     this.moveBatchLimit = options?.moveBatchLimit ?? DEFAULT_MOVE_BATCH_LIMIT;
     this.moveBatchQueryLimit = options?.moveBatchQueryLimit ?? DEFAULT_MOVE_BATCH_QUERY_LIMIT;
     this.clearBatchLimit = options?.clearBatchLimit ?? DEFAULT_CLEAR_BATCH_LIMIT;
+    this.minBucketChanges = options?.minBucketChanges ?? DEFAULT_MIN_BUCKET_CHANGES;
     this.maxOpId = options?.maxOpId ?? 0n;
     this.buckets = options?.compactBuckets;
     this.signal = options?.signal;
@@ -119,7 +122,10 @@ export class MongoCompactor {
       const TRACK_RECENTLY_COMPACTED_NUMBER = 100;
 
       let recentlyCompacted: string[] = [];
-      const buckets = await this.dirtyBucketBatch({ minBucketChanges: 10, exclude: recentlyCompacted });
+      const buckets = await this.dirtyBucketBatch({
+        minBucketChanges: this.minBucketChanges,
+        exclude: recentlyCompacted
+      });
       if (buckets.length == 0) {
         // All done
         break;

modules/module-mongodb-storage/test/src/storage_compacting.test.ts

@@ -62,6 +62,7 @@ bucket_definitions:
         clearBatchLimit: 200,
         moveBatchLimit: 10,
         moveBatchQueryLimit: 10,
+        minBucketChanges: 1,
         maxOpId: checkpoint,
         signal: null as any
       });

packages/service-core-tests/src/tests/register-compacting-tests.ts

@@ -80,7 +80,8 @@ bucket_definitions:
     await bucketStorage.compact({
       clearBatchLimit: 2,
       moveBatchLimit: 1,
-      moveBatchQueryLimit: 1
+      moveBatchQueryLimit: 1,
+      minBucketChanges: 1
     });
 
     const batchAfter = await test_utils.oneFromAsync(
@@ -207,7 +208,8 @@ bucket_definitions:
     await bucketStorage.compact({
       clearBatchLimit: 2,
       moveBatchLimit: 1,
-      moveBatchQueryLimit: 1
+      moveBatchQueryLimit: 1,
+      minBucketChanges: 1
     });
 
     const batchAfter = await test_utils.oneFromAsync(
@@ -300,7 +302,8 @@ bucket_definitions:
     await bucketStorage.compact({
       clearBatchLimit: 2,
       moveBatchLimit: 1,
-      moveBatchQueryLimit: 1
+      moveBatchQueryLimit: 1,
+      minBucketChanges: 1
     });
 
     const batchAfter = await test_utils.oneFromAsync(
@@ -412,7 +415,8 @@ bucket_definitions:
     await bucketStorage.compact({
       clearBatchLimit: 100,
       moveBatchLimit: 100,
-      moveBatchQueryLimit: 100 // Larger limit for a larger window of operations
+      moveBatchQueryLimit: 100, // Larger limit for a larger window of operations
+      minBucketChanges: 1
     });
 
     const batchAfter = await test_utils.fromAsync(
@@ -498,7 +502,8 @@ bucket_definitions:
     await bucketStorage.compact({
       clearBatchLimit: 2,
       moveBatchLimit: 1,
-      moveBatchQueryLimit: 1
+      moveBatchQueryLimit: 1,
+      minBucketChanges: 1
     });
 
     const result2 = await bucketStorage.startBatch(test_utils.BATCH_OPTIONS, async (batch) => {
@@ -572,7 +577,8 @@ bucket_definitions:
     await bucketStorage.compact({
       clearBatchLimit: 20,
       moveBatchLimit: 10,
-      moveBatchQueryLimit: 10
+      moveBatchQueryLimit: 10,
+      minBucketChanges: 1
     });
 
     const checkpoint2 = result2!.flushed_op;

packages/service-core/src/storage/SyncRulesBucketStorage.ts

@@ -217,6 +217,11 @@ export interface CompactOptions {
   /** Minimum of 1 */
   moveBatchQueryLimit?: number;
 
+  /**
+   * Minimof of 1, default of 10.
+   */
+  minBucketChanges?: number;
+
   /**
    * Internal/testing use: Cache size for compacting parameters.
    */