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

Always recheck in-progress checks #957

Closed
wants to merge 1 commit into from
Closed
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
45 changes: 18 additions & 27 deletions bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckWorkItem.java
Original file line number Diff line number Diff line change
Expand Up @@ -109,37 +109,28 @@ private boolean currentCheckValid(CensusInstance censusInstance, List<Comment> c

if (currentChecks.containsKey("jcheck")) {
var check = currentChecks.get("jcheck");
// Check if the currently running check seems stale - perhaps the checker failed to complete
if (check.completedAt().isEmpty()) {
var runningTime = Duration.between(check.startedAt().toInstant(), Instant.now());
if (runningTime.toMinutes() > 10) {
log.warning("Previous jcheck running for more than 10 minutes - checking again");
if (check.completedAt().isPresent() && check.metadata().isPresent()) {
var previousMetadata = check.metadata().get();
if (previousMetadata.contains(":")) {
var splitIndex = previousMetadata.lastIndexOf(":");
var stableMetadata = previousMetadata.substring(0, splitIndex);
var expiresAt = Instant.ofEpochSecond(Long.parseLong(previousMetadata.substring(splitIndex + 1)));
if (stableMetadata.equals(metadata) && expiresAt.isAfter(Instant.now())) {
log.finer("Metadata with expiration time is still valid, not checking again");
return true;
} else {
log.finer("Metadata expiration time has expired - checking again");
}
} else {
log.finer("Jcheck in progress for " + runningTime.toMinutes() + " minutes, not starting another one");
return true;
}
} else {
if (check.metadata().isPresent()) {
var previousMetadata = check.metadata().get();
if (previousMetadata.contains(":")) {
var splitIndex = previousMetadata.lastIndexOf(":");
var stableMetadata = previousMetadata.substring(0, splitIndex);
var expiresAt = Instant.ofEpochSecond(Long.parseLong(previousMetadata.substring(splitIndex + 1)));
if (stableMetadata.equals(metadata) && expiresAt.isAfter(Instant.now())) {
log.finer("Metadata with expiration time is still valid, not checking again");
return true;
}
if (previousMetadata.equals(metadata)) {
log.fine("No activity since last check, not checking again.");
return true;
} else {
if (previousMetadata.equals(metadata)) {
log.finer("No activity since last check, not checking again");
return true;
}
log.fine("Previous metadata: " + check.metadata().get() + " - current: " + metadata);
}
}
log.info("PR updated after last check, checking again");
if (check.metadata().isPresent() && (!check.metadata().get().equals(metadata))) {
log.fine("Previous metadata: " + check.metadata().get() + " - current: " + metadata);
}
} else {
log.info("Check in progress was never finished - checking again");
}
}

Expand Down