stefan-egli commented on code in PR #993:
URL: https://github.com/apache/jackrabbit-oak/pull/993#discussion_r1285742323
##########
oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCRecommendations.java:
##########
@@ -209,28 +249,76 @@ public void evaluate(VersionGCStats stats) {
}
stats.needRepeat = !scopeIsComplete;
}
+
+ // save data for detailed GC
+ if (detailedGCEnabled && !stats.canceled &&
!stats.ignoredDetailedGCDueToCheckPoint) {
+ // success, we would not expect to encounter revisions older than
this in the future
+ setLongSetting(SETTINGS_COLLECTION_DETAILED_GC_TIMESTAMP_PROP,
stats.oldestModifiedDocTimeStamp);
+ setStringSetting(SETTINGS_COLLECTION_DETAILED_GC_DOCUMENT_ID_PROP,
stats.oldestModifiedDocId);
+ }
}
- private Map<String, Long> getLongSettings() {
- Document versionGCDoc =
vgc.getDocumentStore().find(Collection.SETTINGS,
VersionGarbageCollector.SETTINGS_COLLECTION_ID, 0);
- Map<String, Long> settings = Maps.newHashMap();
+ private Map<String, Object> getVGCSettings() {
+ Document versionGCDoc =
vgc.getDocumentStore().find(Collection.SETTINGS, SETTINGS_COLLECTION_ID, 0);
+ Map<String, Object> settings = new HashMap<>();
// default values
-
settings.put(VersionGarbageCollector.SETTINGS_COLLECTION_OLDEST_TIMESTAMP_PROP,
0L);
-
settings.put(VersionGarbageCollector.SETTINGS_COLLECTION_REC_INTERVAL_PROP, 0L);
+ settings.put(SETTINGS_COLLECTION_OLDEST_TIMESTAMP_PROP, 0L);
+ settings.put(SETTINGS_COLLECTION_REC_INTERVAL_PROP, 0L);
+ settings.put(SETTINGS_COLLECTION_DETAILED_GC_TIMESTAMP_PROP, 0L);
+ settings.put(SETTINGS_COLLECTION_DETAILED_GC_DOCUMENT_ID_PROP,
MIN_ID_VALUE);
if (versionGCDoc != null) {
for (String k : versionGCDoc.keySet()) {
Object value = versionGCDoc.get(k);
if (value instanceof Number) {
settings.put(k, ((Number) value).longValue());
}
+ if (value instanceof String) {
+ settings.put(k, value);
+ }
}
}
return settings;
}
private void setLongSetting(String propName, long val) {
- UpdateOp updateOp = new
UpdateOp(VersionGarbageCollector.SETTINGS_COLLECTION_ID, true);
+ setLongSetting(of(propName, val));
+ }
+
+ private void setStringSetting(String propName, String val) {
+ UpdateOp updateOp = new UpdateOp(SETTINGS_COLLECTION_ID, true);
updateOp.set(propName, val);
vgc.getDocumentStore().createOrUpdate(Collection.SETTINGS, updateOp);
}
+
+ private void setLongSetting(final Map<String, Long> propValMap) {
+ UpdateOp updateOp = new UpdateOp(SETTINGS_COLLECTION_ID, true);
+ propValMap.forEach(updateOp::set);
+ vgc.getDocumentStore().createOrUpdate(Collection.SETTINGS, updateOp);
+ }
+
+ @NotNull
+ private static GCResult getResult(final VersionGCOptions options, final
Revision checkpoint, TimeInterval gcScope) {
+ boolean ignoreGC = false;
+ if (checkpoint != null &&
gcScope.endsAfter(checkpoint.getTimestamp())) {
+ TimeInterval minimalScope =
gcScope.startAndDuration(options.precisionMs);
+ if (minimalScope.endsAfter(checkpoint.getTimestamp())) {
+ log.warn("Ignoring GC run because a valid checkpoint [{}]
exists inside minimal scope {}.", checkpoint.toReadableString(), minimalScope);
+ ignoreGC = true;
+ } else {
+ gcScope = gcScope.notLaterThan(checkpoint.getTimestamp() - 1);
+ log.info("checkpoint at [{}] found, detailedGCScope now {}",
timestampToString(checkpoint.getTimestamp()), gcScope);
Review Comment:
I suspect this log.info could become noisy in case of having an old
checkpoint. Could it be log.debug?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
