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.

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

OAK-11284: Greedy Reuse of cluster IDs may lead to synchronous LastRe… #1877

Draft
wants to merge 7 commits into
base: trunk
Choose a base branch
from
Draft

OAK-11284: Greedy Reuse of cluster IDs may lead to synchronous LastRe… #1877

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e933f78
OAK-11284: Greedy Reuse of cluster IDs may lead to synchronous LastRe…
mbaedke Nov 26, 2024
5c7221d
OAK-11284: Greedy Reuse of cluster IDs may lead to synchronous LastRe…
mbaedke Nov 27, 2024
7173796
Fixed typo
mbaedke Nov 27, 2024
91846e9
Added logging
mbaedke Nov 27, 2024
f4ad0f6
OAK-11284: Greedy Reuse of cluster IDs may lead to synchronous LastRe…
mbaedke Dec 3, 2024
2fa74ac
Removed unused import.
mbaedke Dec 3, 2024
71453fc
Fixed default handling of the system property oak.documentMK.syncReco…
mbaedke Dec 5, 2024
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
10 changes: 10 additions & 0 deletions ...cument/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@
import static org.apache.jackrabbit.oak.plugins.document.util.Utils.isCommitted;
import static org.apache.jackrabbit.oak.plugins.document.util.Utils.resolveCommitRevision;

import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
Expand All @@ -45,6 +47,7 @@
import org.apache.jackrabbit.guava.common.collect.Sets;

import org.apache.jackrabbit.oak.commons.TimeDurationFormatter;
import org.apache.jackrabbit.oak.commons.properties.SystemPropertySupplier;
import org.apache.jackrabbit.oak.plugins.document.bundlor.DocumentBundlor;
import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats;
import org.apache.jackrabbit.oak.plugins.document.util.MapFactory;
Expand Down Expand Up @@ -79,6 +82,8 @@ public class LastRevRecoveryAgent {

private final Consumer<Integer> afterRecovery;

private static final SystemPropertySupplier<Long> SYNC_RECOVERY_TIMEOUT_MILLIS = SystemPropertySupplier.create("oak.syncRecoveryTimeoutMillis", Long.MAX_VALUE);

private static final long LOGINTERVALMS = TimeUnit.MINUTES.toMillis(1);

// OAK-9535 : create (flush) a pseudo branch commit journal entry as soon as
Expand Down Expand Up @@ -268,6 +273,11 @@ public int recover(final Iterable<NodeDocument> suspects,
if (nodeInfo != null && nodeInfo.isActive()) {
deadline = nodeInfo.getLeaseEndTime() - ClusterNodeInfo.DEFAULT_LEASE_FAILURE_MARGIN_MILLIS;
}
long now = System.currentTimeMillis();
if (Long.MAX_VALUE - SYNC_RECOVERY_TIMEOUT_MILLIS.get() > now) {
deadline = Math.min(deadline, now + SYNC_RECOVERY_TIMEOUT_MILLIS.get());
log.info("Adjusted deadline for synchronous recovery. New deadline is {}", SimpleDateFormat.getDateTimeInstance().format(new Date(deadline)));
}
mbaedke marked this conversation as resolved.
Show resolved Hide resolved
}

NodeDocument rootDoc = Utils.getRootDocument(store);
Expand Down