comparing fe6b736cc66953dc6e620ae935f36c75435b3f38 and master on edavis.dev/monarch

+20

cmd/monarch/handlers.go

···

       5
       5
        
       	"context"

     

       6
       6
        
       	"encoding/json"

     

       7
       7
        
       	"fmt"

     

       8
       8
       +
       	"log/slog"

     

       8
       9
        
       

     

       9
       10
        
       	appbsky "github.com/bluesky-social/indigo/api/bsky"

     

       10
       11
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     
···

       75
       76
        
       		var out appbsky.LabelerService

     

       76
       77
        
       		out.UnmarshalCBOR(bytes.NewReader(*rec))

     

       77
       78
        
       		body, err = json.Marshal(out)

     

       79
       79
       +
       

     

       80
       80
       +
       	case syntax.NSID("app.bsky.graph.list"):

     

       81
       81
       +
       		var out appbsky.GraphList

     

       82
       82
       +
       		out.UnmarshalCBOR(bytes.NewReader(*rec))

     

       83
       83
       +
       		body, err = json.Marshal(out)

     

       84
       84
       +
       

     

       85
       85
       +
       	case syntax.NSID("app.bsky.graph.verification"):

     

       86
       86
       +
       		var out appbsky.GraphVerification

     

       87
       87
       +
       		out.UnmarshalCBOR(bytes.NewReader(*rec))

     

       88
       88
       +
       		body, err = json.Marshal(out)

     

       89
       89
       +
       

     

       90
       90
       +
       	case syntax.NSID("app.bsky.graph.starterpack"):

     

       91
       91
       +
       		var out appbsky.GraphStarterpack

     

       92
       92
       +
       		out.UnmarshalCBOR(bytes.NewReader(*rec))

     

       93
       93
       +
       		body, err = json.Marshal(out)

     

       94
       94
       +
       

     

       95
       95
       +
       	default:

     

       96
       96
       +
       		slog.Error("tracked collection missing handler", "collection", uri.Collection())

     

       97
       97
       +
       		return nil

     

       78
       98
        
       	}

     

       79
       99
        
       

     

       80
       100
        
       	switch action {

+1 -1

cmd/monarch/backfill.go

···

       10
       10
        
       		ParallelBackfills:     cctx.Int("backfill-workers"),

     

       11
       11
        
       		ParallelRecordCreates: cctx.Int("backfill-consumers"),

     

       12
       12
        
       		NSIDFilter:            "",

     

       13
       13
       -
       		SyncRequestsPerSecond: 10,

     

       13
       13
       +
       		SyncRequestsPerSecond: cctx.Int("sync-requests-limit"),

     

       14
       14
        
       		RelayHost:             "https://" + cctx.String("relay-host"),

     

       15
       15
        
       	}

     

       16
       16

+1 -1

cmd/monarch/main.go

···

       139
       139
        
       		},

     

       140
       140
        
       		&cli.IntFlag{

     

       141
       141
        
       			Name:  "sync-requests-limit",

     

       142
       142
       -
       			Value: 30,

     

       142
       142
       +
       			Value: 10, // ratelimit-policy: 3000;w=300

     

       143
       143
        
       		},

     

       144
       144
        
       	}

     

       145
       145

+4 -20

cmd/monarch/census.go

···

       14
       14
        
       )

     

       15
       15
        
       

     

       16
       16
        
       type CensusService struct {

     

       17
       17
       -
       	cursor   *CursorService

     

       18
       18
       -
       	backfill *backfill.Backfiller

     

       19
       19
       -
       

     

       17
       17
       +
       	cursor    *CursorService

     

       18
       18
       +
       	backfill  *backfill.Backfiller

     

       20
       19
        
       	seenHosts map[string]bool

     

       21
       21
       -
       	seenLk    sync.Mutex

     

       22
       22
       -
       

     

       23
       23
       -
       	storeLk sync.Mutex

     

       24
       20
        
       }

     

       25
       21
        
       

     

       26
       22
        
       type jobMaker interface {

     
···

       70
       66
        
       

     

       71
       67
        
       		for _, host := range res.Hosts {

     

       72
       68
        
       			// don't reprocess hosts already handled

     

       73
       73
       -
       			cs.seenLk.Lock()

     

       74
       74
       -
       			_, ok := cs.seenHosts[host.Hostname]

     

       75
       75
       -
       			cs.seenLk.Unlock()

     

       76
       76
       -
       			if ok {

     

       69
       69
       +
       			seen := cs.seenHosts[host.Hostname]

     

       70
       70
       +
       			if seen {

     

       77
       71
        
       				slog.Info("already processed host, skipping", "host", host)

     

       78
       72
        
       				continue

     

       79
       73
        
       			}

     
···

       114
       108
        
       		return

     

       115
       109
        
       	}

     

       116
       110
        
       

     

       117
       117
       -
       	cs.storeLk.Lock()

     

       118
       111
        
       	hcur, err := cs.cursor.GetHostCursor(host)

     

       119
       112
        
       	if err != nil {

     

       120
       113
        
       		slog.Error("error fetching host cursor", "err", err)

     

       121
       114
        
       	}

     

       122
       122
       -
       	cs.storeLk.Unlock()

     

       123
       115
        
       

     

       124
       116
        
       	var added int

     

       125
       117
        
       	curs := hcur.Cursor

     
···

       138
       130
        
       			continue

     

       139
       131
        
       		}

     

       140
       132
        
       

     

       141
       141
       -
       		cs.storeLk.Lock()

     

       142
       133
        
       		for _, repo := range res.Repos {

     

       143
       134
        
       			_, err := jmstore.GetOrCreateJob(ctx, repo.Did, backfill.StateEnqueued)

     

       144
       135
        
       			if err != nil {

     
···

       147
       138
        
       				added += 1

     

       148
       139
        
       			}

     

       149
       140
        
       		}

     

       150
       150
       -
       		cs.storeLk.Unlock()

     

       151
       141
        
       

     

       152
       142
        
       		if res.Cursor != nil && *res.Cursor != "" {

     

       153
       143
        
       			curs = *res.Cursor

     

       154
       154
       -
       			cs.storeLk.Lock()

     

       155
       144
        
       			if err := cs.cursor.SetHostCursor(host, curs); err != nil {

     

       156
       145
        
       				slog.Error("error updating cursor for host", "err", err)

     

       157
       146
        
       			}

     

       158
       158
       -
       			cs.storeLk.Unlock()

     

       159
       147
        
       		} else {

     

       160
       148
        
       			break

     

       161
       149
        
       		}

     

       162
       150
        
       	}

     

       163
       151
        
       

     

       164
       152
        
       	slog.Info("finished listing repos", "host", host)

     

       165
       165
       -
       

     

       166
       166
       -
       	cs.seenLk.Lock()

     

       167
       167
       -
       	defer cs.seenLk.Unlock()

     

       168
       168
       -
       

     

       169
       153
        
       	cs.seenHosts[host] = true

     

       170
       154
        
       }

     

       171
       155

+1 -4

cmd/monarch/cursors.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
        
       	"log/slog"

     

       6
       6
       -
       	"sync"

     

       7
       6
        
       	"time"

     

       8
       7
        
       

     

       9
       8
        
       	"gorm.io/gorm"

     

       10
       9
        
       )

     

       11
       10
        
       

     

       12
       11
        
       type CursorService struct {

     

       13
       13
       -
       	store *gorm.DB

     

       14
       14
       -
       

     

       15
       15
       -
       	firehoseLk  sync.Mutex

     

       12
       12
       +
       	store       *gorm.DB

     

       16
       13
        
       	firehoseSeq int64

     

       17
       14
        
       }

     

       18
       15

Compare changes