Skip to content

Commit 1bfee57

Browse files
committed
more context
1 parent eec456f commit 1bfee57

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

internal/verifier/check.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ func (verifier *Verifier) CreateInitialTasks(ctx context.Context) error {
353353
)
354354
}
355355
}
356-
isPrimary, err := verifier.CheckIsPrimary()
356+
isPrimary, err := verifier.CheckIsPrimary(ctx)
357357
if err != nil {
358358
return err
359359
}
@@ -380,7 +380,7 @@ func (verifier *Verifier) CreateInitialTasks(ctx context.Context) error {
380380

381381
verifier.gen0PendingCollectionTasks.Store(int32(len(verifier.srcNamespaces)))
382382

383-
err = verifier.UpdatePrimaryTaskComplete()
383+
err = verifier.UpdatePrimaryTaskComplete(ctx)
384384
if err != nil {
385385
return err
386386
}

internal/verifier/reset_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func (suite *IntegrationTestSuite) TestResetPrimaryTask() {
1515

1616
verifier := suite.BuildVerifier()
1717

18-
created, err := verifier.CheckIsPrimary()
18+
created, err := verifier.CheckIsPrimary(ctx)
1919
suite.Require().NoError(err)
2020
suite.Require().True(created)
2121

@@ -45,11 +45,11 @@ func (suite *IntegrationTestSuite) TestResetNonPrimaryTasks() {
4545
verifier := suite.BuildVerifier()
4646

4747
// Create a primary task, and set it to complete.
48-
created, err := verifier.CheckIsPrimary()
48+
created, err := verifier.CheckIsPrimary(ctx)
4949
suite.Require().NoError(err)
5050
suite.Require().True(created)
5151

52-
suite.Require().NoError(verifier.UpdatePrimaryTaskComplete())
52+
suite.Require().NoError(verifier.UpdatePrimaryTaskComplete(ctx))
5353

5454
ns1 := "foo.bar"
5555
ns2 := "qux.quux"

internal/verifier/verification_task.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ type VerificationRange struct {
9090
}
9191

9292
func (verifier *Verifier) insertCollectionVerificationTask(
93+
ctx context.Context,
9394
srcNamespace string,
9495
generation int) (*VerificationTask, error) {
9596

@@ -120,22 +121,22 @@ func (verifier *Verifier) insertCollectionVerificationTask(
120121
To: dstNamespace,
121122
},
122123
}
123-
_, err := verifier.verificationTaskCollection().InsertOne(context.Background(), verificationTask)
124+
_, err := verifier.verificationTaskCollection().InsertOne(ctx, verificationTask)
124125
return &verificationTask, err
125126
}
126127

127128
func (verifier *Verifier) InsertCollectionVerificationTask(
128129
ctx context.Context,
129130
srcNamespace string,
130131
) (*VerificationTask, error) {
131-
return verifier.insertCollectionVerificationTask(srcNamespace, verifier.generation)
132+
return verifier.insertCollectionVerificationTask(ctx, srcNamespace, verifier.generation)
132133
}
133134

134135
func (verifier *Verifier) InsertFailedCollectionVerificationTask(
135136
ctx context.Context,
136137
srcNamespace string,
137138
) (*VerificationTask, error) {
138-
return verifier.insertCollectionVerificationTask(srcNamespace, verifier.generation+1)
139+
return verifier.insertCollectionVerificationTask(ctx, srcNamespace, verifier.generation+1)
139140
}
140141

141142
func (verifier *Verifier) InsertPartitionVerificationTask(
@@ -157,7 +158,7 @@ func (verifier *Verifier) InsertPartitionVerificationTask(
157158
To: dstNamespace,
158159
},
159160
}
160-
_, err := verifier.verificationTaskCollection().InsertOne(context.Background(), verificationTask)
161+
_, err := verifier.verificationTaskCollection().InsertOne(ctx, verificationTask)
161162
return &verificationTask, err
162163
}
163164

@@ -247,7 +248,7 @@ func (verifier *Verifier) UpdateVerificationTask(ctx context.Context, task *Veri
247248
return err
248249
}
249250

250-
func (verifier *Verifier) CheckIsPrimary() (bool, error) {
251+
func (verifier *Verifier) CheckIsPrimary(ctx context.Context) (bool, error) {
251252
ownerSetId := primitive.NewObjectID()
252253
filter := bson.M{"type": verificationTaskPrimary}
253254
opts := options.Update()
@@ -259,7 +260,7 @@ func (verifier *Verifier) CheckIsPrimary() (bool, error) {
259260
"status": verificationTaskAdded,
260261
},
261262
}
262-
result, err := verifier.verificationTaskCollection().UpdateOne(context.Background(), filter, update, opts)
263+
result, err := verifier.verificationTaskCollection().UpdateOne(ctx, filter, update, opts)
263264
if err != nil {
264265
return false, err
265266
}
@@ -268,8 +269,7 @@ func (verifier *Verifier) CheckIsPrimary() (bool, error) {
268269
return isPrimary, nil
269270
}
270271

271-
func (verifier *Verifier) UpdatePrimaryTaskComplete() error {
272-
var ctx = context.Background()
272+
func (verifier *Verifier) UpdatePrimaryTaskComplete(ctx context.Context) error {
273273
updateFields := bson.M{
274274
"$set": bson.M{
275275
"status": verificationTaskCompleted,

0 commit comments

Comments
 (0)