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

Always refresh ring on topology changes and reconnections #1680

Merged
merged 7 commits into from
Apr 25, 2023
Merged

Always refresh ring on topology changes and reconnections #1680

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f09c340
Always refresh ring when control connection reconnects
joao-r-reis Mar 22, 2023
a627890
Always refresh ring on topology change
joao-r-reis Mar 27, 2023
a841c1d
Remove addNewNode function (unused)
joao-r-reis Mar 22, 2023
937f39c
make GetHosts() query system.local
joao-r-reis Mar 27, 2023
7d5429f
Remove ringDescriber.getHostInfo() (unused)
joao-r-reis Mar 27, 2023
b9fa942
Debounce ring refresh requests
joao-r-reis Apr 11, 2023
70f9d17
Merge branch 'master' into refresh-ring-reconnect
joao-r-reis Apr 20, 2023
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
Prev Previous commit
Next Next commit
Remove addNewNode function (unused)
  • Loading branch information
@joao-r-reis
joao-r-reis committed Apr 11, 2023
commit a841c1d66b3af338fcd1c79467bff27f37bc8630
28 changes: 0 additions & 28 deletions events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,34 +194,6 @@ func (s *Session) handleNodeEvent(frames []frame) {
}
}

func (s *Session) addNewNode(hostID UUID) {
// Get host info and apply any filters to the host
hostInfo, err := s.hostSource.getHostInfo(hostID)
if err != nil {
s.logger.Printf("gocql: events: unable to fetch host info for hostID: %q: %v\n", hostID, err)
return
} else if hostInfo == nil {
// ignore if it's null because we couldn't find it
return
}

if t := hostInfo.Version().nodeUpDelay(); t > 0 {
time.Sleep(t)
}

// should this handle token moving?
hostInfo = s.ring.addOrUpdate(hostInfo)

if !s.cfg.filterHost(hostInfo) {
s.startPoolFill(hostInfo)
}

if s.control != nil && !s.cfg.IgnorePeerAddr {
// TODO(zariel): debounce ring refresh
s.hostSource.refreshRing()
}
}

func (s *Session) handleNodeUp(eventIp net.IP, eventPort int) {
if gocqlDebug {
s.logger.Printf("gocql: Session.handleNodeUp: %s:%d\n", eventIp.String(), eventPort)
Expand Down