Don't use Allow, because that consumes tokens (#272)

* Don't use Allow, because that consumes tokens * Check for tokens existing * Version + changelog --------- Co-authored-by: Alexander Garbett <[email protected]>
thought-machine · Nov 10, 2023 · 71d337e · 71d337e
1 parent 9988e47
commit 71d337e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Version 11.6.2
+--------------
+    * Error token bucket was mistakenly consuming with `Allow()`. Refactored to make token bucket behaviour correct.
+
 Version 11.6.1
 --------------
     * Randomly offset retentionTime and expiryTime for each job so the

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-11.6.1
+11.6.2
diff --git a/mettle/worker/redis.go b/mettle/worker/redis.go
@@ -95,7 +95,7 @@ func (r *redisClient) ReadBlob(dg *pb.Digest) ([]byte, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), r.timeout)
 	defer cancel()
 
-	if r.limiter.Allow() {
+	if r.limiter.Tokens() >= 1.0 {
 		cmd := r.readRedis.Get(ctx, dg.Hash)
 		if err := cmd.Err(); err == nil {
 			blob, _ := cmd.Bytes()
@@ -226,7 +226,7 @@ func (r *redisClient) readBlobs(keys []string, metrics bool) [][]byte {
 	if len(keys) == 0 {
 		return nil
 	}
-	if !r.limiter.Allow() {
+	if r.limiter.Tokens() < 1.0 {
 		// Bail out immediately if Redis has exceeded error limit
 		return nil
 	}