MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow fail-open behavior for a wider range of exceptions

This commit is contained in:
Jon Chambers 2025-03-28 16:37:20 -04:00 committed by Jon Chambers
parent f64244f33a
commit e9bd5da2c3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
service/src/main/java/org/whispersystems/textsecuregcm/limits/StaticRateLimiter.java
View File

@ -9,7 +9,6 @@ import static java.util.concurrent.CompletableFuture.completedFuture;
import static java.util.concurrent.CompletableFuture.failedFuture; import static java.util.concurrent.CompletableFuture.failedFuture;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import io.lettuce.core.RedisException;
import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.Metrics;
import java.time.Clock; import java.time.Clock;
@ -67,7 +66,7 @@ public class StaticRateLimiter implements RateLimiter {
(long) Math.ceil((double) deficitPermitsAmount / config.leakRatePerMillis())); (long) Math.ceil((double) deficitPermitsAmount / config.leakRatePerMillis()));
throw new RateLimitExceededException(retryAfter); throw new RateLimitExceededException(retryAfter);
} }
} catch (RedisException e) { } catch (final Exception e) {
if (!failOpen()) { if (!failOpen()) {
throw e; throw e;
} }
@ -87,7 +86,7 @@ public class StaticRateLimiter implements RateLimiter {
return failedFuture(new RateLimitExceededException(retryAfter)); return failedFuture(new RateLimitExceededException(retryAfter));
}) })
.exceptionally(throwable -> { .exceptionally(throwable -> {
if (ExceptionUtils.unwrap(throwable) instanceof RedisException && failOpen()) { if (failOpen()) {
return null; return null;
} }
throw ExceptionUtils.wrap(throwable); throw ExceptionUtils.wrap(throwable);
@ -99,7 +98,7 @@ public class StaticRateLimiter implements RateLimiter {
try { try {
final long deficitPermitsAmount = executeValidateScript(key, amount, false); final long deficitPermitsAmount = executeValidateScript(key, amount, false);
return deficitPermitsAmount == 0; return deficitPermitsAmount == 0;
} catch (RedisException e) { } catch (final Exception e) {
if (failOpen()) { if (failOpen()) {
return true; return true;
} else { } else {
@ -113,7 +112,7 @@ public class StaticRateLimiter implements RateLimiter {
return executeValidateScriptAsync(key, amount, false) return executeValidateScriptAsync(key, amount, false)
.thenApply(deficitPermitsAmount -> deficitPermitsAmount == 0) .thenApply(deficitPermitsAmount -> deficitPermitsAmount == 0)
.exceptionally(throwable -> { .exceptionally(throwable -> {
if (ExceptionUtils.unwrap(throwable) instanceof RedisException && failOpen()) { if (failOpen()) {
return true; return true;
} }
throw ExceptionUtils.wrap(throwable); throw ExceptionUtils.wrap(throwable);