Skip expired backfills instead of returning error #1674
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,7 @@ import ( | |
| "io" | ||
| "regexp" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| "google.golang.org/grpc/codes" | ||
|
|
@@ -186,11 +187,12 @@ func TestAcknowledgeBackfillDeletedTicket(t *testing.T) { | |
| om := newOM(t) | ||
| ctx := context.Background() | ||
|
|
||
| bf := &pb.Backfill{ | ||
| SearchFields: &pb.SearchFields{ | ||
| StringArgs: map[string]string{ | ||
| "search": "me", | ||
| }, | ||
| }, | ||
| } | ||
| createdBf, err := om.Frontend().CreateBackfill(ctx, &pb.CreateBackfillRequest{Backfill: bf}) | ||
| require.NoError(t, err) | ||
|
|
@@ -412,7 +414,7 @@ func TestProposedBackfillUpdate(t *testing.T) { | |
| "field1": "value1", | ||
| }, | ||
| } | ||
| // using DefaultEvaluationCriteria just for testing purposes only | ||
| b.Extensions = map[string]*anypb.Any{ | ||
| "evaluation_input": mustAny(&pb.DefaultEvaluationCriteria{ | ||
| Score: 10, | ||
|
|
@@ -571,7 +573,8 @@ func TestBackfillSkipNotfoundError(t *testing.T) { | |
| StringArgs: map[string]string{ | ||
| "search": "me", | ||
| }, | ||
| }, | ||
| }}) | ||
| require.NoError(t, err) | ||
| require.NotNil(t, b1) | ||
|
|
||
|
|
@@ -613,6 +616,62 @@ func TestBackfillSkipNotfoundError(t *testing.T) { | |
| require.Equal(t, fmt.Sprintf("rpc error: code = NotFound desc = Backfill id: %s not found", b1.Id), err.Error()) | ||
| } | ||
|
|
||
| func TestBackfillSkipExpiredError(t *testing.T) { | ||
| ctx := context.Background() | ||
| om := newOM(t) | ||
|
|
||
| t1, err := om.Frontend().CreateTicket(ctx, &pb.CreateTicketRequest{Ticket: &pb.Ticket{}}) | ||
| require.NoError(t, err) | ||
| require.NotNil(t, t1) | ||
|
|
||
| b1, err := om.Frontend().CreateBackfill(ctx, &pb.CreateBackfillRequest{Backfill: &pb.Backfill{ | ||
| SearchFields: &pb.SearchFields{ | ||
| StringArgs: map[string]string{ | ||
| "search": "me", | ||
| }, | ||
| }, | ||
| }}) | ||
| require.NoError(t, err) | ||
| require.NotNil(t, b1) | ||
|
|
||
| m := &pb.Match{ | ||
| MatchId: "1", | ||
| Tickets: []*pb.Ticket{t1}, | ||
| Backfill: b1, | ||
| } | ||
|
|
||
| om.SetMMF(func(ctx context.Context, profile *pb.MatchProfile, out chan<- *pb.Match) error { | ||
| out <- m | ||
| return nil | ||
| }) | ||
|
|
||
| om.SetEvaluator(func(ctx context.Context, in <-chan *pb.Match, out chan<- string) error { | ||
| p, ok := <-in | ||
| require.True(t, ok) | ||
|
|
||
| out <- p.MatchId | ||
| return nil | ||
| }) | ||
|
|
||
| // Depends on pendingReleaseTimeout | ||
| time.Sleep(1 * time.Second) | ||
|
Author
There was a problem hiding this comment. This is a bit ugly, would be nice if we could have something like k8s.io/utils/clock/testing to pass the time |
||
|
|
||
| // Make sure backfill has expired | ||
| _, err = om.Frontend().AcknowledgeBackfill(ctx, &pb.AcknowledgeBackfillRequest{BackfillId: b1.Id, Assignment: &pb.Assignment{}}) | ||
| require.Error(t, err) | ||
| require.Equal(t, fmt.Sprintf("rpc error: code = FailedPrecondition desc = can not acknowledge an expired backfill, id: %s", b1.Id), err.Error()) | ||
|
|
||
| stream, err := om.Backend().FetchMatches(ctx, &pb.FetchMatchesRequest{ | ||
| Config: om.MMFConfigGRPC(), | ||
| Profile: &pb.MatchProfile{}, | ||
| }) | ||
| require.NoError(t, err) | ||
| resp, err := stream.Recv() | ||
| require.Nil(t, resp) | ||
| require.Error(t, err) | ||
| require.Equal(t, io.EOF.Error(), err.Error()) | ||
| } | ||
|
|
||
| func mustAny(m proto.Message) *anypb.Any { | ||
| result, err := anypb.New(m) | ||
| if err != nil { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the main change