Skip to content

fix(cli): use HasPrefix for haproxy flag matching to avoid advertise-http-addr collision #173090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
waterWang wants to merge 2 commits into
base: master
Choose a base branch
from
+19 −2
Open

fix(cli): use HasPrefix for haproxy flag matching to avoid advertise-http-addr collision #173090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bde1827
fix(cli): use HasPrefix for haproxy flag matching to avoid advertise-…
waterWang Aug 4, 2026
ab59ded
test(cli): add test case for advertise-http-addr flag collision
waterWang Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkg/cli/haproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,10 @@ func nodeStatusesToNodeInfos(nodes *serverpb.NodesResponse) []haProxyNodeInfo {
// TODO(knz): this logic is horrendously broken and
// incorrect. Replace it.
for j, arg := range status.Args {
if strings.Contains(arg, cliflags.ListenHTTPPort.Name) ||
strings.Contains(arg, cliflags.ListenHTTPAddr.Name) {
if strings.HasPrefix(arg, "--"+cliflags.ListenHTTPPort.Name) ||
strings.HasPrefix(arg, "--"+cliflags.ListenHTTPAddr.Name) ||
strings.HasPrefix(arg, "-"+cliflags.ListenHTTPPort.Name) ||
strings.HasPrefix(arg, "-"+cliflags.ListenHTTPAddr.Name) {
_ = fs.Parse(status.Args[j:])
break
}
Expand Down
15 changes: 15 additions & 0 deletions pkg/cli/haproxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,21 @@ func TestNodeStatusToNodeInfoConversion(t *testing.T) {
},
},
},
// Check that --advertise-http-addr is not mistaken for --http-addr.
{
serverpb.NodesResponse{Nodes: []statuspb.NodeStatus{
{
Desc: roachpb.NodeDescriptor{NodeID: 1},
Args: []string{"--advertise-http-addr=node.example:9999", "--http-addr=node.example:5678"},
},
}},
[]haProxyNodeInfo{
{
NodeID: 1,
CheckPort: "5678",
},
},
},
// Check that decommission{ing,ed} nodes are not considered for
// generating the configuration.
{
Expand Down