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 relay #827

Merged
merged 10 commits into from
Mar 30, 2023
Merged

Fix relay #827

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
42cdd32
relay control race
nbrownus Mar 1, 2023
5d4d94e
Fix broken relays
brad-defined Mar 15, 2023
fa4cde5
Relay race test
brad-defined Mar 16, 2023
59209bc
Fix some errors
brad-defined Mar 16, 2023
b18d715
Fix some more errors
brad-defined Mar 22, 2023
df3e307
Lock the hostmap before copying things from it during tests
brad-defined Mar 22, 2023
8fd7663
Review comments
brad-defined Mar 30, 2023
621ed39
s/hostInfo/vpnIp/
brad-defined Mar 30, 2023
2c89c92
hold test lock longer
brad-defined Mar 30, 2023
adc16b8
Hold even more locks
brad-defined Mar 30, 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
Lock the hostmap before copying things from it during tests
  • Loading branch information
@brad-defined
brad-defined committed Mar 22, 2023
commit df3e30758bd3db4f5247e6a70ac8857677011602
10 changes: 8 additions & 2 deletions e2e/router/hostmap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@ func renderHostmap(c *nebula.Control) (string, []*edge) {

// Draw the vpn to index nodes
r += fmt.Sprintf("\t\tsubgraph %s.hosts[\"Hosts (vpn ip to index)\"]\n", clusterName)
for _, vpnIp := range sortedHosts(hm.Hosts) {
hm.RLock()
hosts := sortedHosts(hm.Hosts)
hm.RUnlock()
for _, vpnIp := range hosts {
hi := hm.Hosts[vpnIp]
r += fmt.Sprintf("\t\t\t%v.%v[\"%v\"]\n", clusterName, vpnIp, vpnIp)
lines = append(lines, fmt.Sprintf("%v.%v --> %v.%v", clusterName, vpnIp, clusterName, hi.GetLocalIndex()))
Expand Down Expand Up @@ -94,7 +97,10 @@ func renderHostmap(c *nebula.Control) (string, []*edge) {

// Draw the local index to relay or remote index nodes
r += fmt.Sprintf("\t\tsubgraph indexes.%s[\"Indexes (index to hostinfo)\"]\n", clusterName)
for _, idx := range sortedIndexes(hm.Indexes) {
hm.RLock()
indexes := sortedIndexes(hm.Indexes)
hm.RUnlock()
for _, idx := range indexes {
hi, ok := hm.Indexes[idx]
if ok {
r += fmt.Sprintf("\t\t\t%v.%v[\"%v (%v)\"]\n", clusterName, idx, idx, hi.GetVpnIp())
Expand Down