svn commit: r1868854 - in /jackrabbit/oak/trunk/oak-segment-azure/src: main/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManager.java test/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManagerTest.java

[to...@apache.org]

Author: tomekr
Date: Thu Oct 24 08:26:44 2019
New Revision: 1868854

URL: http://svn.apache.org/viewvc?rev=1868854&view=rev
Log:
OAK-8715: AzureArchiveManager#exists() lists all blobs in archive

Modified:
    jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManager.java
    jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManagerTest.java

Modified: jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManager.java?rev=1868854&r1=1868853&r2=1868854&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManager.java (original)
+++ jackrabbit/oak/trunk/oak-segment-azure/src/main/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManager.java Thu Oct 24 08:26:44 2019
@@ -180,8 +180,8 @@ public class AzureArchiveManager impleme
     @Override
     public boolean exists(String archiveName) {
         try {
-            return !getBlobs(archiveName).isEmpty();
-        } catch (IOException e) {
+            return getDirectory(archiveName).listBlobsSegmented(null, false, null, 1, null, null, null).getLength() > 0;
+        } catch (IOException | StorageException | URISyntaxException e) {
             log.error("Can't check the existence of {}", archiveName, e);
             return false;
         }

Modified: jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManagerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManagerTest.java?rev=1868854&r1=1868853&r2=1868854&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManagerTest.java (original)
+++ jackrabbit/oak/trunk/oak-segment-azure/src/test/java/org/apache/jackrabbit/oak/segment/azure/AzureArchiveManagerTest.java Thu Oct 24 08:26:44 2019
@@ -34,6 +34,7 @@ import org.apache.jackrabbit.oak.segment
 import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
 import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -133,4 +134,36 @@ public class AzureArchiveManagerTest {
         assertEquals("bar", segmentNodeStore.getRoot().getString("foo"));
         fs.close();
     }
+
+    @Test
+    public void testExists() throws IOException, URISyntaxException {
+        SegmentArchiveManager manager = new AzurePersistence(container.getDirectoryReference("oak")).createArchiveManager(false, false, new IOMonitorAdapter(), new FileStoreMonitorAdapter(), new RemoteStoreMonitorAdapter());
+        SegmentArchiveWriter writer = manager.create("data00000a.tar");
+
+        List<UUID> uuids = new ArrayList<>();
+        for (int i = 0; i < 10; i++) {
+            UUID u = UUID.randomUUID();
+            writer.writeSegment(u.getMostSignificantBits(), u.getLeastSignificantBits(), new byte[10], 0, 10, 0, 0, false);
+            uuids.add(u);
+        }
+
+        writer.flush();
+        writer.close();
+
+        Assert.assertTrue(manager.exists("data00000a.tar"));
+        Assert.assertFalse(manager.exists("data00001a.tar"));
+    }
+
+    @Test
+    public void testArchiveExistsAfterFlush() throws URISyntaxException, IOException {
+        SegmentArchiveManager manager = new AzurePersistence(container.getDirectoryReference("oak")).createArchiveManager(false, false, new IOMonitorAdapter(), new FileStoreMonitorAdapter(), new RemoteStoreMonitorAdapter());
+        SegmentArchiveWriter writer = manager.create("data00000a.tar");
+
+        Assert.assertFalse(manager.exists("data00000a.tar"));
+        UUID u = UUID.randomUUID();
+        writer.writeSegment(u.getMostSignificantBits(), u.getLeastSignificantBits(), new byte[10], 0, 10, 0, 0, false);
+        Assert.assertFalse(manager.exists("data00000a.tar"));
+        writer.flush();
+        Assert.assertTrue(manager.exists("data00000a.tar"));
+    }
 }