From 98f3382ceab91c9f81b9578a7f7b7aca5e41897c Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Wed, 31 Jan 2024 11:53:41 +0100 Subject: [PATCH] (minor) Fix test and improve error message --- .../main/java/nu/marginalia/storage/FileStorageService.java | 3 +++ .../java/nu/marginalia/storage/FileStorageServiceTest.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/code/common/config/src/main/java/nu/marginalia/storage/FileStorageService.java b/code/common/config/src/main/java/nu/marginalia/storage/FileStorageService.java index b2162664..5fbb2fba 100644 --- a/code/common/config/src/main/java/nu/marginalia/storage/FileStorageService.java +++ b/code/common/config/src/main/java/nu/marginalia/storage/FileStorageService.java @@ -230,6 +230,9 @@ public class FileStorageService { { var base = getStorageBase(FileStorageBaseType.forFileStorageType(type)); + if (null == base) + throw new IllegalStateException("No storage base for type " + type + " on node " + node); + Path newDir = allocateDirectory(base.asPath(), prefix); String relDir = base.asPath().relativize(newDir).normalize().toString(); diff --git a/code/common/config/src/test/java/nu/marginalia/storage/FileStorageServiceTest.java b/code/common/config/src/test/java/nu/marginalia/storage/FileStorageServiceTest.java index c9ffa309..c7fefc94 100644 --- a/code/common/config/src/test/java/nu/marginalia/storage/FileStorageServiceTest.java +++ b/code/common/config/src/test/java/nu/marginalia/storage/FileStorageServiceTest.java @@ -118,6 +118,10 @@ public class FileStorageServiceTest { public void testAllocateTemp() throws IOException, SQLException { String name = "test-" + UUID.randomUUID(); + // ensure a base exists + var base = fileStorageService.createStorageBase(name, createTempDir(), FileStorageBaseType.STORAGE); + tempDirs.add(base.asPath()); + var storage = new FileStorageService(dataSource, 0); var fileStorage = storage.allocateStorage(FileStorageType.CRAWL_DATA, "xyz", "thisShouldSucceed");