Skip to content

Fix polling of async v3 jobs and make getLastOperation method public #1171

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
mheath merged 2 commits into from
Jan 25, 2023
Merged

Fix polling of async v3 jobs and make getLastOperation method public #1171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff44560
Make getLastOperation method public
theghost5800 Nov 11, 2022
83eca88
Fix waitForCompletion polling
theghost5800 Nov 11, 2022
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
2 changes: 1 addition & 1 deletion ...undry-client/src/main/java/org/cloudfoundry/client/v3/servicebindings/ServiceBinding.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public abstract class ServiceBinding extends Resource {
*/
@JsonProperty("last_operation")
@Nullable
abstract LastOperation getLastOperation();
public abstract LastOperation getLastOperation();

/**
* The relationships
Expand Down
6 changes: 5 additions & 1 deletion cloudfoundry-util/src/main/java/org/cloudfoundry/util/JobUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
import reactor.core.publisher.Mono;

import java.time.Duration;
import java.util.EnumSet;
import java.util.List;
import java.util.Set;

import static org.cloudfoundry.util.DelayUtils.exponentialBackOff;

Expand All @@ -39,6 +41,8 @@
*/
public final class JobUtils {

private static final Set<JobState> FINAL_STATES = EnumSet.of(JobState.COMPLETE, JobState.FAILED);

private static final Integer STATUS_OK = 200;

private JobUtils() {
Expand Down Expand Up @@ -92,7 +96,7 @@ public static Mono<Void> waitForCompletion(CloudFoundryClient cloudFoundryClient
*/
public static Mono<Void> waitForCompletion(CloudFoundryClient cloudFoundryClient, Duration completionTimeout, String jobId) {
return requestJobV3(cloudFoundryClient, jobId)
.filter(job -> JobState.PROCESSING != job.getState())
.filter(job -> FINAL_STATES.contains(job.getState()))
.repeatWhenEmpty(exponentialBackOff(Duration.ofSeconds(1), Duration.ofSeconds(15), completionTimeout))
.filter(job -> JobState.FAILED == job.getState())
.flatMap(JobUtils::getError);
Expand Down