Skip to content

MLE-23230 Applying RetryInterceptor in test plumbing #1822

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

Merged
merged 1 commit into from
Sep 22, 2025
Merged

MLE-23230 Applying RetryInterceptor in test plumbing #1822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions ...pi-functionaltests/src/test/java/com/marklogic/client/functionaltest/ConnectedRESTQA.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
import com.marklogic.client.DatabaseClientFactory;
import com.marklogic.client.FailedRequestException;
import com.marklogic.client.admin.ServerConfigurationManager;
import com.marklogic.client.extra.okhttpclient.OkHttpClientConfigurator;
import com.marklogic.client.impl.SSLUtil;
import com.marklogic.client.impl.okhttp.RetryInterceptor;
import com.marklogic.client.io.DocumentMetadataHandle;
import com.marklogic.client.io.DocumentMetadataHandle.Capability;
import com.marklogic.client.query.QueryManager;
Expand Down Expand Up @@ -45,6 +47,12 @@

public abstract class ConnectedRESTQA {

static {
DatabaseClientFactory.removeConfigurators();
DatabaseClientFactory.addConfigurator((OkHttpClientConfigurator) client ->
client.addInterceptor(new RetryInterceptor(3, 1000, 2, 8000)));
}

private static Properties testProperties = null;

private static String authType;
Expand Down
3 changes: 0 additions & 3 deletions marklogic-client-api/src/main/java/com/marklogic/client/impl/okhttp/OkHttpUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ public static OkHttpClient.Builder newOkHttpClientBuilder(String host, DatabaseC
OkHttpUtil.configureSocketFactory(clientBuilder, sslContext, trustManager);
OkHttpUtil.configureHostnameVerifier(clientBuilder, sslVerifier);

// Trying this out for all calls initially to see how the regression test piplines do.
clientBuilder.addInterceptor(new RetryInterceptor(3, 1000, 2, 8000));

return clientBuilder;
}

Expand Down
10 changes: 4 additions & 6 deletions marklogic-client-api/src/main/java/com/marklogic/client/impl/okhttp/RetryInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* OkHttp interceptor that retries requests on certain connection failures,
* which can be helpful when MarkLogic is temporarily unavailable during restarts.
*/
class RetryInterceptor implements Interceptor {
public class RetryInterceptor implements Interceptor {

private final static Logger logger = org.slf4j.LoggerFactory.getLogger(RetryInterceptor.class);

Expand All @@ -26,7 +26,7 @@ class RetryInterceptor implements Interceptor {
private final double backoffMultiplier;
private final long maxDelayMs;

RetryInterceptor(int maxRetries, long initialDelayMs, double backoffMultiplier, long maxDelayMs) {
public RetryInterceptor(int maxRetries, long initialDelayMs, double backoffMultiplier, long maxDelayMs) {
this.maxRetries = maxRetries;
this.initialDelayMs = initialDelayMs;
this.backoffMultiplier = backoffMultiplier;
Expand All @@ -36,14 +36,11 @@ class RetryInterceptor implements Interceptor {
@Override
public Response intercept(Chain chain) throws IOException {
Request request = chain.request();
IOException lastException = null;

for (int attempt = 0; attempt <= maxRetries; attempt++) {
try {
return chain.proceed(request);
} catch (IOException e) {
lastException = e;

if (attempt == maxRetries || !isRetryableException(e)) {
logger.warn("Not retryable: {}; {}", e.getClass(), e.getMessage());
throw e;
Expand All @@ -57,7 +54,8 @@ public Response intercept(Chain chain) throws IOException {
}
}

throw lastException;
// This should never be reached due to loop logic, but is required for compilation.
throw new IllegalStateException("Unexpected end of retry loop");
}

private boolean isRetryableException(IOException e) {
Expand Down
9 changes: 9 additions & 0 deletions marklogic-client-api/src/test/java/com/marklogic/client/test/Common.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@
import com.marklogic.client.DatabaseClient;
import com.marklogic.client.DatabaseClientBuilder;
import com.marklogic.client.DatabaseClientFactory;
import com.marklogic.client.extra.okhttpclient.OkHttpClientConfigurator;
import com.marklogic.client.impl.okhttp.RetryInterceptor;
import com.marklogic.client.io.DocumentMetadataHandle;
import com.marklogic.mgmt.ManageClient;
import com.marklogic.mgmt.ManageConfig;
import okhttp3.OkHttpClient;
import org.springframework.util.FileCopyUtils;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
Expand All @@ -29,6 +32,12 @@

public class Common {

static {
DatabaseClientFactory.removeConfigurators();
DatabaseClientFactory.addConfigurator((OkHttpClientConfigurator) client ->
client.addInterceptor(new RetryInterceptor(3, 1000, 2, 8000)));
}

final public static String USER = "rest-writer";
final public static String PASS = "x";
final public static String REST_ADMIN_USER = "rest-admin";
Expand Down