Mirror/MarginaliaSearch
1
0
Fork 0
mirror of https://github.com/MarginaliaSearch/MarginaliaSearch.git synced 2025-02-24 05:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(grpc) Reduce error spam

Browse Source
This commit is contained in:
Viktor Lofgren 2024-02-28 14:44:48 +01:00
parent a0648844fb
commit 65b8a1d5d9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/common/service-discovery/java/nu/marginalia/service/client/GrpcSingleNodeChannelPool.java
View File

@ -132,8 +132,9 @@ public class GrpcSingleNodeChannelPool<STUB> extends ServiceChangeMonitor {
return Objects.hash(address); return Objects.hash(address);
} }
/** Keep track of the last time this channel errored, up til 5 minutes */
private boolean hasRecentError() { private boolean hasRecentError() {
return System.currentTimeMillis() < lastError + 5000; return System.currentTimeMillis() < lastError + Duration.ofMinutes(5).toMillis();
} }
void flagError() { void flagError() {
@ -146,6 +147,7 @@ public class GrpcSingleNodeChannelPool<STUB> extends ServiceChangeMonitor {
int diff = Boolean.compare(hasRecentError(), o.hasRecentError()); int diff = Boolean.compare(hasRecentError(), o.hasRecentError());
if (diff != 0) return diff; if (diff != 0) return diff;
// If no error has been recorded (or both have recent errors), round-robin between the options
return Long.compare(lastUsed, o.lastUsed); return Long.compare(lastUsed, o.lastUsed);
} }
} }
@ -173,6 +175,8 @@ public class GrpcSingleNodeChannelPool<STUB> extends ServiceChangeMonitor {
final List<Exception> exceptions = new ArrayList<>(); final List<Exception> exceptions = new ArrayList<>();
final List<ConnectionHolder> connectionHolders = new ArrayList<>(channels.values()); final List<ConnectionHolder> connectionHolders = new ArrayList<>(channels.values());
// Sorting the channel list will give us a round-robin distribution of calls,
// while preferring channels that have not errored recently
Collections.sort(connectionHolders); Collections.sort(connectionHolders);
for (var channel : connectionHolders) { for (var channel : connectionHolders) {