Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix token count in archival rate limiter #3749

Merged
merged 2 commits into from
Dec 28, 2022
Merged

Fix token count in archival rate limiter #3749

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c57a07b
Fix token count in archival rate limiter
MichaelSnowden Dec 21, 2022
e7710b9
Merge branch 'master' into durable-archival/token
MichaelSnowden Dec 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions service/history/archival/archiver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,15 @@ func (a *archiver) Archive(ctx context.Context, request *Request) (res *Response
metricsScope.Timer(metrics.ArchiverArchiveLatency.GetMetricName()).
Record(time.Since(start), metrics.StringTag("status", status))
}(time.Now())
if err := a.rateLimiter.WaitN(ctx, 2); err != nil {
numTargets := len(request.Targets)
if err := a.rateLimiter.WaitN(ctx, numTargets); err != nil {
return nil, &serviceerror.ResourceExhausted{
Cause: enumspb.RESOURCE_EXHAUSTED_CAUSE_RPS_LIMIT,
Message: fmt.Sprintf("archival rate limited: %s", err.Error()),
}
}
var wg sync.WaitGroup
errs := make([]error, len(request.Targets))
errs := make([]error, numTargets)
for i, target := range request.Targets {
wg.Add(1)
i := i
Expand Down
2 changes: 1 addition & 1 deletion service/history/archival/archiver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ func TestArchiver(t *testing.T) {
Return(c.ArchiveVisibilityErr)
}
rateLimiter := quotas.NewMockRateLimiter(controller)
rateLimiter.EXPECT().WaitN(gomock.Any(), 2).Return(c.RateLimiterWaitErr)
rateLimiter.EXPECT().WaitN(gomock.Any(), len(c.Targets)).Return(c.RateLimiterWaitErr)

archiver := NewArchiver(archiverProvider, logRecorder, metricsHandler, rateLimiter)
_, err = archiver.Archive(ctx, &Request{
Expand Down