driver: shortcut zero-byte files

dCache · Feb 19, 2024 · 3d99040 · 3d99040
1 parent d9dea09
commit 3d99040
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/src/main/java/org/dcache/nearline/cta/CtaNearlineStorage.java b/src/main/java/org/dcache/nearline/cta/CtaNearlineStorage.java
@@ -426,6 +426,13 @@ public void onCompleted() {
     public void remove(Iterable<RemoveRequest> requests) {
 
         for (var r : requests) {
+
+            // short-circuit zero-byte files
+            if (r.getUri().getQuery().contains("archiveid=*")) {
+                r.completed(null);
+                continue;
+            }
+
             var deleteRequest = ctaRequestFactory.valueOf(r);
             cta.withDeadline(getRequestDeadline()).delete(deleteRequest, new StreamObserver<>() {
                 @Override

diff --git a/src/test/java/org/dcache/nearline/cta/CtaNearlineStorageTest.java b/src/test/java/org/dcache/nearline/cta/CtaNearlineStorageTest.java
@@ -15,6 +15,7 @@
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -358,6 +359,25 @@ public void testSuccessOnRemove() {
         verify(request).completed(any());
     }
 
+    @Test
+    public void testRemoveZeroByteFiles() {
+
+        var request = mockedRemoveRequest();
+        when(request.getUri()).thenReturn(
+                URI.create("cta://cta/0000C9B4E3768770452E8B1B8E0232584872?archiveid=*"));
+
+        driver = new CtaNearlineStorage("foo", "bar");
+        driver.configure(drvConfig);
+        driver.start();
+
+        driver.remove(Set.of(request));
+        waitToComplete();
+
+        verify(request).completed(any());
+        // ensure that shortcut is used
+        verify(cta.ctaSvc(), never()).delete(any(), any());
+    }
+
     @Test
     public void testRemoveRequestOnRpcError() {
 

diff --git a/src/test/java/org/dcache/nearline/cta/DummyCta.java b/src/test/java/org/dcache/nearline/cta/DummyCta.java
@@ -1,5 +1,6 @@
 package org.dcache.nearline.cta;
 
+import static org.mockito.Mockito.spy;
 import ch.cern.cta.rpc.ArchiveResponse;
 import ch.cern.cta.rpc.CreateResponse;
 import ch.cern.cta.rpc.CtaRpcGrpc;
@@ -29,7 +30,12 @@ public class DummyCta {
 
     private volatile boolean drop;
 
+    private final CtaRpcGrpc.CtaRpcImplBase ctaSvc;
+
     public DummyCta(File cert, File key) throws Exception {
+
+        ctaSvc = spy(new CtaSvc());
+
         server = NettyServerBuilder.forPort(0)
               .sslContext(GrpcSslContexts.forServer(cert, key)
                     .clientAuth(ClientAuth.NONE)
@@ -39,7 +45,7 @@ public DummyCta(File cert, File key) throws Exception {
               .bossEventLoopGroup( new NioEventLoopGroup(2, new ThreadFactoryBuilder().setNameFormat("dummy-cta-server-accept-%d").build()))
               .workerEventLoopGroup(new NioEventLoopGroup(2, new ThreadFactoryBuilder().setNameFormat("dummy-cta-server-worker-%d").build()))
               .channelType(NioServerSocketChannel.class)
-              .addService(new CtaSvc())
+              .addService(ctaSvc)
               .directExecutor()
               .build();
     }
@@ -55,6 +61,10 @@ public void shutdown() throws InterruptedException {
         }
     }
 
+    public CtaRpcGrpc.CtaRpcImplBase ctaSvc() {
+        return ctaSvc;
+    }
+
     public String getConnectString() {
         return "localhost:" + server.getPort();
     }