commit c66254d4c971a9a937d696b0bc9e343a255c8d1d · edavis.dev/monarch

+12 -1

cmd/backfiller/cursors.go

···

       1
       1
        
       package main

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"context"

     

       4
       5
        
       	"errors"

     

       5
       6
        
       	"fmt"

     

       6
       7
        
       	"log/slog"

     
···

       46
       47
        
       	return nil

     

       47
       48
        
       }

     

       48
       49
        
       

     

       49
       49
       -
       func (b *Backend) SyncCursors() {

     

       50
       50
       +
       func (b *Backend) SyncCursors(ctx context.Context) error {

     

       50
       51
        
       	for range time.Tick(time.Second * 5) {

     

       52
       52
       +
       		select {

     

       53
       53
       +
       		case <-ctx.Done():

     

       54
       54
       +
       			return nil

     

       55
       55
       +
       		default:

     

       56
       56
       +
       			//

     

       57
       57
       +
       		}

     

       58
       58
       +
       

     

       51
       59
        
       		if err := b.FlushCursors(); err != nil {

     

       52
       60
        
       			slog.Error("failed to flush cursors", "err", err)

     

       61
       61
       +
       			return fmt.Errorf("failed to flush cursors: %w", err)

     

       53
       62
        
       		}

     

       54
       63
        
       	}

     

       64
       64
       +
       

     

       65
       65
       +
       	return nil

     

       55
       66
        
       }

cmd/backfiller/handlers.go

···

       12
       12
        
       )

     

       13
       13
        
       

     

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

     

       15
       15
       +
       	select {

     

       16
       16
       +
       	case <-ctx.Done():

     

       17
       17
       +
       		return nil

     

       18
       18
       +
       	default:

     

       19
       19
       +
       		//

     

       20
       20
       +
       	}

     

       21
       21
       +
       

     

       15
       22
        
       	b.firehoseLk.Lock()

     

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

     

       17
       24
        
       	b.firehoseLk.Unlock()

+66 -24

cmd/backfiller/main.go

···

       23
       23
        
       

     

       24
       24
        
       func NewDatabase() *gorm.DB {

     

       25
       25
        
       	sl := slog.With("source", "database")

     

       26
       26
       -
       

     

       27
       26
        
       	newLogger := logger.New(

     

       28
       28
       -
       		log.New(os.Stdout, "\n", log.LstdFlags),

     

       27
       27
       +
       		log.New(os.Stdout, "\r\n", log.LstdFlags),

     

       29
       28
        
       		logger.Config{

     

       30
       29
        
       			SlowThreshold: 1 * time.Second,

     

       31
       30
        
       			Colorful:      false,

     
···

       39
       38
        
       	}

     

       40
       39
        
       	db.AutoMigrate(&backfill.GormDBJob{})

     

       41
       40
        
       	db.AutoMigrate(&cursorRecord{})

     

       41
       41
       +
       

     

       42
       42
        
       	return db

     

       43
       43
        
       }

     

       44
       44
        
       

     
···

       49
       49
        
       		// SyncRequestsPerSecond: 25,

     

       50
       50
        
       

     

       51
       51
        
       		ParallelBackfills:     10,

     

       52
       52
       -
       		ParallelRecordCreates: 5,

     

       52
       52
       +
       		ParallelRecordCreates: 1, // sqlite

     

       53
       53
        
       		SyncRequestsPerSecond: 5,

     

       54
       54
        
       

     

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

     

       56
       56
        
       	}

     

       57
       57
       +
       

     

       57
       58
        
       	return backfill.NewBackfiller(

     

       58
       59
        
       		"backfills",

     

       59
       60
        
       		backfill.NewGormstore(db),

     
···

       64
       65
        
       	)

     

       65
       66
        
       }

     

       66
       67
        
       

     

       67
       67
       -
       func NewFirehose(backend *Backend) *websocket.Conn {

     

       68
       68
       +
       func NewFirehose(ctx context.Context, cursor string) *websocket.Conn {

     

       68
       69
        
       	sl := slog.With("source", "firehose")

     

       69
       69
       -
       

     

       70
       70
        
       	subscribeUrl := "wss://bsky.network/xrpc/com.atproto.sync.subscribeRepos"

     

       71
       71
       -
       

     

       72
       72
       -
       	cursor, err := backend.LoadCursor("firehose")

     

       73
       73
       -
       	if err != nil {

     

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

     

       75
       75
       -
       	}

     

       76
       71
        
       	if cursor != "" {

     

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

     

       78
       73
        
       	}

     

       79
       74
        
       

     

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

     

       75
       75
       +
       	conn, _, err := websocket.DefaultDialer.DialContext(ctx, subscribeUrl, http.Header{

     

       81
       76
        
       		"User-Agent": []string{"backfiller/0.1 (@edavis.dev)"},

     

       82
       77
        
       	})

     

       83
       78
        
       	if err != nil {

     

       84
       79
        
       		sl.Error("failed to connect to relay", "err", err)

     

       85
       80
        
       	}

     

       81
       81
       +
       

     

       86
       82
        
       	return conn

     

       87
       83
        
       }

     

       88
       84
        
       

     
···

       92
       88
        
       			return backend.RepoCommitHandler(ctx, evt)

     

       93
       89
        
       		},

     

       94
       90
        
       	}

     

       91
       91
       +
       

     

       95
       92
        
       	return parallel.NewScheduler(16, 100, "firehose", rsc.EventHandler)

     

       96
       93
        
       }

     

       97
       94
        
       

     

       98
       95
        
       func main() {

     

       99
       99
       -
       	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGINT, syscall.SIGTERM)

     

       100
       100
       -
       	defer stop()

     

       96
       96
       +
       	sl := slog.With("source", "backfiller")

     

       101
       97
        
       

     

       102
       102
       -
       	sl := slog.With("source", "backfiller")

     

       98
       98
       +
       	streamClosed := make(chan struct{})

     

       99
       99
       +
       	streamCtx, streamCancel := context.WithCancel(context.Background())

     

       103
       100
        
       

     

       104
       101
        
       	db := NewDatabase()

     

       105
       102
        
       

     
···

       107
       104
        
       	go bf.Start()

     

       108
       105
        
       

     

       109
       106
        
       	backend := NewBackend(db, bf)

     

       110
       110
       -
       	go backend.SyncCursors()

     

       111
       111
       -
       	go backend.PumpRepos(ctx)

     

       107
       107
       +
       	go backend.SyncCursors(streamCtx)

     

       112
       108
        
       

     

       113
       113
       -
       	conn := NewFirehose(backend)

     

       114
       114
       -
       	sched := NewScheduler(ctx, backend)

     

       115
       115
       -
       	if err := events.HandleRepoStream(ctx, conn, sched, sl); err != nil {

     

       116
       116
       -
       		sl.Error("failed to start scheduler", "err", err)

     

       109
       109
       +
       	cursor, err := backend.LoadCursor("firehose")

     

       110
       110
       +
       	if err != nil {

     

       111
       111
       +
       		sl.Error("failed loading firehose cursor", "err", err)

     

       117
       112
        
       	}

     

       118
       118
       -
       	<-ctx.Done()

     

       113
       113
       +
       	conn := NewFirehose(streamCtx, cursor)

     

       119
       114
        
       

     

       120
       120
       -
       	endctx, cancel := context.WithTimeout(ctx, time.Minute)

     

       121
       121
       -
       	defer cancel()

     

       122
       122
       -
       	bf.Stop(endctx)

     

       115
       115
       +
       	sched := NewScheduler(streamCtx, backend)

     

       116
       116
       +
       	go func() {

     

       117
       117
       +
       		if err := events.HandleRepoStream(streamCtx, conn, sched, sl); err != nil {

     

       118
       118
       +
       			sl.Error("failed to start scheduler", "err", err)

     

       119
       119
       +
       		}

     

       120
       120
       +
       		close(streamClosed)

     

       121
       121
       +
       	}()

     

       122
       122
       +
       

     

       123
       123
       +
       	go func() {

     

       124
       124
       +
       		if err := backend.PumpRepos(streamCtx); err != nil {

     

       125
       125
       +
       			sl.Error("failed pumping repos", "err", err)

     

       126
       126
       +
       		} else {

     

       127
       127
       +
       			sl.Info("finished listing repos, switching over to event stream")

     

       128
       128
       +
       		}

     

       129
       129
       +
       	}()

     

       130
       130
       +
       

     

       131
       131
       +
       	quit := make(chan struct{})

     

       132
       132
       +
       	exitSignals := make(chan os.Signal, 1)

     

       133
       133
       +
       	signal.Notify(exitSignals, syscall.SIGINT, syscall.SIGTERM)

     

       134
       134
       +
       	go func() {

     

       135
       135
       +
       		select {

     

       136
       136
       +
       		case sig := <-exitSignals:

     

       137
       137
       +
       			sl.Info("received OS exit signal", "signal", sig)

     

       138
       138
       +
       		case <-streamClosed:

     

       139
       139
       +
       			//

     

       140
       140
       +
       		}

     

       141
       141
       +
       

     

       142
       142
       +
       		conn.Close()

     

       143
       143
       +
       

     

       144
       144
       +
       		streamCancel()

     

       145
       145
       +
       		<-streamClosed

     

       146
       146
       +
       

     

       147
       147
       +
       		time.Sleep(time.Millisecond * 100)

     

       148
       148
       +
       

     

       149
       149
       +
       		endctx, cancel := context.WithTimeout(context.TODO(), time.Minute)

     

       150
       150
       +
       		defer cancel()

     

       151
       151
       +
       		bf.Stop(endctx)

     

       152
       152
       +
       

     

       153
       153
       +
       		if err := backend.FlushCursors(); err != nil {

     

       154
       154
       +
       			sl.Error("final flush cursor failed", "err", err)

     

       155
       155
       +
       		}

     

       156
       156
       +
       

     

       157
       157
       +
       		close(quit)

     

       158
       158
       +
       	}()

     

       159
       159
       +
       

     

       160
       160
       +
       	<-quit

     

       161
       161
       +
       

     

       162
       162
       +
       	if err := backend.FlushCursors(); err != nil {

     

       163
       163
       +
       		sl.Error("failed to flush cursors on close", "err", err)

     

       164
       164
       +
       	}

     

       123
       165
        
       }

+6 -15

cmd/backfiller/pump.go

···

       16
       16
        
       

     

       17
       17
        
       func (b *Backend) PumpRepos(ctx context.Context) error {

     

       18
       18
        
       	sl := slog.With("source", "pumpRepos")

     

       19
       19
       -
       

     

       20
       20
       -
       	if err := pumpRepos(ctx, b); err != nil {

     

       21
       21
       -
       		sl.Error("failed pumping repos", "err", err)

     

       22
       22
       -
       	}

     

       23
       23
       -
       

     

       24
       24
       -
       	return nil

     

       25
       25
       -
       }

     

       26
       26
       -
       

     

       27
       27
       -
       func pumpRepos(ctx context.Context, backend *Backend) error {

     

       28
       28
       -
       	sl := slog.With("source", "pumpRepos")

     

       29
       29
       -
       	bf := backend.bf

     

       19
       19
       +
       	bf := b.bf

     

       30
       20
        
       

     

       31
       21
        
       	xrpcc := &xrpc.Client{

     

       32
       22
        
       		Host: "https://bsky.network",

     
···

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

     

       38
       28
        
       	}

     

       39
       29
        
       

     

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

     

       30
       30
       +
       	curs, err := b.LoadCursor("repos")

     

       41
       31
        
       	if err != nil {

     

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

     

       43
       33
        
       	}

     
···

       48
       38
        
       			sl.Info("stopping repo pump")

     

       49
       39
        
       			return nil

     

       50
       40
        
       		default:

     

       41
       41
       +
       			//

     

       51
       42
        
       		}

     

       52
       43
        
       

     

       53
       44
        
       		sl.Info("listing repos", "cursor", curs)

     
···

       66
       57
        
       

     

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

     

       68
       59
        
       			curs = *res.Cursor

     

       69
       69
       -
       			backend.reposLk.Lock()

     

       70
       70
       -
       			backend.reposSeq = curs

     

       71
       71
       -
       			backend.reposLk.Unlock()

     

       60
       60
       +
       			b.reposLk.Lock()

     

       61
       61
       +
       			b.reposSeq = curs

     

       62
       62
       +
       			b.reposLk.Unlock()

     

       72
       63
        
       		} else {

     

       73
       64
        
       			break

     

       74
       65
        
       		}