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

Rename rate tracker files #312

Merged
merged 2 commits into from
Sep 2, 2022
Merged

Rename rate tracker files #312

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
e76dccf
rename logwriter
harjotgill Sep 2, 2022
cb947a1
rename rate tracker files
harjotgill Sep 2, 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
0 pkg/distcache/olric-logwriter.go → pkg/distcache/logwriter.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/policies/dataplane/actuators/rate/rate-limiter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ func (rateLimiter *rateLimiter) setup(lifecycle fx.Lifecycle) error {
label := rateLimiter.rateLimiterProto.GetLabelKey() + ":" + override.GetLabelValue()
rateLimiter.rateLimitChecker.AddOverride(label, override.GetLimitScaleFactor())
}
rateLimiter.rateTracker, err = ratetracker.NewOlricRateTracker(rateLimiter.rateLimitChecker,
rateLimiter.rateTracker, err = ratetracker.NewDistCacheRateTracker(rateLimiter.rateLimitChecker,
rateLimiter.rateLimiterFactory.distCache,
rateLimiter.name,
rateLimiter.rateLimiterProto.GetLimitResetInterval().AsDuration())
Expand Down
30 changes: 15 additions & 15 deletions ...rs/rate/ratetracker/olric-rate-tracker.go → ...ate/ratetracker/distcache-rate-tracker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ import (
"github.com/fluxninja/aperture/pkg/distcache"
)

// OlricRateTracker implements Limiter.
type OlricRateTracker struct {
// DistCacheRateTracker implements Limiter.
type DistCacheRateTracker struct {
mu sync.RWMutex
limitCheck RateLimitChecker
dMap *olric.DMap
name string
}

// NewOlricRateTracker creates a new instance of OlricRateLimiter.
func NewOlricRateTracker(limitCheck RateLimitChecker, dc *distcache.DistCache, name string, ttl time.Duration) (RateTracker, error) {
// NewDistCacheRateTracker creates a new instance of DistCacheRateTracker.
func NewDistCacheRateTracker(limitCheck RateLimitChecker, dc *distcache.DistCache, name string, ttl time.Duration) (RateTracker, error) {
dmapConfig := config.DMap{
TTLDuration: ttl,
}
Expand All @@ -33,7 +33,7 @@ func NewOlricRateTracker(limitCheck RateLimitChecker, dc *distcache.DistCache, n
}
dc.RemoveDMapCustomConfig(name)

ol := &OlricRateTracker{
ol := &DistCacheRateTracker{
name: name,
dMap: dMap,
limitCheck: limitCheck,
Expand All @@ -42,13 +42,13 @@ func NewOlricRateTracker(limitCheck RateLimitChecker, dc *distcache.DistCache, n
return ol, nil
}

// Name returns the name of the OlricRateLimiter.
func (ol *OlricRateTracker) Name() string {
// Name returns the name of the DistCacheRateTracker.
func (ol *DistCacheRateTracker) Name() string {
return ol.name
}

// Close cleans up DMap held within the OlricRateLimiter.
func (ol *OlricRateTracker) Close() error {
// Close cleans up DMap held within the DistCacheRateTracker.
func (ol *DistCacheRateTracker) Close() error {
ol.mu.Lock()
defer ol.mu.Unlock()
err := ol.dMap.Destroy()
Expand All @@ -59,13 +59,13 @@ func (ol *OlricRateTracker) Close() error {
}

// Take is a wrapper for TakeN(label, 1).
func (ol *OlricRateTracker) Take(label string) (bool, int, int) {
func (ol *DistCacheRateTracker) Take(label string) (bool, int, int) {
return ol.TakeN(label, 1)
}

// TakeN increments value in label by n and returns whether n events should be allowed along with the remaining value (limit - new n) after increment and the current count for the label.
// If an error occurred it returns true, 0 and 0 (fail open).
func (ol *OlricRateTracker) TakeN(label string, n int) (bool, int, int) {
func (ol *DistCacheRateTracker) TakeN(label string, n int) (bool, int, int) {
ol.mu.RLock()
defer ol.mu.RUnlock()
newN, err := ol.dMap.Incr(label, n)
Expand All @@ -76,10 +76,10 @@ func (ol *OlricRateTracker) TakeN(label string, n int) (bool, int, int) {
return ok, remaining, newN
}

// GetRateLimitChecker returns the RateLimitCheck of the OlricRateLimiter.
func (ol *OlricRateTracker) GetRateLimitChecker() RateLimitChecker {
// GetRateLimitChecker returns the RateLimitCheck of the DistCacheRateTracker.
func (ol *DistCacheRateTracker) GetRateLimitChecker() RateLimitChecker {
return ol.limitCheck
}

// Make sure OlricRateLimiter implements Limiter interface.
var _ RateTracker = (*OlricRateTracker)(nil)
// Make sure DistCacheRateTracker implements Limiter interface.
var _ RateTracker = (*DistCacheRateTracker)(nil)
2 changes: 1 addition & 1 deletion pkg/policies/dataplane/actuators/rate/ratetracker/rate-tracker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func newTestLimiter(t *testing.T, distCache *distcache.DistCache, limit int, ttl
for label, limit := range overrides {
limitCheck.AddOverride(label, limit)
}
limiter, err := NewOlricRateTracker(limitCheck, distCache, "Limiter", ttl)
limiter, err := NewDistCacheRateTracker(limitCheck, distCache, "Limiter", ttl)
if err != nil {
t.Logf("Failed to create OlricLimiter: %v", err)
return nil, err
Expand Down