svn commit: r1862381 - /jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java

[amitj]

Author: amitj
Date: Mon Jul  1 14:02:51 2019
New Revision: 1862381

URL: http://svn.apache.org/viewvc?rev=1862381&view=rev
Log:
OAK-8447: Handle all available references in the DataStore when doing 
consistency check

- Fixed check for SharedDataStore

Modified:
    
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java

Modified: 
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java?rev=1862381&r1=1862380&r2=1862381&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
 Mon Jul  1 14:02:51 2019
@@ -687,10 +687,10 @@ public class MarkSweepGarbageCollector i
                 throw e;
             }
 
-            // Retrieve all other marked present in the datastore
-            if (blobStore instanceof SharedDataStore) {
-                List<DataRecord> refFiles = ((SharedDataStore) blobStore)
-                        
.getAllMetadataRecords(SharedStoreRecordType.REFERENCES.getType());
+            if (SharedDataStoreUtils.isShared(blobStore)) {
+                // Retrieve all other marked present in the datastore
+                List<DataRecord> refFiles =
+                    ((SharedDataStore) 
blobStore).getAllMetadataRecords(SharedStoreRecordType.REFERENCES.getType());
                 if (refFiles.size() > 0) {
                     File temp = new File(root, repoId + 
UUID.randomUUID().toString());
                     copyFile(fs.getMarkedRefs(), temp);