Skip to content

OAK-12067: Utils.alignWithExternalRevisions logs timestamps with second resolution (in 1.22) #2804

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
reschke merged 1 commit into from
Apr 13, 2026
Merged

OAK-12067: Utils.alignWithExternalRevisions logs timestamps with second resolution (in 1.22) #2804

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
17 changes: 15 additions & 2 deletions oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.sql.Timestamp;
import java.time.Instant;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -1046,7 +1047,9 @@ public static void alignWithExternalRevisions(@NotNull NodeDocument rootDoc,
LOG.warn("Detected clock differences. Local time is '{}', " +
"while most recent external time is '{}'. " +
"Current _lastRev entries: {}",
new Date(localTime), new Date(externalTime), lastRevMap.values());
asISO8601(localTime),
asISO8601(externalTime),
lastRevMap.values());
double delay = ((double) externalTime - localTime) / 1000d;
String fmt = "Background read will be delayed by %.1f seconds. " +
"Please check system time on cluster nodes.";
Expand Down Expand Up @@ -1134,4 +1137,14 @@ public static void checkRevisionAge(DocumentStore store,
throw new DocumentStoreException(msg);
}
}

/**
* Formats the epoch time in milliseconds as ISO-8601 in UTC.
*
* @param ms the time in milliseconds.
* @return date format for the time in milliseconds.
*/
public static String asISO8601(long ms) {
return DateTimeFormatter.ISO_INSTANT.format(Instant.ofEpochMilli(ms));
}
}
Loading