Skip to content

Commit

Permalink
restrict refresh ring to heartBeat (apache#1015)
Browse files Browse the repository at this point in the history
* don't trace unless query is trace enabled

When 'nodetool settraceprobability' is used,
it's possible to get a response with trace information
even though client did not specifically mark the query
for tracing.

* added myself as an author

* restrict refresh ring to heartBeat

GetHosts uses queries on control connection. Any query error will
cause reconnection and refresh ring which calls GetHosts and thus
deadlocks.

Also it seems neater to have the ring refresh be done only by heartBeat.

Fixes apache#928
  • Loading branch information
kthommandra authored and Zariel committed Nov 7, 2017
1 parent aa93acc commit 9d35015
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion control.go
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ func (c *controlConn) HandleError(conn *Conn, err error, closed bool) {
return
}

c.reconnect(true)
c.reconnect(false)
}

func (c *controlConn) getConn() *connHost {
Expand Down

0 comments on commit 9d35015

Please sign in to comment.