Merge pull request #591 from moogacs/main

fix: serialize NetworkTransport data race on ServerAddr()
hashicorp · Apr 26, 2024 · 341ea38 · 341ea38
2 parents 501fbad + c6584b3
commit 341ea38
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/net_transport.go b/net_transport.go
@@ -91,6 +91,7 @@ type NetworkTransport struct {
 	maxPool     int
 	maxInFlight int
 
+	serverAddressLock     sync.RWMutex
 	serverAddressProvider ServerAddressProvider
 
 	shutdown     bool
@@ -384,6 +385,8 @@ func (n *NetworkTransport) getConnFromAddressProvider(id ServerID, target Server
 }
 
 func (n *NetworkTransport) getProviderAddressOrFallback(id ServerID, target ServerAddress) ServerAddress {
+	n.serverAddressLock.RLock()
+	defer n.serverAddressLock.RUnlock()
 	if n.serverAddressProvider != nil {
 		serverAddressOverride, err := n.serverAddressProvider.ServerAddr(id)
 		if err != nil {