Skip to content

Improve the address logging in case of a ConnectPeerFail event #85

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

Merged
Karmastic merged 4 commits into from
Jun 25, 2019
Merged

Improve the address logging in case of a ConnectPeerFail event #85

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f6de0e
Merge pull request #1 from algorand/master
tsachiherman Jun 17, 2019
4d22065
Merge pull request #3 from algorand/master
tsachiherman Jun 19, 2019
b754e9f
Merge pull request #5 from algorand/master
tsachiherman Jun 24, 2019
fbd550d
Improve remoteHost logging during ConnectPeerFail event.
tsachizehub Jun 24, 2019
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
36 changes: 20 additions & 16 deletions network/wsNetwork.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,11 +801,24 @@ func (wn *WebsocketNetwork) updateURLHost(originalRootURL string, originIP net.I

// ServerHTTP handles the gossip network functions over websockets
func (wn *WebsocketNetwork) ServeHTTP(response http.ResponseWriter, request *http.Request) {
remoteHost, _, err := net.SplitHostPort(request.RemoteAddr)
if err != nil {
// this error should not happen. The go framework is responsible for populating the RemoteAddr using the incoming TCP connection
// information.
wn.log.Errorf("could not parse request.RemoteAddr=%v, %s", request.RemoteAddr, err)
response.WriteHeader(http.StatusServiceUnavailable)
return
}
originIP := wn.getForwardedConnectionAddress(request.Header)
if originIP != nil {
remoteHost = originIP.String()
}

if wn.numIncomingPeers() >= wn.config.IncomingConnectionsLimit {
networkConnectionsDroppedTotal.Inc(map[string]string{"reason": "incoming_connection_limit"})
wn.log.EventWithDetails(telemetryspec.Network, telemetryspec.ConnectPeerFailEvent,
telemetryspec.ConnectPeerFailEventDetails{
Address: justHost(request.RemoteAddr),
Address: remoteHost,
HostName: request.Header.Get(TelemetryIDHeader),
Incoming: true,
InstanceName: request.Header.Get(InstanceNameHeader),
Expand All @@ -814,21 +827,12 @@ func (wn *WebsocketNetwork) ServeHTTP(response http.ResponseWriter, request *htt
response.WriteHeader(http.StatusServiceUnavailable)
return
}
remoteHost, _, err := net.SplitHostPort(request.RemoteAddr)
if err != nil {
wn.log.Errorf("could not parse request.RemoteAddr=%v, %s", request.RemoteAddr, err)
response.WriteHeader(http.StatusServiceUnavailable)
return
}
originIP := wn.getForwardedConnectionAddress(request.Header)
if originIP != nil {
remoteHost = originIP.String()
}

if wn.connectedForIP(remoteHost) >= wn.config.MaxConnectionsPerIP {
networkConnectionsDroppedTotal.Inc(map[string]string{"reason": "incoming_connection_limit"})
networkConnectionsDroppedTotal.Inc(map[string]string{"reason": "incoming_connection_per_ip_limit"})
wn.log.EventWithDetails(telemetryspec.Network, telemetryspec.ConnectPeerFailEvent,
telemetryspec.ConnectPeerFailEventDetails{
Address: justHost(request.RemoteAddr),
Address: remoteHost,
HostName: request.Header.Get(TelemetryIDHeader),
Incoming: true,
InstanceName: request.Header.Get(InstanceNameHeader),
Expand Down Expand Up @@ -878,7 +882,7 @@ func (wn *WebsocketNetwork) ServeHTTP(response http.ResponseWriter, request *htt
wn.log.With("event", "ConnectedIn").With("remote", otherPublicAddr).With("local", localAddr).Infof("Accepted incoming connection from peer %s", otherPublicAddr)
wn.log.EventWithDetails(telemetryspec.Network, telemetryspec.ConnectPeerEvent,
telemetryspec.PeerEventDetails{
Address: justHost(request.RemoteAddr),
Address: remoteHost,
HostName: otherTelemetryGUID,
Incoming: true,
InstanceName: otherInstanceName,
Expand Down Expand Up @@ -1554,9 +1558,9 @@ func (wn *WebsocketNetwork) removePeer(peer *wsPeer, reason disconnectReason) {
// definitely don't change this to do the logging while holding the lock.
localAddr, _ := wn.Address()
wn.log.With("event", "Disconnected").With("remote", peer.rootURL).With("local", localAddr).Infof("Peer %v disconnected", peer.rootURL)
peerAddr := ""
peerAddr := peer.OriginAddress()
// we might be able to get addr out of conn, or it might be closed
if peer.conn != nil {
if peerAddr == "" && peer.conn != nil {
paddr := peer.conn.RemoteAddr()
if paddr != nil {
peerAddr = justHost(paddr.String())
Expand Down