Skip to content
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

Jump to bottom

Updated LEAFZ names to use remoteServer name/id and added is_spoke #3925

Merged
merged 1 commit into from Mar 1, 2023
Merged

Updated LEAFZ names to use remoteServer name/id and added is_spoke #3925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 1 addition & 7 deletions server/leafnode.go
View file
Open in desktop
Expand Up @@ -888,13 +888,7 @@ func (s *Server) createLeafNode(conn net.Conn, rURL *url.URL, remote *leafNodeCf
}
now := time.Now().UTC()

var clientOpts = ClientOpts{
Name: opts.ServerName,
Verbose: defaultOpts.Verbose,
Pedantic: defaultOpts.Pedantic,
Echo: defaultOpts.Echo,
}
c := &client{srv: s, nc: conn, kind: LEAF, opts: clientOpts, mpay: maxPay, msubs: maxSubs, start: now, last: now}
c := &client{srv: s, nc: conn, kind: LEAF, opts: defaultOpts, mpay: maxPay, msubs: maxSubs, start: now, last: now}
// Do not update the smap here, we need to do it in initLeafNodeSmapAndSendSubs
c.leaf = &leaf{}

Expand Down
4 changes: 3 additions & 1 deletion server/monitor.go
View file
Open in desktop
Expand Up @@ -2095,6 +2095,7 @@ type LeafzOptions struct {
// LeafInfo has detailed information on each remote leafnode connection.
type LeafInfo struct {
Name string `json:"name"`
IsSpoke bool `json:"is_spoke"`
Account string `json:"account"`
IP string `json:"ip"`
Port int `json:"port"`
Expand Down Expand Up @@ -2134,7 +2135,8 @@ func (s *Server) Leafz(opts *LeafzOptions) (*Leafz, error) {
for _, ln := range lconns {
ln.mu.Lock()
lni := &LeafInfo{
Name: ln.opts.Name,
Name: ln.leaf.remoteServer,
IsSpoke: ln.isSpokeLeafNode(),
Account: ln.acc.Name,
IP: ln.host,
Port: int(ln.port),
Expand Down
11 changes: 9 additions & 2 deletions server/monitor_test.go
View file
Open in desktop
Expand Up @@ -3678,6 +3678,7 @@ func TestMonitorOpJWT(t *testing.T) {

func TestMonitorLeafz(t *testing.T) {
content := `
server_name: "hub"
listen: "127.0.0.1:-1"
http: "127.0.0.1:-1"
operator = "../test/configs/nkeys/op.jwt"
Expand Down Expand Up @@ -3817,8 +3818,11 @@ func TestMonitorLeafz(t *testing.T) {
} else {
t.Fatalf("Expected account to be %q or %q, got %q", acc1.Name, acc2.Name, ln.Account)
}
if ln.Name != leafName {
t.Fatalf("Expected name to be %q, got %q", leafName, ln.Name)
if ln.Name != "hub" {
t.Fatalf("Expected name to be %q, got %q", "hub", ln.Name)
}
if !ln.IsSpoke {
t.Fatal("Expected leafnode connection to be spoke")
}
if ln.RTT == "" {
t.Fatalf("RTT not tracked?")
Expand Down Expand Up @@ -3911,6 +3915,9 @@ func TestMonitorLeafz(t *testing.T) {
if ln.Name != leafName {
t.Fatalf("Expected name to be %q, got %q", leafName, ln.Name)
}
if ln.IsSpoke {
t.Fatal("Expected leafnode connection to be hub")
}
if ln.RTT == "" {
t.Fatalf("RTT not tracked?")
}
Expand Down