Skip to content
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.

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

feat(java): waitForTask APIC-478 #521

Merged
merged 3 commits into from
May 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,9 @@ jobs:
with:
type: specs

# Always download the utils for js, in case they changed we want to include them in the zip
- name: Download JavaScript utils artifacts
if: ${{ matrix.client.language == 'javascript' && steps.cache.outputs.cache-hit != 'true' }}
if: ${{ matrix.client.language == 'javascript' }}
uses: ./.github/actions/restore-artifacts
with:
type: js_utils
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.algolia.exceptions;

/**
* Exception thrown when an error occurs during the waitForTask strategy. For example: maximum
* number of retry exceeded
*/
public class AlgoliaRetriesExceededException extends AlgoliaRuntimeException {

public static final long serialVersionUID = 1L;

public AlgoliaRetriesExceededException(String message, Throwable cause) {
super(message, cause);
}

public AlgoliaRetriesExceededException(String message) {
super(message);
}

public AlgoliaRetriesExceededException(Throwable cause) {
super(cause);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package com.algolia.utils;

import com.algolia.exceptions.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.function.IntUnaryOperator;
import java.util.function.Predicate;
import java.util.function.Supplier;

public class TaskUtils {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could maybe add the defaults at the class level? So we don't have to dig if we want to change it somedays

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did the same as for js, do you want me to change it there too ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep a constant at the top of the file maybe?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry you mean putting the default in the search client or just at the top of this file?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the top of this file, the default value options (same for JS maybe?)


public static final int DEFAULT_MAX_TRIAL = 50;
public static final IntUnaryOperator DEFAULT_TIMEOUT = (int retries) -> {
return Math.min(retries * 200, 5000);
};

public static <TResponse> void retryUntil(
Supplier<CompletableFuture<TResponse>> func,
Predicate<TResponse> validate,
int maxTrial,
IntUnaryOperator timeout
) throws AlgoliaRuntimeException {
int retryCount = 0;
while (retryCount < maxTrial) {
try {
TResponse resp = func.get().get();
if (validate.test(resp)) {
return;
}
} catch (InterruptedException | ExecutionException e) {
// if the task is interrupted, just return
return;
}
try {
Thread.sleep(timeout.applyAsInt(retryCount));
} catch (InterruptedException ignored) {
// Restore interrupted state...
Thread.currentThread().interrupt();
}

retryCount++;
}
throw new AlgoliaRetriesExceededException(
"The maximum number of trials exceeded. (" +
(retryCount + 1) +
"/" +
maxTrial +
")"
);
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import type { CreateRetryablePromiseOptions } from './types/CreateRetryablePromise';

export const DEFAULT_MAX_TRIAL = 50;
export const DEFAULT_TIMEOUT = (retryCount: number): number =>
Math.min(retryCount * 200, 5000);

/**
* Return a promise that retry a task until it meets the condition.
*
Expand All @@ -12,8 +16,8 @@ import type { CreateRetryablePromiseOptions } from './types/CreateRetryablePromi
export function createRetryablePromise<TResponse>({
func,
validate,
maxTrial = 10,
timeout = (retryCount: number): number => Math.min(retryCount * 10, 1000),
maxTrial = DEFAULT_MAX_TRIAL,
timeout = DEFAULT_TIMEOUT,
}: CreateRetryablePromiseOptions<TResponse>): Promise<TResponse> {
let retryCount = 0;
const retry = (): Promise<TResponse> => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ public Map<String, Object> postProcessOperationsWithModels(
Utils.getClientNameKebabCase(results),
additionalProperties
);
additionalProperties.put(
"isSearchClient",
Utils.getClientNameKebabCase(results).equals("search")
);
additionalProperties.put(
"packageVersion",
Utils.getClientConfigField("java", "packageVersion")
Expand Down
23 changes: 23 additions & 0 deletions templates/java/libraries/okhttp-gson/api.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import com.algolia.exceptions.*;
import com.algolia.utils.retry.CallType;
import com.algolia.utils.retry.StatefulHost;
import com.algolia.utils.RequestOptions;
import java.util.function.IntUnaryOperator;

import java.util.EnumSet;
import java.util.Random;
Expand Down Expand Up @@ -216,5 +217,27 @@ public class {{classname}} extends ApiClient {
}
{{/optionalParams.0}}
{{/operation}}

{{#isSearchClient}}
public void waitForTask(String indexName, Long taskID, RequestOptions requestOptions, int maxTrial, IntUnaryOperator timeout) {
TaskUtils.retryUntil(() -> {
return this.getTaskAsync(indexName, taskID, requestOptions);
}, (GetTaskResponse task) -> {
return task.getStatus() == TaskStatus.PUBLISHED;
}, maxTrial, timeout);
}

public void waitForTask(String indexName, Long taskID, RequestOptions requestOptions) {
this.waitForTask(indexName, taskID, requestOptions, TaskUtils.DEFAULT_MAX_TRIAL, TaskUtils.DEFAULT_TIMEOUT);
}

public void waitForTask(String indexName, Long taskID, int maxTrial, IntUnaryOperator timeout) {
this.waitForTask(indexName, taskID, null, maxTrial, timeout);
}

public void waitForTask(String indexName, Long taskID) {
this.waitForTask(indexName, taskID, null, TaskUtils.DEFAULT_MAX_TRIAL, TaskUtils.DEFAULT_TIMEOUT);
}
{{/isSearchClient}}
}
{{/operations}}