commit 4f19bc7d357965908b41ebdef384e45d85ff52de · edavis.dev/monarch

+1 -1

cmd/backfiller/backend.go

···

       12
       12
        
       	bf    *backfill.Backfiller

     

       13
       13
        
       

     

       14
       14
        
       	firehoseLk  sync.Mutex

     

       15
       15
       -
       	firehoseSeq int64

     

       15
       15
       +
       	firehoseSeq string

     

       16
       16
        
       	reposLk     sync.Mutex

     

       17
       17
        
       	reposSeq    string

     

       18
       18
        
       }

+19 -15

cmd/backfiller/cursors.go

···

       1
       1
        
       package main

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"errors"

     

       5
       5
       +
       	"fmt"

     

       4
       6
        
       	"log/slog"

     

       5
       7
        
       	"time"

     

       8
       8
       +
       

     

       9
       9
       +
       	"gorm.io/gorm"

     

       6
       10
        
       )

     

       7
       11
        
       

     

       8
       12
        
       type cursorRecord struct {

     

       9
       13
        
       	ID  uint `gorm:"primaryKey"`

     

       10
       10
       -
       	Key string

     

       11
       11
       -
       	Val any

     

       14
       14
       +
       	Key string `gorm:"unique"`

     

       15
       15
       +
       	Val string

     

       12
       16
        
       }

     

       13
       17
        
       

     

       14
       14
       -
       func (b *Backend) LoadCursor(key string) (any, error) {

     

       18
       18
       +
       func (b *Backend) LoadCursor(key string) (string, error) {

     

       15
       19
        
       	var rec cursorRecord

     

       16
       16
       -
       	if err := b.state.Find(&rec, "key = ?", key).Error; err != nil {

     

       17
       17
       -
       		return nil, err

     

       18
       18
       -
       	}

     

       19
       19
       -
       

     

       20
       20
       -
       	if rec.ID == 0 {

     

       21
       21
       -
       		if err := b.state.Create(&cursorRecord{Key: key}).Error; err != nil {

     

       22
       22
       -
       			return nil, err

     

       20
       20
       +
       	if err := b.state.Where("key = ?", key).First(&rec).Error; err != nil {

     

       21
       21
       +
       		if errors.Is(err, gorm.ErrRecordNotFound) {

     

       22
       22
       +
       			b.state.Create(&cursorRecord{Key: key, Val: ""})

     

       23
       23
        
       		}

     

       24
       24
       +
       		return "", err

     

       24
       25
        
       	}

     

       25
       25
       -
       

     

       26
       26
        
       	return rec.Val, nil

     

       27
       27
        
       }

     

       28
       28
        
       

     

       29
       29
        
       func (b *Backend) FlushCursors() error {

     

       30
       30
       +
       	sl := slog.With("source", "flushCursors")

     

       31
       31
       +
       

     

       30
       32
        
       	b.firehoseLk.Lock()

     

       31
       31
       -
       	if err := b.state.Model(cursorRecord{}).Where("key = 'firehose'").Update("val", b.firehoseSeq).Error; err != nil {

     

       32
       32
       -
       		return err

     

       33
       33
       +
       	sl.Info("persisting firehose cursor", "cursor", b.firehoseSeq)

     

       34
       34
       +
       	if err := b.state.Model(&cursorRecord{}).Where("key = ?", "firehose").Update("val", b.firehoseSeq).Error; err != nil {

     

       35
       35
       +
       		return fmt.Errorf("failed to persist firehose cursor: %w", err)

     

       33
       36
        
       	}

     

       34
       37
        
       	b.firehoseLk.Unlock()

     

       35
       38
        
       

     

       36
       39
        
       	b.reposLk.Lock()

     

       37
       37
       -
       	if err := b.state.Model(cursorRecord{}).Where("key = 'repos'").Update("val", b.reposSeq).Error; err != nil {

     

       38
       38
       -
       		return err

     

       40
       40
       +
       	sl.Info("persisting repos cursor", "cursor", b.reposSeq)

     

       41
       41
       +
       	if err := b.state.Model(&cursorRecord{}).Where("key = ?", "repos").Update("val", b.reposSeq).Error; err != nil {

     

       42
       42
       +
       		return fmt.Errorf("failed to persist repos cursor: %w", err)

     

       39
       43
        
       	}

     

       40
       44
        
       	b.reposLk.Unlock()

     

       41
       45

+2 -1

cmd/backfiller/handlers.go

···

       4
       4
        
       	"context"

     

       5
       5
        
       	"errors"

     

       6
       6
        
       	"fmt"

     

       7
       7
       +
       	"strconv"

     

       7
       8
        
       

     

       8
       9
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     

       9
       10
        
       	"github.com/bluesky-social/indigo/backfill"

     
···

       12
       13
        
       

     

       13
       14
        
       func (b *Backend) RepoCommitHandler(ctx context.Context, evt *comatproto.SyncSubscribeRepos_Commit) error {

     

       14
       15
        
       	b.firehoseLk.Lock()

     

       15
       15
       -
       	b.firehoseSeq = evt.Seq

     

       16
       16
       +
       	b.firehoseSeq = strconv.Itoa(int(evt.Seq))

     

       16
       17
        
       	b.firehoseLk.Unlock()

     

       17
       18
        
       

     

       18
       19
        
       	job, err := b.bf.Store.GetJob(ctx, evt.Repo)

+11 -8

cmd/backfiller/main.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
       -
       	"fmt"

     

       6
       5
        
       	"log"

     

       7
       6
        
       	"log/slog"

     

       8
       7
        
       	"net/http"

     
···

       45
       44
        
       

     

       46
       45
        
       func NewBackfiller(db *gorm.DB) *backfill.Backfiller {

     

       47
       46
        
       	opts := &backfill.BackfillOptions{

     

       48
       48
       -
       		ParallelBackfills:     50,

     

       49
       49
       -
       		ParallelRecordCreates: 25,

     

       50
       50
       -
       		SyncRequestsPerSecond: 25,

     

       51
       51
       -
       		RelayHost:             "https://bsky.network",

     

       47
       47
       +
       		// ParallelBackfills:     50,

     

       48
       48
       +
       		// ParallelRecordCreates: 25,

     

       49
       49
       +
       		// SyncRequestsPerSecond: 25,

     

       50
       50
       +
       

     

       51
       51
       +
       		ParallelBackfills:     10,

     

       52
       52
       +
       		ParallelRecordCreates: 5,

     

       53
       53
       +
       		SyncRequestsPerSecond: 5,

     

       54
       54
       +
       

     

       55
       55
       +
       		RelayHost: "https://bsky.network",

     

       52
       56
        
       	}

     

       53
       57
        
       	return backfill.NewBackfiller(

     

       54
       58
        
       		"backfills",

     
···

       69
       73
        
       	if err != nil {

     

       70
       74
        
       		sl.Error("failed loading firehose cursor", "err", err)

     

       71
       75
        
       	}

     

       72
       72
       -
       	cc, ok := cursor.(int64)

     

       73
       73
       -
       	if ok {

     

       74
       74
       -
       		subscribeUrl += fmt.Sprintf("?cursor=%d", cc)

     

       76
       76
       +
       	if cursor != "" {

     

       77
       77
       +
       		subscribeUrl += "?cursor=" + cursor

     

       75
       78
        
       	}

     

       76
       79
        
       

     

       77
       80
        
       	conn, _, err := websocket.DefaultDialer.Dial(subscribeUrl, http.Header{

+5 -3

cmd/backfiller/pump.go

···

       37
       37
        
       		return fmt.Errorf("configured job store doesn't support random job creation")

     

       38
       38
        
       	}

     

       39
       39
        
       

     

       40
       40
       -
       	cursor, err := backend.LoadCursor("repos")

     

       40
       40
       +
       	curs, err := backend.LoadCursor("repos")

     

       41
       41
        
       	if err != nil {

     

       42
       42
        
       		sl.Error("failed to load repos cursor", "err", err)

     

       43
       43
        
       	}

     

       44
       44
       -
       	curs, _ := cursor.(string)

     

       45
       44
        
       

     

       46
       45
        
       	for {

     

       47
       46
        
       		select {

     
···

       66
       65
        
       		}

     

       67
       66
        
       

     

       68
       67
        
       		if res.Cursor != nil && *res.Cursor != "" {

     

       69
       69
       -
       			cursor = *res.Cursor

     

       68
       68
       +
       			curs = *res.Cursor

     

       69
       69
       +
       			backend.reposLk.Lock()

     

       70
       70
       +
       			backend.reposSeq = curs

     

       71
       71
       +
       			backend.reposLk.Unlock()

     

       70
       72
        
       		} else {

     

       71
       73
        
       			break

     

       72
       74
        
       		}