timamsk/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2026-04-13 20:28:32 +10:00
Code Issues Packages Projects Releases Wiki Activity

ccm,ocm: never treat external usage endpoint failures as over-limit

Browse Source
This commit is contained in:
世界
2026-03-15 13:03:31 +08:00
parent 8e9c61e624
commit 656b09d1be
2 changed files with 16 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
service/ccm/credential_external.go
View File

@@ -549,10 +549,8 @@ func (c *externalCredential) pollUsage(ctx context.Context) {
response, err := c.doPollUsageRequest(ctx)
if err != nil {
if !c.isPollBackoffAtCap() {
c.logger.Error("poll usage for ", c.tag, ": ", err)
}
c.incrementPollFailures()
c.logger.Debug("poll usage for ", c.tag, ": ", err)
c.clearPollFailures()
return
}
defer response.Body.Close()
@@ -560,16 +558,7 @@ func (c *externalCredential) pollUsage(ctx context.Context) {
if response.StatusCode != http.StatusOK {
body, _ := io.ReadAll(response.Body)
c.logger.Debug("poll usage for ", c.tag, ": status ", response.StatusCode, " ", string(body))
// 404 means the remote does not have a status endpoint yet;
// usage will be updated passively from response headers.
if response.StatusCode == http.StatusNotFound {
c.stateAccess.Lock()
c.state.consecutivePollFailures = 0
c.checkTransitionLocked()
c.stateAccess.Unlock()
} else {
c.incrementPollFailures()
}
c.clearPollFailures()
return
}
@@ -581,7 +570,7 @@ func (c *externalCredential) pollUsage(ctx context.Context) {
err = json.NewDecoder(response.Body).Decode(&statusResponse)
if err != nil {
c.logger.Debug("poll usage for ", c.tag, ": decode: ", err)
c.incrementPollFailures()
c.clearPollFailures()
return
}
@@ -625,34 +614,14 @@ func (c *externalCredential) markUsagePollAttempted() {
}
func (c *externalCredential) pollBackoff(baseInterval time.Duration) time.Duration {
c.stateAccess.RLock()
failures := c.state.consecutivePollFailures
c.stateAccess.RUnlock()
if failures <= 0 {
return baseInterval
}
backoff := failedPollRetryInterval * time.Duration(1<<(failures-1))
if backoff > httpRetryMaxBackoff {
return httpRetryMaxBackoff
}
return backoff
return baseInterval
}
func (c *externalCredential) isPollBackoffAtCap() bool {
c.stateAccess.RLock()
defer c.stateAccess.RUnlock()
failures := c.state.consecutivePollFailures
return failures > 0 && failedPollRetryInterval*time.Duration(1<<(failures-1)) >= httpRetryMaxBackoff
}
func (c *externalCredential) incrementPollFailures() {
func (c *externalCredential) clearPollFailures() {
c.stateAccess.Lock()
c.state.consecutivePollFailures++
shouldInterrupt := c.checkTransitionLocked()
c.state.consecutivePollFailures = 0
c.checkTransitionLocked()
c.stateAccess.Unlock()
if shouldInterrupt {
c.interruptConnections()
}
}
func (c *externalCredential) usageTrackerOrNil() *AggregatedUsage {

47
service/ocm/credential_external.go
View File

@@ -588,10 +588,8 @@ func (c *externalCredential) pollUsage(ctx context.Context) {
response, err := c.doPollUsageRequest(ctx)
if err != nil {
if !c.isPollBackoffAtCap() {
c.logger.Error("poll usage for ", c.tag, ": ", err)
}
c.incrementPollFailures()
c.logger.Debug("poll usage for ", c.tag, ": ", err)
c.clearPollFailures()
return
}
defer response.Body.Close()
@@ -599,16 +597,7 @@ func (c *externalCredential) pollUsage(ctx context.Context) {
if response.StatusCode != http.StatusOK {
body, _ := io.ReadAll(response.Body)
c.logger.Debug("poll usage for ", c.tag, ": status ", response.StatusCode, " ", string(body))
// 404 means the remote does not have a status endpoint yet;
// usage will be updated passively from response headers.
if response.StatusCode == http.StatusNotFound {
c.stateAccess.Lock()
c.state.consecutivePollFailures = 0
c.checkTransitionLocked()
c.stateAccess.Unlock()
} else {
c.incrementPollFailures()
}
c.clearPollFailures()
return
}
@@ -620,7 +609,7 @@ func (c *externalCredential) pollUsage(ctx context.Context) {
err = json.NewDecoder(response.Body).Decode(&statusResponse)
if err != nil {
c.logger.Debug("poll usage for ", c.tag, ": decode: ", err)
c.incrementPollFailures()
c.clearPollFailures()
return
}
@@ -664,34 +653,14 @@ func (c *externalCredential) markUsagePollAttempted() {
}
func (c *externalCredential) pollBackoff(baseInterval time.Duration) time.Duration {
c.stateAccess.RLock()
failures := c.state.consecutivePollFailures
c.stateAccess.RUnlock()
if failures <= 0 {
return baseInterval
}
backoff := failedPollRetryInterval * time.Duration(1<<(failures-1))
if backoff > httpRetryMaxBackoff {
return httpRetryMaxBackoff
}
return backoff
return baseInterval
}
func (c *externalCredential) isPollBackoffAtCap() bool {
c.stateAccess.RLock()
defer c.stateAccess.RUnlock()
failures := c.state.consecutivePollFailures
return failures > 0 && failedPollRetryInterval*time.Duration(1<<(failures-1)) >= httpRetryMaxBackoff
}
func (c *externalCredential) incrementPollFailures() {
func (c *externalCredential) clearPollFailures() {
c.stateAccess.Lock()
c.state.consecutivePollFailures++
shouldInterrupt := c.checkTransitionLocked()
c.state.consecutivePollFailures = 0
c.checkTransitionLocked()
c.stateAccess.Unlock()
if shouldInterrupt {
c.interruptConnections()
}
}
func (c *externalCredential) usageTrackerOrNil() *AggregatedUsage {