allow blocking rollup init to handle data insertion

mafredri · mafredri · commit 9c2d0851b59c · 2024-03-22T17:13:51.000Z
diff --git a/coderd/database/dbrollup/dbrollup.go b/coderd/database/dbrollup/dbrollup.go
@@ -21,7 +21,8 @@ const (
 )
 
 type Event struct {
-	TemplateUsageStats bool
+	Init               bool `json:"-"`
+	TemplateUsageStats bool `json:"template_usage_stats"`
 }
 
 type Rolluper struct {
@@ -138,6 +139,15 @@ func (r *Rolluper) start(ctx context.Context) {
 		}
 	}
 
+	// For testing.
+	if r.event != nil {
+		select {
+		case <-ctx.Done():
+			return
+		case r.event <- Event{Init: true}:
+		}
+	}
+
 	// Perform do immediately and on every tick of the ticker,
 	// disregarding the execution time of do. This ensure that
 	// the rollup is performed every interval assuming do does
diff --git a/coderd/database/dbrollup/dbrollup_test.go b/coderd/database/dbrollup/dbrollup_test.go
@@ -110,6 +110,8 @@ func TestRollup_TwoInstancesUseLocking(t *testing.T) {
 	)
 	defer closeRolluper(rolluper2, resume2)
 
+	_, _ = <-events1, <-events2 // Deplete init event, resume operation.
+
 	ctx := testutil.Context(t, testutil.WaitMedium)
 
 	// One of the rollup instances should roll up and the other should not.
@@ -222,6 +224,8 @@ func TestRollupTemplateUsageStats(t *testing.T) {
 	rolluper := dbrollup.New(logger, db, dbrollup.WithInterval(250*time.Millisecond), dbrollup.WithEventChannel(events))
 	defer rolluper.Close()
 
+	<-events // Deplete init event, resume operation.
+
 	ctx := testutil.Context(t, testutil.WaitMedium)
 
 	select {
diff --git a/coderd/insights_test.go b/coderd/insights_test.go
@@ -2024,9 +2024,6 @@ func TestUserActivityInsights_Golden(t *testing.T) {
 			templates, users, testData := prepareFixtureAndTestData(t, tt.makeFixture, tt.makeTestData)
 			client, events := prepare(t, templates, users, testData)
 
-			// TODO(mafredri): Remove the need for this.
-			time.Sleep(3 * time.Second)
-
 			for _, req := range tt.requests {
 				req := req
 				t.Run(req.name, func(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ const (`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`type Event struct {`
`24`		`- TemplateUsageStats bool`
	`24`	+ Init bool `json:"-"`
	`25`	+ TemplateUsageStats bool `json:"template_usage_stats"`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`type Rolluper struct {`
`@@ -138,6 +139,15 @@ func (r *Rolluper) start(ctx context.Context) {`
`138`	`139`	`}`
`139`	`140`	`}`
`140`	`141`
	`142`	`+ // For testing.`
	`143`	`+ if r.event != nil {`
	`144`	`+ select {`
	`145`	`+ case <-ctx.Done():`
	`146`	`+ return`
	`147`	`+ case r.event <- Event{Init: true}:`
	`148`	`+ }`
	`149`	`+ }`
	`150`	`+`
`141`	`151`	`// Perform do immediately and on every tick of the ticker,`
`142`	`152`	`// disregarding the execution time of do. This ensure that`
`143`	`153`	`// the rollup is performed every interval assuming do does`