diff --git a/internal/home/cluster_balance.go b/internal/home/cluster_balance.go index ae10c1fdd..b18834f9d 100644 --- a/internal/home/cluster_balance.go +++ b/internal/home/cluster_balance.go @@ -59,7 +59,14 @@ func (c *Client) rebalanceCommand(ctx context.Context, address string, args ...a } options.ReadTimeout = -1 options.WriteTimeout = -1 - options.Dialer = redis.NewDialer(options) + baseDialer := redis.NewDialer(options) + options.Dialer = func(dialCtx context.Context, network, dialAddress string) (net.Conn, error) { + conn, errDial := baseDialer(dialCtx, network, dialAddress) + if errDial != nil { + return nil, errDial + } + return newPluginSyncCancelableConn(ctx, conn), nil + } command := redis.NewClient(options) stopCancel := context.AfterFunc(ctx, func() { _ = command.Close() }) defer func() { diff --git a/internal/home/cluster_latency.go b/internal/home/cluster_latency.go index ca5f54fe8..ad8dee27f 100644 --- a/internal/home/cluster_latency.go +++ b/internal/home/cluster_latency.go @@ -5,6 +5,7 @@ import ( "encoding/json" "fmt" "math/rand/v2" + "net" "sync" "time" @@ -284,7 +285,14 @@ func (c *Client) probeClusterLatency(ctx context.Context, address string) (time. options.TLSConfig = tlsConfig options.ReadTimeout, options.WriteTimeout, options.MaxRetries = -1, -1, -1 options.PoolSize = 1 - options.Dialer = redis.NewDialer(options) + baseDialer := redis.NewDialer(options) + options.Dialer = func(dialCtx context.Context, network, dialAddress string) (net.Conn, error) { + conn, errDial := baseDialer(dialCtx, network, dialAddress) + if errDial != nil { + return nil, errDial + } + return newPluginSyncCancelableConn(ctx, conn), nil + } probe := redis.NewClient(options) stopCancel := context.AfterFunc(ctx, func() { _ = probe.Close() }) defer func() { diff --git a/internal/store/gitstore.go b/internal/store/gitstore.go index 3c1f0fbe1..c3c044bee 100644 --- a/internal/store/gitstore.go +++ b/internal/store/gitstore.go @@ -1552,7 +1552,12 @@ func rollbackRecoveredGitDirectory(gitDir, backupGitDir string) error { } func isRepositoryCorruptionError(err error) bool { - return errors.Is(err, dotgit.ErrPackfileNotFound) || errors.Is(err, plumbing.ErrObjectNotFound) + if errors.Is(err, dotgit.ErrPackfileNotFound) || + errors.Is(err, dotgit.ErrIdxNotFound) || + errors.Is(err, plumbing.ErrObjectNotFound) { + return true + } + return errors.Is(err, fs.ErrNotExist) && err != nil && strings.Contains(err.Error(), "packhandle:") } func verifyRepositoryHead(repo *git.Repository) error { diff --git a/internal/store/gitstore_test.go b/internal/store/gitstore_test.go index d7123c0dc..8eff815e0 100644 --- a/internal/store/gitstore_test.go +++ b/internal/store/gitstore_test.go @@ -1798,14 +1798,22 @@ func corruptGitRepository(t *testing.T, repoDir string) { if errOpen != nil { t.Fatalf("open repository before corruption: %v", errOpen) } + repoClosed := false defer func() { - if errClose := repo.Close(); errClose != nil { - t.Errorf("close corrupted repository: %v", errClose) + if !repoClosed { + if errClose := repo.Close(); errClose != nil { + t.Errorf("close repository before corruption: %v", errClose) + } } }() if errRepack := repo.RepackObjects(&git.RepackConfig{}); errRepack != nil { t.Fatalf("repack repository objects: %v", errRepack) } + errClose := repo.Close() + repoClosed = true + if errClose != nil { + t.Fatalf("close repacked repository: %v", errClose) + } objectsDir := filepath.Join(repoDir, ".git", "objects") objectEntries, errReadDir := os.ReadDir(objectsDir) if errReadDir != nil { @@ -1830,7 +1838,16 @@ func corruptGitRepository(t *testing.T, repoDir string) { t.Fatalf("remove packfile %s: %v", filepath.Base(packfile), errRemove) } } - if errVerify := verifyRepositoryHead(repo); !isRepositoryCorruptionError(errVerify) { + corruptedRepo, errOpenCorrupted := git.PlainOpen(repoDir) + if errOpenCorrupted != nil { + t.Fatalf("open corrupted repository: %v", errOpenCorrupted) + } + defer func() { + if errCloseCorrupted := corruptedRepo.Close(); errCloseCorrupted != nil { + t.Errorf("close corrupted repository: %v", errCloseCorrupted) + } + }() + if errVerify := verifyRepositoryHead(corruptedRepo); !isRepositoryCorruptionError(errVerify) { t.Fatalf("verifyRepositoryHead error = %v, want repository corruption", errVerify) } }