@@ -92,15 +92,15 @@ func (u *upstreamResolverBase) watchPeersConnStatusChanges() {
92
92
93
93
u .probeAvailability ()
94
94
if u .disabled {
95
- return fmt .Errorf ("probe faled " )
95
+ return fmt .Errorf ("probe failed " )
96
96
}
97
97
return nil
98
98
}
99
99
100
100
continualProbe := func () {
101
101
// probe continually for 30s when peer count >= 1
102
102
if u .statusRecorder .GetConnectedPeersCount () == 0 {
103
- log .Debug ("O peer connected, running one more DNS probe" )
103
+ log .Debug ("O peers connected, running one more DNS probe" )
104
104
// cancel backoff operation
105
105
if cancelBackOff != nil {
106
106
cancelBackOff ()
@@ -111,13 +111,13 @@ func (u *upstreamResolverBase) watchPeersConnStatusChanges() {
111
111
}
112
112
113
113
if probeRunning .Load () {
114
- log .Info ("restarting DNS probing" )
114
+ log .Info ("restart DNS probing" )
115
115
cancelBackOff ()
116
116
cancelBackOff = nil
117
117
}
118
118
defer func () {
119
119
u .mutex .Lock ()
120
- log .Infof ("DNS probing finished, servers %s disabled: %t" , u .upstreamServers , u .disabled )
120
+ log .Infof ("DNS probe finished, servers %s disabled: %t" , u .upstreamServers , u .disabled )
121
121
u .mutex .Unlock ()
122
122
probeRunning .Store (false )
123
123
}()
@@ -128,7 +128,6 @@ func (u *upstreamResolverBase) watchPeersConnStatusChanges() {
128
128
err := backoff .Retry (func () error {
129
129
select {
130
130
case <- ctx .Done ():
131
- log .Warn ("DNS probing cancelled" )
132
131
return backoff .Permanent (ctx .Err ())
133
132
default :
134
133
return operation ()
@@ -317,7 +316,8 @@ func (u *upstreamResolverBase) waitUntilResponse() {
317
316
err := backoff .Retry (func () error {
318
317
u .probeAvailability ()
319
318
if u .disabled {
320
- return fmt .Errorf ("failed to enable upsstream" )
319
+ log .Tracef ("checking connectivity with upstreams %s failed. Retrying in %s" , u .upstreamServers , exponentialBackOff .NextBackOff ())
320
+ return fmt .Errorf ("upstream check call error" )
321
321
}
322
322
return nil
323
323
}, exponentialBackOff )
0 commit comments