OAK-4548 SegmentDataStoreBlobGCIT failures

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1751871 13f79535-47bb-0310-9956-ffa450edef68
russelyang · Jul 8, 2016 · 5e85594 · 5e85594
1 parent 09002e1
commit 5e85594
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java b/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentTracker.java
@@ -302,7 +302,15 @@ public void collectBlobReferences(ReferenceCollector collector) {
                 UUID uid = queue.remove();
                 SegmentId id = getSegmentId(uid.getMostSignificantBits(),
                         uid.getLeastSignificantBits());
-                Segment segment = id.getSegment();
+                Segment segment = null;
+                try {
+                    segment = id.getSegment();
+                } catch (SegmentNotFoundException ex) {
+                    // gc'ed
+                }
+                if (segment == null) {
+                    continue;
+                }
                 segment.collectBlobReferences(collector);
                 for (SegmentId refid : segment.getReferencedIds()) {
                     UUID rid = refid.asUUID();