From d89b9e6760e2aadf9779faa6f23678f67c731e1e Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Tue, 3 Feb 2026 17:09:18 +0200 Subject: Add SSH agent key selection and fix MapReduce outfile handling This commit adds two major features and fixes: 1. SSH Agent Key Selection: - Add --agentKeyIndex flag to select specific SSH agent key (0-based) - Solves "too many authentication failures" with multiple SSH keys - Default -1 uses all keys (backwards compatible) - Available in dtail, dcat, dgrep, dmap commands 2. MapReduce Outfile Fixes: - CSV files now written at every interval, not just on exit - Proper signal handling (SIGTERM/SIGINT) with graceful shutdown - 5-second grace period for cleanup before force exit - Fixes issue where outfile remained as .tmp during execution Usage: dtail --servers host --agentKeyIndex 0 --query '...' outfile results.csv This is particularly useful with YubiKey/hardware tokens where many keys are loaded in the SSH agent, and for monitoring MapReduce results in real-time as they're computed. Co-authored-by: Cursor --- cmd/dmap/main.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'cmd/dmap') diff --git a/cmd/dmap/main.go b/cmd/dmap/main.go index 7500ea6..ea5f020 100644 --- a/cmd/dmap/main.go +++ b/cmd/dmap/main.go @@ -28,7 +28,8 @@ func main() { var profileFlags profiling.Flags args := config.Args{ - Mode: omode.MapClient, + Mode: omode.MapClient, + SSHAgentKeyIndex: -1, } userName := user.Name() @@ -39,6 +40,7 @@ func main() { flag.BoolVar(&displayVersion, "version", false, "Display version") flag.IntVar(&args.ConnectionsPerCPU, "cpc", config.DefaultConnectionsPerCPU, "How many connections established per CPU core concurrently") + flag.IntVar(&args.SSHAgentKeyIndex, "agentKeyIndex", -1, "SSH agent key index to use (-1 for all keys)") flag.IntVar(&args.SSHPort, "port", config.DefaultSSHPort, "SSH server port") flag.IntVar(&args.Timeout, "timeout", 0, "Max time dtail server will collect data until disconnection") flag.StringVar(&args.ConfigFile, "cfg", "", "Config file path") @@ -89,7 +91,7 @@ func main() { dlog.Client.FatalPanic(err) } - status := client.Start(ctx, signal.InterruptCh(ctx)) + status := client.Start(ctx, signal.InterruptChWithCancel(ctx, cancel)) // Log final metrics if profiling is enabled if profileFlags.Enabled() { -- cgit v1.2.3