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

Fix issue where node connection map wasn't being pruned #4231

Merged
merged 2 commits into from
Apr 27, 2018
Merged

Fix issue where node connection map wasn't being pruned #4231

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c0fa40
Fix issue where node connection map wasn't being pruned
dadgar Apr 27, 2018
5cd1ff4
small cleanup and logging
dadgar Apr 27, 2018
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
15 changes: 14 additions & 1 deletion nomad/client_rpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,11 @@ func (s *Server) getNodeConn(nodeID string) (*nodeConnState, bool) {
}
}

// Shouldn't happen but rather be safe
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we dream up a reason this is possible? If not should we add a debug or trace log just in case it can help us find where an invariant is being broken.

if state == nil {
return nil, false
}

return state, ok
}

Expand Down Expand Up @@ -108,13 +113,21 @@ func (s *Server) removeNodeConn(ctx *RPCContext) {
// dial various addresses that all route to the same server. The most common
// case for this is the original address the client uses to connect to the
// server differs from the advertised address sent by the heartbeat.
numConns := len(conns)
found := false
for i, conn := range conns {
if conn.Ctx.Conn.LocalAddr().String() == ctx.Conn.LocalAddr().String() &&
conn.Ctx.Conn.RemoteAddr().String() == ctx.Conn.RemoteAddr().String() {
s.nodeConns[ctx.NodeID] = append(s.nodeConns[ctx.NodeID][:i], s.nodeConns[ctx.NodeID][i+1:]...)
return
found = true
break
}
}

// If we just deleted the last conn, remove it from the map
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the last connection is deleted why is numConns ==1 and not 0?

if found && numConns == 1 {
delete(s.nodeConns, ctx.NodeID)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could do the len check and deletion right in the for loop.

}
}

// serverWithNodeConn is used to determine which remote server has the most
Expand Down
3 changes: 3 additions & 0 deletions nomad/client_rpc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ func TestServer_removeNodeConn_differentAddrs(t *testing.T) {
// Delete the second
s1.removeNodeConn(ctx2)
require.Len(s1.connectedNodes(), 0)

_, ok = s1.getNodeConn(nodeID)
require.False(ok)
}

func TestServerWithNodeConn_NoPath(t *testing.T) {
Expand Down