Skip to content

Fix data race issue in globalShadowMode variable #370

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

Merged
mattklein123 merged 2 commits into from
Nov 4, 2022
Merged

Fix data race issue in globalShadowMode variable #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2d437c
Fix data race issue in globalShadowMode variable
renuka-fernando Oct 19, 2022
cb6afa3
Use the existing lock instead of making a new read lock
renuka-fernando Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/service/ratelimit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var tracer = otel.Tracer("ratelimit")

type RateLimitServiceServer interface {
pb.RateLimitServiceServer
GetCurrentConfig() config.RateLimitConfig
GetCurrentConfig() (config.RateLimitConfig, bool)
}

type service struct {
Expand Down Expand Up @@ -107,8 +107,7 @@ func checkServiceErr(something bool, msg string) {
}
}

func (this *service) constructLimitsToCheck(request *pb.RateLimitRequest, ctx context.Context) ([]*config.RateLimit, []bool) {
snappedConfig := this.GetCurrentConfig()
func (this *service) constructLimitsToCheck(request *pb.RateLimitRequest, ctx context.Context, snappedConfig config.RateLimitConfig) ([]*config.RateLimit, []bool) {
checkServiceErr(snappedConfig != nil, "no rate limit configuration loaded")

limitsToCheck := make([]*config.RateLimit, len(request.Descriptors))
Expand Down Expand Up @@ -180,7 +179,8 @@ func (this *service) shouldRateLimitWorker(
checkServiceErr(request.Domain != "", "rate limit domain must not be empty")
checkServiceErr(len(request.Descriptors) != 0, "rate limit descriptor list must not be empty")

limitsToCheck, isUnlimited := this.constructLimitsToCheck(request, ctx)
snappedConfig, globalShadowMode := this.GetCurrentConfig()
limitsToCheck, isUnlimited := this.constructLimitsToCheck(request, ctx, snappedConfig)

responseDescriptorStatuses := this.cache.DoLimit(ctx, request, limitsToCheck)
assert.Assert(len(limitsToCheck) == len(responseDescriptorStatuses))
Expand Down Expand Up @@ -228,7 +228,7 @@ func (this *service) shouldRateLimitWorker(
}

// If there is a global shadow_mode, it should always return OK
if finalCode == pb.RateLimitResponse_OVER_LIMIT && this.globalShadowMode {
if finalCode == pb.RateLimitResponse_OVER_LIMIT && globalShadowMode {
finalCode = pb.RateLimitResponse_OK
this.stats.GlobalShadowMode.Inc()
}
Expand Down Expand Up @@ -306,10 +306,10 @@ func (this *service) ShouldRateLimit(
return response, nil
}

func (this *service) GetCurrentConfig() config.RateLimitConfig {
func (this *service) GetCurrentConfig() (config.RateLimitConfig, bool) {
this.configLock.RLock()
defer this.configLock.RUnlock()
return this.config
return this.config, this.globalShadowMode
}

func NewService(runtime loader.IFace, cache limiter.RateLimitCache,
Expand Down
2 changes: 1 addition & 1 deletion src/service_cmd/runner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func (runner *Runner) Run() {
"/rlconfig",
"print out the currently loaded configuration for debugging",
func(writer http.ResponseWriter, request *http.Request) {
if current := service.GetCurrentConfig(); current != nil {
if current, _ := service.GetCurrentConfig(); current != nil {
io.WriteString(writer, current.Dump())
}
})
Expand Down