[jackrabbit-oak] branch trunk updated: OAK-9847 - Offline compaction cleanup failures for migrated AzureSegmentStores with missing graph files (#632)

[ad...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

adulceanu pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 7273f7a790 OAK-9847 - Offline compaction cleanup failures for migrated AzureSegmentStores with missing graph files (#632)
7273f7a790 is described below

commit 7273f7a7902e699b42eaed174654ae95afb578bd
Author: Andrei Dulceanu <du...@users.noreply.github.com>
AuthorDate: Tue Jul 19 18:08:03 2022 +0300

    OAK-9847 - Offline compaction cleanup failures for migrated AzureSegmentStores with missing graph files (#632)
---
 .../org/apache/jackrabbit/oak/segment/file/DefaultCleanupStrategy.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/DefaultCleanupStrategy.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/DefaultCleanupStrategy.java
index 527bd694da..92d0dbea4c 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/DefaultCleanupStrategy.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/DefaultCleanupStrategy.java
@@ -103,7 +103,8 @@ class DefaultCleanupStrategy implements CleanupStrategy {
 
             @Override
             public boolean shouldReclaim(UUID id, GCGeneration generation, boolean referenced) {
-                return isUnreferencedBulkSegment(id, referenced) || isOldDataSegment(id, generation);
+                return isUnreferencedBulkSegment(id, referenced) || isOldDataSegment(id, generation)
+                        || generation.getFullGeneration() > getGcGeneration(context).getFullGeneration();
             }
 
             @Override