V14

core/cmd/dragontcp-client/main.go

@@ -374,7 +374,8 @@ func main() {
 		chunkAdaptLog    = flag.Bool("chunk-adapt-log", true, "print adaptive chunk size changes")
 		chunkSizeLegacy  = flag.Int("chunk-size", 0, "legacy fixed chunk size; nonzero disables adaptation")
 		chunkPollers     = flag.Int("chunk-pollers", 1, "reserved compatibility setting; binary transport uses one download worker")
-		chunkConcurrency = flag.Int("chunk-concurrency", 1, "maximum adaptive download pipeline depth (1-256); 1 keeps concurrency fixed at one")
+		chunkConcurrency = flag.Int("chunk-concurrency", 1, "maximum download records per request (1-256)")
+		chunkConcurrencyMin = flag.Int("chunk-concurrency-min", 1, "minimum download records per request (1-256); equal to --chunk-concurrency pins the depth and disables batch adaptation")
 		chunkReconnect   = flag.Int("chunk-reconnect-every", 0, "force reconnect after N logical requests; 0 = persistent/automatic")
 		chunkPollDelay   = flag.Duration("chunk-poll-delay", 2*time.Millisecond, "delay after an empty chunk poll")
 		chunkTimeout     = flag.Duration("chunk-timeout", 2*time.Second, "per-record transaction timeout before adaptive shrink")
@@ -417,6 +418,14 @@ func main() {
 		fmt.Fprintln(os.Stderr, "--chunk-concurrency must be between 1 and 256")
 		os.Exit(2)
 	}
+	if *chunkConcurrencyMin < 1 || *chunkConcurrencyMin > 256 {
+		fmt.Fprintln(os.Stderr, "--chunk-concurrency-min must be between 1 and 256")
+		os.Exit(2)
+	}
+	if *chunkConcurrencyMin > *chunkConcurrency {
+		fmt.Fprintln(os.Stderr, "--chunk-concurrency-min must not exceed --chunk-concurrency")
+		os.Exit(2)
+	}
 	if *chunkReconnect < 0 {
 		fmt.Fprintln(os.Stderr, "--chunk-reconnect-every must be 0 or greater")
 		os.Exit(2)
@@ -433,6 +442,7 @@ func main() {
 		pollDelay:      *chunkPollDelay,
 		txnTimeout:     *chunkTimeout,
 		tcpBuffer:      *tcpBuffer,
+		minPipeline:    *chunkConcurrencyMin,
 		maxPipeline:    *chunkConcurrency,
 	}
 
@@ -450,15 +460,21 @@ func main() {
 	fmt.Printf("remote DragonTCP endpoint=%s\n", serverAddr)
 	fmt.Printf("max_connections=%d transport=%s tcp_buffer=%d\n", *maxConnections, *transport, *tcpBuffer)
 	if *transport == "chunk" {
+		batchMode := "adaptive"
+		if *chunkConcurrencyMin == *chunkConcurrency {
+			batchMode = "pinned"
+		}
 		fmt.Printf(
-			"adaptive_chunk=%v start=%d min=%d max=%d grow_after=%d pollers=%d concurrency=%d reconnect_every=%d timeout=%s\n",
+			"adaptive_chunk=%v start=%d min=%d max=%d grow_after=%d pollers=%d batch=%d-%d(%s) reconnect_every=%d timeout=%s\n",
 			*chunkAdaptive,
 			*chunkStart,
 			*chunkMin,
 			*chunkMax,
 			*chunkSuccesses,
 			*chunkPollers,
+			*chunkConcurrencyMin,
 			*chunkConcurrency,
+			batchMode,
 			*chunkReconnect,
 			chunkTimeout.String(),
 		)