rkrtechnology/litestream
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent deadlocks with replicas (#524)

Browse Source
This commit is contained in:
Toni Spets
2023-12-16 11:53:09 +02:00
committed by GitHub
parent 91ad34d709
commit 7badf0e549
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
replica.go
View File

@@ -176,7 +176,7 @@ func (r *Replica) Sync(ctx context.Context) (err error) {
// the generation on the database has changed. // the generation on the database has changed.
if r.Pos().Generation != generation { if r.Pos().Generation != generation {
// Create snapshot if no snapshots exist for generation. // Create snapshot if no snapshots exist for generation.
snapshotN, err := r.snapshotN(generation) snapshotN, err := r.snapshotN(ctx, generation)
if err != nil { if err != nil {
return err return err
} else if snapshotN == 0 { } else if snapshotN == 0 {
@@ -237,6 +237,12 @@ func (r *Replica) syncWAL(ctx context.Context) (err error) {
var g errgroup.Group var g errgroup.Group
g.Go(func() error { g.Go(func() error {
_, err := r.Client.WriteWALSegment(ctx, pos, pr) _, err := r.Client.WriteWALSegment(ctx, pos, pr)
// Always close pipe reader to signal writers.
if e := pr.CloseWithError(err); err == nil {
return e
}
return err return err
}) })
@@ -331,8 +337,8 @@ func (r *Replica) syncWAL(ctx context.Context) (err error) {
} }
// snapshotN returns the number of snapshots for a generation. // snapshotN returns the number of snapshots for a generation.
func (r *Replica) snapshotN(generation string) (int, error) { func (r *Replica) snapshotN(ctx context.Context, generation string) (int, error) {
itr, err := r.Client.Snapshots(context.Background(), generation) itr, err := r.Client.Snapshots(ctx, generation)
if err != nil { if err != nil {
return 0, err return 0, err
} }