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

(query-client) Add support for fault-tolerant requests to single node services

Browse Source 
Adding a method importantCall that will retry a failing request on each route until it succeeds or the routes run out.
This commit is contained in:
Viktor Lofgren 2024-02-20 14:16:05 +01:00
parent 746a865106
commit 07b625c58d
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/api/query-api/src/main/java/nu/marginalia/query/client/QueryClient.java
View File

@ -47,10 +47,11 @@ public class QueryClient {
@CheckReturnValue
public QueryResponse search(QueryParams params) {
var query = QueryProtobufCodec.convertQueryParams(params);
return wmsa_qs_api_search_time.time(
() -> QueryProtobufCodec.convertQueryResponse(queryApiPool
.api()
.query(QueryProtobufCodec.convertQueryParams(params))
.importantCall((api) -> api.query(query))
)
);
}

16
code/common/service-discovery/src/main/java/nu/marginalia/service/client/GrpcSingleNodeChannelPool.java
View File

@ -98,6 +98,22 @@ public class GrpcSingleNodeChannelPool<STUB> extends ServiceChangeMonitor {
return stubConstructor.apply(getChannel());
}
/** Try to make the call go through. The function will cycle through
* available routes until exhaustion, and only then will it give up
*/
public <T> T importantCall(Function<STUB, T> function) {
for (int i = 0; i < channels.size(); i++) {
try {
return function.apply(api());
}
catch (Exception e) {
logger.error("API Exception", e);
}
}
throw new ServiceNotAvailableException(serviceId);
}
/** Get the channel that is most ready to use */
public ManagedChannel getChannel() {
return channels