Skip to content

Commit

Permalink
kv: deflake TestAbortCountConflictingWrites
Browse files Browse the repository at this point in the history
Fixes #96839.

The test was made flaky by 5129578. See the comment in
#96839 (comment)
for an explanation.

This commit resolves that flakiness.

Release note: None
  • Loading branch information
nvanbenschoten committed Mar 13, 2023
1 parent a3a63c6 commit ba6d173
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions pkg/testutils/storageutils/mocking.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,8 @@ func (c *ReplayProtectionFilterWrapper) run(args kvserverbase.FilterArgs) *kvpb.
c.Unlock()

res := future.WaitForResult(args.Ctx)
if res.Err != nil {
return kvpb.NewError(res.Err)
}
return shallowCloneErrorWithTxn(res.Val.(*kvpb.Error))
}

0 comments on commit ba6d173

Please sign in to comment.