viktorsomogyi · Jul 28, 2026 · Jul 27, 2026
diff --git a/docs/inkless/configs.rst b/docs/inkless/configs.rst
@@ -266,10 +266,10 @@ Under ``inkless.``
   * Importance: low
 
 ``retention.enforcement.max.batches.per.request``
-  The maximum number of batches to delete per partition when enforcing retention. A value of 0 means all eligible batches are deleted in one request. Setting this to a lower value can help to reduce the load on the control plane back-end.
+  The maximum number of batches to delete per partition when enforcing retention. A value of 0 means all eligible batches are deleted in one request, which makes the retention boundary scan proportional to the partition depth and can exceed the control-plane socket timeout on very deep partitions. A positive value bounds both the boundary scan and the delete to that many batches per pass, so a deep backlog drains over successive enforcement cycles instead of one unbounded request. It should be set above the per-interval expiry rate so retention does not fall behind.
 
   * Type: int
-  * Default: 0
+  * Default: 1000
   * Valid Values: [0,...]
   * Importance: low
 

diff --git a/storage/inkless/src/main/java/io/aiven/inkless/config/InklessConfig.java b/storage/inkless/src/main/java/io/aiven/inkless/config/InklessConfig.java
@@ -240,9 +240,12 @@ public class InklessConfig extends AbstractConfig {
 
     public static final String RETENTION_ENFORCEMENT_MAX_BATCHES_PER_REQUEST_CONFIG = "retention.enforcement.max.batches.per.request";
     public static final String RETENTION_ENFORCEMENT_MAX_BATCHES_PER_REQUEST_DOC = "The maximum number of batches to delete per partition when enforcing retention. "
-        + "A value of 0 means all eligible batches are deleted in one request. "
-        + "Setting this to a lower value can help to reduce the load on the control plane back-end.";
-    private static final int RETENTION_ENFORCEMENT_MAX_BATCHES_PER_REQUEST_DEFAULT = 0;
+        + "A value of 0 means all eligible batches are deleted in one request, which makes the retention boundary "
+        + "scan proportional to the partition depth and can exceed the control-plane socket timeout on very deep "
+        + "partitions. A positive value bounds both the boundary scan and the delete to that many batches per pass, "
+        + "so a deep backlog drains over successive enforcement cycles instead of one unbounded request. "
+        + "It should be set above the per-interval expiry rate so retention does not fall behind.";
+    private static final int RETENTION_ENFORCEMENT_MAX_BATCHES_PER_REQUEST_DEFAULT = 1000;
 
     public static final String BATCH_COALESCING_ENABLED_CONFIG = CONTROL_PLANE_PREFIX + "batch.coalescing.enabled";
     public static final String BATCH_COALESCING_ENABLED_DOC = "When true, contiguous same-partition batch runs within a single commit are collapsed "

diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/DefaultSchema.java b/storage/inkless/src/main/jooq/org/jooq/generated/DefaultSchema.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/Domains.java b/storage/inkless/src/main/jooq/org/jooq/generated/Domains.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/Indexes.java b/storage/inkless/src/main/jooq/org/jooq/generated/Indexes.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/Keys.java b/storage/inkless/src/main/jooq/org/jooq/generated/Keys.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/Routines.java b/storage/inkless/src/main/jooq/org/jooq/generated/Routines.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/Tables.java b/storage/inkless/src/main/jooq/org/jooq/generated/Tables.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/UDTs.java b/storage/inkless/src/main/jooq/org/jooq/generated/UDTs.java
diff --git a/...kless/src/main/jooq/org/jooq/generated/enums/AdvanceCrossTierLogStartResponseErrorV1.java b/...kless/src/main/jooq/org/jooq/generated/enums/AdvanceCrossTierLogStartResponseErrorV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/enums/CommitBatchResponseErrorV1.java b/storage/inkless/src/main/jooq/org/jooq/generated/enums/CommitBatchResponseErrorV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/enums/DeleteRecordsResponseErrorV1.java b/storage/inkless/src/main/jooq/org/jooq/generated/enums/DeleteRecordsResponseErrorV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/enums/EnforceRetentionResponseErrorV1.java b/storage/inkless/src/main/jooq/org/jooq/generated/enums/EnforceRetentionResponseErrorV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/enums/FileReasonT.java b/storage/inkless/src/main/jooq/org/jooq/generated/enums/FileReasonT.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/enums/FileStateT.java b/storage/inkless/src/main/jooq/org/jooq/generated/enums/FileStateT.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/enums/FindBatchesResponseErrorV1.java b/storage/inkless/src/main/jooq/org/jooq/generated/enums/FindBatchesResponseErrorV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/enums/InitDisklessLogErrorV1.java b/storage/inkless/src/main/jooq/org/jooq/generated/enums/InitDisklessLogErrorV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/enums/ListOffsetsResponseErrorV1.java b/storage/inkless/src/main/jooq/org/jooq/generated/enums/ListOffsetsResponseErrorV1.java
diff --git a/...s/src/main/jooq/org/jooq/generated/enums/PruneBatchesBelowHighestTieredOffsetErrorV1.java b/...s/src/main/jooq/org/jooq/generated/enums/PruneBatchesBelowHighestTieredOffsetErrorV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/routines/BatchTimestamp.java b/storage/inkless/src/main/jooq/org/jooq/generated/routines/BatchTimestamp.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/routines/DeleteBatchV1.java b/storage/inkless/src/main/jooq/org/jooq/generated/routines/DeleteBatchV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/routines/DeleteFilesV1.java b/storage/inkless/src/main/jooq/org/jooq/generated/routines/DeleteFilesV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/routines/DeleteTopicV1.java b/storage/inkless/src/main/jooq/org/jooq/generated/routines/DeleteTopicV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/routines/FlushCommitRunV2.java b/storage/inkless/src/main/jooq/org/jooq/generated/routines/FlushCommitRunV2.java
diff --git a/storage/inkless/src/main/jo 10BC8 oq/org/jooq/generated/routines/MarkFileToDeleteV1.java b/storage/inkless/src/main/jo 10BC8 oq/org/jooq/generated/routines/MarkFileToDeleteV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/tables/AdvanceCrossTierLogStartV1.java b/storage/inkless/src/main/jooq/org/jooq/generated/tables/AdvanceCrossTierLogStartV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/tables/Batches.java b/storage/inkless/src/main/jooq/org/jooq/generated/tables/Batches.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/tables/CommitFileV1.java b/storage/inkless/src/main/jooq/org/jooq/generated/tables/CommitFileV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/tables/CommitFileV2.java b/storage/inkless/src/main/jooq/org/jooq/generated/tables/CommitFileV2.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/tables/DeleteRecordsV1.java b/storage/inkless/src/main/jooq/org/jooq/generated/tables/DeleteRecordsV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/tables/EnforceRetentionV1.java b/storage/inkless/src/main/jooq/org/jooq/generated/tables/EnforceRetentionV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/tables/EnforceRetentionV2.java b/storage/inkless/src/main/jooq/org/jooq/generated/tables/EnforceRetentionV2.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/tables/Files.java b/storage/inkless/src/main/jooq/org/jooq/generated/tables/Files.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/tables/FindBatchesV1.java b/storage/inkless/src/main/jooq/org/jooq/generated/tables/FindBatchesV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/tables/FindBatchesV2.java b/storage/inkless/src/main/jooq/org/jooq/generated/tables/FindBatchesV2.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/tables/InitDisklessLogV1.java b/storage/inkless/src/main/jooq/org/jooq/generated/tables/InitDisklessLogV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/tables/ListOffsetsV1.java b/storage/inkless/src/main/jooq/org/jooq/generated/tables/ListOffsetsV1.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/tables/Logs.java b/storage/inkless/src/main/jooq/org/jooq/generated/tables/Logs.java
diff --git a/storage/inkless/src/main/jooq/org/jooq/generated/tables/ProducerState.java b/storage/inkless/src/main/jooq/org/jooq/generated/tables/ProducerState.java
diff --git a/...kless/src/main/jooq/org/jooq/generated/tables/PruneBatchesBelowHighestTieredOffsetV1.java b/...kless/src/main/jooq/org/jooq/generated/tables/PruneBatchesBelowHighestTieredOffsetV1.java