Fix processing path

3 files changed, 9 insertions, 13 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java
index 1cdf97960ff..eb48086eb0f 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandler.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
  */
 public class CoredumpHandler {
 
-    static final String PROCESSING_DIRECTORY_NAME = "processing";
+    private static final String PROCESSING_DIRECTORY_NAME = "processing";
     static final String METADATA_FILE_NAME = "metadata.json";
 
     private final Logger logger = Logger.getLogger(CoredumpHandler.class.getName());
@@ -87,7 +87,8 @@ public class CoredumpHandler {
                 });
     }
 
-    void processAndReportCoredumps(Path processingCoredumpsPath, Map<String, Object> nodeAttributes) {
+    void processAndReportCoredumps(Path coredumpsPath, Map<String, Object> nodeAttributes) {
+        Path processingCoredumpsPath = getProcessingCoredumpsPath(coredumpsPath);
         doneCoredumpsPath.toFile().mkdirs();
 
         FileHelper.listContentsOfDirectory(processingCoredumpsPath).stream()
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java
index 8920f4a506a..ca75a74cfcd 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoreCollectorTest.java
@@ -181,9 +181,7 @@ public class CoreCollectorTest {
         final String documentId = "UIDD-ABCD-EFGH";
         final String coreDumpFilename = "core.dump";
 
-        Path coredumpPath = folder.newFolder("crash").toPath()
-                .resolve(CoredumpHandler.PROCESSING_DIRECTORY_NAME)
-                .resolve(documentId);
+        Path coredumpPath = folder.newFolder("crash").toPath().resolve(documentId);
         coredumpPath.toFile().mkdirs();
         coredumpPath.resolve(coreDumpFilename).toFile().createNewFile();
 
@@ -205,9 +203,7 @@ public class CoreCollectorTest {
         final String documentId = "UIDD-ABCD-EFGH";
         final String coreDumpFilename = "core.dump";
 
-        Path coredumpPath = folder.newFolder("crash").toPath()
-                .resolve(CoredumpHandler.PROCESSING_DIRECTORY_NAME)
-                .resolve(documentId);
+        Path coredumpPath = folder.newFolder("crash").toPath().resolve(documentId);
         coredumpPath.toFile().mkdirs();
 
         Set<Path> expectedContentsOfCoredump = new HashSet<>(Arrays.asList(
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java
index d61c1e4b815..8522112b0af 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/coredump/CoredumpHandlerTest.java
@@ -157,11 +157,11 @@ public class CoredumpHandlerTest {
         final String documentId = "UIDD-ABCD-EFGH";
         createProcessedCoredump(documentId);
 
-        coredumpHandler.processAndReportCoredumps(crashPath.resolve(CoredumpHandler.PROCESSING_DIRECTORY_NAME), attributes);
+        coredumpHandler.processAndReportCoredumps(crashPath, attributes);
         verify(coredumpReporter).reportCoredump(eq(documentId), eq(expectedMetadataFileContents));
 
         // The coredump should not have been moved out of 'processing' and into 'done' as the report failed
-        assertFolderContents(crashPath.resolve(CoredumpHandler.PROCESSING_DIRECTORY_NAME));
+        assertFolderContents(processingPath);
         assertFolderContents(donePath.resolve(documentId), CoredumpHandler.METADATA_FILE_NAME);
     }
 
@@ -171,7 +171,7 @@ public class CoredumpHandlerTest {
         Path metadataPath = createProcessedCoredump(documentId);
 
         doThrow(new RuntimeException()).when(coredumpReporter).reportCoredump(any(), any());
-        coredumpHandler.processAndReportCoredumps(crashPath.resolve(CoredumpHandler.PROCESSING_DIRECTORY_NAME), attributes);
+        coredumpHandler.processAndReportCoredumps(crashPath, attributes);
         verify(coredumpReporter).reportCoredump(eq(documentId), eq(expectedMetadataFileContents));
 
         // The coredump should not have been moved out of 'processing' and into 'done' as the report failed
@@ -195,8 +195,7 @@ public class CoredumpHandlerTest {
     }
 
     private Path createProcessedCoredump(String documentId) throws IOException {
-        Path coredumpPath = crashPath
-                .resolve(CoredumpHandler.PROCESSING_DIRECTORY_NAME)
+        Path coredumpPath = processingPath
                 .resolve(documentId)
                 .resolve(CoredumpHandler.METADATA_FILE_NAME);
         coredumpPath.getParent().toFile().mkdirs();