From b3d0caabe2653766cb905f8da1bfc2854a711266 Mon Sep 17 00:00:00 2001
From: Chris Lu <chrislusf@users.noreply.github.com>
Date: Wed, 28 Oct 2026 08:07:23 -0700
Subject: [PATCH] vector: only follow a leader hint that points elsewhere
 (#12164)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* vector: only follow a leader hint that points elsewhere

The master sends volume_location on every KeepConnected response —
the leader always names itself, so the worker exited the stream on
the first response and flapped every 3s, leaving ListClusterNodes to
see the node intermittently. Only redirect when the hint points at a
different master.

* vector: leader hints carry host:http.grpc — normalize before comparing

A self-hint arrives as host:9333.19333 while --masters gives host:9333,
so the raw comparison still redirected and grpc_addr could not parse
the dotted port. grpc_addr now prefers the explicit .grpcPort, and the
hint comparison normalizes both sides to host:httpPort first.
---
 .../crates/server/src/master_client.rs        | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/seaweed-vector/crates/server/src/master_client.rs b/seaweed-vector/crates/server/src/master_client.rs
index 11f983f345..614cdcd7f1 100644
--- a/seaweed-vector/crates/server/src/master_client.rs
+++ b/seaweed-vector/crates/server/src/master_client.rs
@@ -25,9 +25,16 @@ fn registration(client_addr: &str) -> KeepConnectedRequest {
 
 /// Masters are configured by their HTTP address; gRPC lives +10000 like the
 /// weed conventions (server_address.ToGrpcAddress).
+// A master address may carry an explicit gRPC port as `host:http.grpc` —
+// use it directly; otherwise the gRPC port is http + 10000.
 fn grpc_addr(master: &str) -> String {
     let (scheme, rest) = master.split_once("://").unwrap_or(("http", master));
     if let Some((host, port)) = rest.rsplit_once(':') {
+        if let Some((_, grpc)) = port.split_once('.') {
+            if grpc.parse::<u16>().is_ok() {
+                return format!("{scheme}://{host}:{grpc}");
+            }
+        }
         if let Ok(port) = port.parse::<u16>() {
             return format!("{scheme}://{host}:{}", port + 10000);
         }
@@ -35,6 +42,18 @@ fn grpc_addr(master: &str) -> String {
     format!("{scheme}://{rest}")
 }
 
+// `host:http.grpc` normalizes to `host:http` so a leader hint naming the
+// dialed master does not read as a redirect.
+fn http_addr(master: &str) -> String {
+    let rest = master.rsplit_once("://").map(|(_, r)| r).unwrap_or(master);
+    match rest.rsplit_once(':') {
+        Some((host, port)) => {
+            format!("{host}:{}", port.split('.').next().unwrap_or(port))
+        }
+        None => rest.to_string(),
+    }
+}
+
 /// Retry forever: try each master until a stream opens, hold it until it
 /// errors, then rediscover — same shape as wdclient.KeepConnectedToMaster.
 /// A follower response's leader hint takes priority on the next pass.
@@ -75,8 +94,14 @@ async fn stream_to(master: &str, client_addr: &str) -> Result<Option<String>> {
         tokio::select! {
             msg = stream.message() => match msg? {
                 Some(resp) => {
+                    // A volume_location appears on every response — only
+                    // follow it when the hint points at a different master,
+                    // otherwise the leader keeps identifying itself and we
+                    // would reconnect forever.
                     if let Some(loc) = resp.volume_location {
-                        if !loc.leader.is_empty() {
+                        if !loc.leader.is_empty()
+                            && http_addr(&loc.leader) != http_addr(master)
+                        {
                             return Ok(Some(loc.leader));
                         }
                     }