Track which connections we are currently attempting a connect on, so we don’t do multiple attempts at the same time to the same endpoint
This commit is contained in:
1 parent
a5be96d35f
commit
09271f4848
2 files changed
+28
-3
No files matched your search
+22
-3
@@ -11,11 +11,12 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
InitialInterval = 5 * time.Second
|
InitialInterval = 1 * time.Second
|
||||||
MaxInterval = 10 * time.Minute
|
MaxInterval = 10 * time.Minute
|
||||||
MaxAttemptCount = 100
|
MaxAttemptCount = 100
|
||||||
CMEnsure = iota
|
CMEnsure = iota
|
||||||
CMStatus = iota
|
CMStatus = iota
|
||||||
|
CMConnAttemptFinished = iota
|
||||||
)
|
)
|
||||||
|
|
||||||
func StartConnectionMaker(router *Router) *ConnectionMaker {
|
func StartConnectionMaker(router *Router) *ConnectionMaker {
|
||||||
@@ -23,7 +24,8 @@ func StartConnectionMaker(router *Router) *ConnectionMaker {
|
|||||||
state := &ConnectionMaker{
|
state := &ConnectionMaker{
|
||||||
router: router,
|
router: router,
|
||||||
queryChan: queryChan,
|
queryChan: queryChan,
|
||||||
failedConnections: make(map[PeerName]*FailedConnection)}
|
failedConnections: make(map[PeerName]*FailedConnection),
|
||||||
|
attemptingConnections: make(map[ConnectionMakerPair]bool)}
|
||||||
go state.queryLoop(queryChan)
|
go state.queryLoop(queryChan)
|
||||||
return state
|
return state
|
||||||
}
|
}
|
||||||
@@ -64,6 +66,8 @@ func (cm *ConnectionMaker) queryLoop(queryChan <-chan *ConnectionMakerInteractio
|
|||||||
}
|
}
|
||||||
case query.code == CMStatus:
|
case query.code == CMStatus:
|
||||||
query.resultChan <- cm.status()
|
query.resultChan <- cm.status()
|
||||||
|
case query.code == CMConnAttemptFinished:
|
||||||
|
cm.attemptingConnections[ConnectionMakerPair{query.foundAt, query.name}] = false;
|
||||||
default:
|
default:
|
||||||
log.Fatal("Unexpected connection maker query:", query)
|
log.Fatal("Unexpected connection maker query:", query)
|
||||||
}
|
}
|
||||||
@@ -82,6 +86,10 @@ func (cm *ConnectionMaker) queryLoop(queryChan <-chan *ConnectionMakerInteractio
|
|||||||
failedConn.tryAfter = after
|
failedConn.tryAfter = after
|
||||||
failedConn.attemptCount += 1
|
failedConn.attemptCount += 1
|
||||||
for target := range failedConn.foundAt {
|
for target := range failedConn.foundAt {
|
||||||
|
if cm.attemptingConnections[ConnectionMakerPair{target, name}] {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
cm.attemptingConnections[ConnectionMakerPair{target, name}] = true
|
||||||
go cm.attemptConnection(target, name)
|
go cm.attemptConnection(target, name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -118,11 +126,17 @@ func (cm *ConnectionMaker) addToFailedConnection(name PeerName, foundAt string)
|
|||||||
func (cm *ConnectionMaker) status() string {
|
func (cm *ConnectionMaker) status() string {
|
||||||
var buf bytes.Buffer
|
var buf bytes.Buffer
|
||||||
for name, failedConn := range cm.failedConnections {
|
for name, failedConn := range cm.failedConnections {
|
||||||
|
tryingNow := false
|
||||||
foundAt := make([]string, 0, len(failedConn.foundAt))
|
foundAt := make([]string, 0, len(failedConn.foundAt))
|
||||||
for target := range failedConn.foundAt {
|
for target := range failedConn.foundAt {
|
||||||
foundAt = append(foundAt, target)
|
foundAt = append(foundAt, target)
|
||||||
|
tryingNow = tryingNow || cm.attemptingConnections[ConnectionMakerPair{target, name}]
|
||||||
|
}
|
||||||
|
if tryingNow {
|
||||||
|
buf.WriteString(fmt.Sprintf("%s (%v attempts, trying again now): %v\n", name, failedConn.attemptCount, foundAt))
|
||||||
|
} else {
|
||||||
|
buf.WriteString(fmt.Sprintf("%s (%v attempts, next at %v): %v\n", name, failedConn.attemptCount, failedConn.tryAfter, foundAt))
|
||||||
}
|
}
|
||||||
buf.WriteString(fmt.Sprintf("%s (%v attempts, next at %v): %v\n", name, failedConn.attemptCount, failedConn.tryAfter, foundAt))
|
|
||||||
}
|
}
|
||||||
return buf.String()
|
return buf.String()
|
||||||
}
|
}
|
||||||
@@ -131,6 +145,11 @@ func (cm *ConnectionMaker) attemptConnection(foundAt string, targetName PeerName
|
|||||||
if err := cm.router.Ourself.CreateConnection(foundAt, targetName); err != nil {
|
if err := cm.router.Ourself.CreateConnection(foundAt, targetName); err != nil {
|
||||||
log.Println(err)
|
log.Println(err)
|
||||||
}
|
}
|
||||||
|
// Tell the query loop we've finished this attempt
|
||||||
|
cm.queryChan <- &ConnectionMakerInteraction{
|
||||||
|
Interaction: Interaction{code: CMConnAttemptFinished},
|
||||||
|
name: targetName,
|
||||||
|
foundAt: foundAt}
|
||||||
}
|
}
|
||||||
|
|
||||||
func tryAfter(interval time.Duration) (time.Time, time.Duration) {
|
func tryAfter(interval time.Duration) (time.Time, time.Duration) {
|
||||||
|
|||||||
@@ -159,11 +159,17 @@ type ConnectionMakerInteraction struct {
|
|||||||
name PeerName
|
name PeerName
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type ConnectionMakerPair struct {
|
||||||
|
foundAt string
|
||||||
|
name PeerName
|
||||||
|
}
|
||||||
|
|
||||||
type ConnectionMaker struct {
|
type ConnectionMaker struct {
|
||||||
router *Router
|
router *Router
|
||||||
queryChan chan<- *ConnectionMakerInteraction
|
queryChan chan<- *ConnectionMakerInteraction
|
||||||
activeConnections map[string]string
|
activeConnections map[string]string
|
||||||
failedConnections map[PeerName]*FailedConnection
|
failedConnections map[PeerName]*FailedConnection
|
||||||
|
attemptingConnections map[ConnectionMakerPair]bool
|
||||||
}
|
}
|
||||||
|
|
||||||
type FailedConnection struct {
|
type FailedConnection struct {
|
||||||
|
|||||||
Reference in new issue
Block a user