GithubBackup/MyGoNavi
1
0
Fork 0
mirror of https://github.com/Syngnat/GoNavi.git synced 2026-05-11 19:09:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

🐛 fix(connection): 收紧稳定期数据库连接自动重试

Browse Source 
Fixes #331
This commit is contained in:
Syngnat
2026-04-11 21:58:16 +08:00
parent af5e84213f
commit ca76440981
3 changed files with 36 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/app/app.go
View File

@@ -726,8 +726,7 @@ func (a *App) shouldRetryConnect(err error, attempt int) bool {
return true
}
}
// Outside startup window, still grant one retry for transient network glitches.
return attempt == 1
return false
}
func isTransientStartupConnectError(err error) bool {

52
internal/app/app_startup_connect_retry_test.go
View File

@@ -109,7 +109,7 @@ func TestConnectDatabaseWithStartupRetry_RetriesTransientFailureAndReappliesGlob
}
}
func TestConnectDatabaseWithStartupRetry_RetriesOnceOutsideStartupWindow(t *testing.T) {
func TestConnectDatabaseWithStartupRetry_DoesNotRetryOutsideStartupWindowForTransientError(t *testing.T) {
originalNewDatabaseFunc := newDatabaseFunc
originalResolveDialConfigWithProxyFunc := resolveDialConfigWithProxyFunc
defer func() {
@@ -137,8 +137,8 @@ func TestConnectDatabaseWithStartupRetry_RetriesOnceOutsideStartupWindow(t *test
if err == nil {
t.Fatal("expected error, got nil")
}
if connectCalls != 2 {
t.Fatalf("expected 2 connect attempts outside startup window, got %d", connectCalls)
if connectCalls != 1 {
t.Fatalf("expected 1 connect attempt outside startup window, got %d", connectCalls)
}
}
@@ -175,7 +175,7 @@ func TestConnectDatabaseWithStartupRetry_DoesNotRetryOutsideStartupWindowForNonT
}
}
func TestConnectDatabaseWithStartupRetry_LogsRetryHintOutsideStartupWindow(t *testing.T) {
func TestConnectDatabaseWithStartupRetry_DoesNotLogRetryHintOutsideStartupWindow(t *testing.T) {
originalNewDatabaseFunc := newDatabaseFunc
originalResolveDialConfigWithProxyFunc := resolveDialConfigWithProxyFunc
defer func() {
@@ -209,11 +209,11 @@ func TestConnectDatabaseWithStartupRetry_LogsRetryHintOutsideStartupWindow(t *te
rawConfig := connection.ConnectionConfig{Type: "postgres", Host: "10.1.131.86", Port: 5432, User: "postgres"}
_, _, err := a.connectDatabaseWithStartupRetry(rawConfig)
if err != nil {
t.Fatalf("expected success after retry, got error: %v", err)
if err == nil {
t.Fatal("expected error without retry, got nil")
}
if connectCalls != 2 {
t.Fatalf("expected 2 connect attempts, got %d", connectCalls)
if connectCalls != 1 {
t.Fatalf("expected 1 connect attempt, got %d", connectCalls)
}
logContent, readErr := os.ReadFile(logPath)
@@ -224,41 +224,15 @@ func TestConnectDatabaseWithStartupRetry_LogsRetryHintOutsideStartupWindow(t *te
t.Fatalf("expected log file to grow, before=%d after=%d", beforeSize, len(logContent))
}
appended := string(logContent[beforeSize:])
if !strings.Contains(appended, "检测到瞬时网络失败，准备重试连接") {
t.Fatalf("expected retry hint log in appended segment, got: %s", appended)
if strings.Contains(appended, "检测到瞬时网络失败，准备重试连接") {
t.Fatalf("expected no retry hint log outside startup window, got: %s", appended)
}
}
func TestConnectDatabaseWithStartupRetry_OutsideStartupWindowTransientFailureStopsAfterOneRetry(t *testing.T) {
originalNewDatabaseFunc := newDatabaseFunc
originalResolveDialConfigWithProxyFunc := resolveDialConfigWithProxyFunc
defer func() {
newDatabaseFunc = originalNewDatabaseFunc
resolveDialConfigWithProxyFunc = originalResolveDialConfigWithProxyFunc
}()
connectCalls := 0
newDatabaseFunc = func(dbType string) (db.Database, error) {
return &fakeStartupRetryDB{
connect: func(config connection.ConnectionConfig) error {
connectCalls++
return errors.New("dial tcp 10.1.131.86:5432: connect: no route to host")
},
}, nil
}
resolveDialConfigWithProxyFunc = func(raw connection.ConnectionConfig) (connection.ConnectionConfig, error) {
return raw, nil
}
func TestShouldRetryConnect_OutsideStartupWindowTransientFailureReturnsFalse(t *testing.T) {
a := &App{startedAt: time.Now().Add(-startupConnectRetryWindow - time.Second)}
rawConfig := connection.ConnectionConfig{Type: "postgres", Host: "10.1.131.86", Port: 5432, User: "postgres"}
_, _, err := a.connectDatabaseWithStartupRetry(rawConfig)
if err == nil {
t.Fatal("expected error, got nil")
}
if connectCalls != 2 {
t.Fatalf("expected 2 connect attempts outside startup window for transient error, got %d", connectCalls)
if a.shouldRetryConnect(errors.New("dial tcp 10.1.131.86:5432: connect: no route to host"), 1) {
t.Fatal("expected outside startup window transient failure to not retry")
}
}