diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml index 4dd09e48..973b1635 100644 --- a/.github/workflows/server.yml +++ b/.github/workflows/server.yml @@ -35,9 +35,12 @@ jobs: distribution: "zulu" cache: maven - - name: Build and test with Maven + - name: Test with Maven run: cd dhfs-parent && mvn --batch-mode --update-snapshots package verify + - name: Build with Maven + run: cd dhfs-parent && mvn --batch-mode --update-snapshots package -Dquarkus.log.category.\"com.usatiuk.dhfs\".min-level=DEBUG + - uses: actions/upload-artifact@v3 with: name: DHFS Server Package diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java index 25b3c646..df4d3686 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java @@ -149,7 +149,7 @@ public class DhfsFileServiceImpl implements DhfsFileService { String fname = Path.of(name).getFileName().toString(); var fuuid = UUID.randomUUID(); - Log.trace("Creating file " + fuuid); + Log.debug("Creating file " + fuuid); File f = new File(fuuid, mode, UUID.fromString(parent.getName()), false); if (!parent.runWriteLocked(JObject.ResolutionStrategy.REMOTE, (m, d, bump, invalidate) -> { @@ -181,7 +181,7 @@ public class DhfsFileServiceImpl implements DhfsFileService { String dname = Path.of(name).getFileName().toString(); var duuid = UUID.randomUUID(); - Log.trace("Creating dir " + duuid); + Log.debug("Creating dir " + duuid); Directory ndir = new Directory(duuid, mode); //FIXME: if (!found.runWriteLocked(JObject.ResolutionStrategy.REMOTE, (m, d, bump, invalidate) -> { @@ -799,7 +799,7 @@ public class DhfsFileServiceImpl implements DhfsFileService { String fname = Path.of(newpath).getFileName().toString(); var fuuid = UUID.randomUUID(); - Log.trace("Creating file " + fuuid); + Log.debug("Creating file " + fuuid); File f = new File(fuuid, 0, UUID.fromString(parent.getName()), true); ChunkData newChunkData = createChunk(UnsafeByteOperations.unsafeWrap(oldpath.getBytes(StandardCharsets.UTF_8))); diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectRefProcessor.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectRefProcessor.java index dc6b5291..03d3ad9b 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectRefProcessor.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectRefProcessor.java @@ -96,7 +96,7 @@ public class JObjectRefProcessor { } if (ok != missing.size()) { - Log.trace("Delaying deletion check of " + obj.getName()); + Log.debug("Delaying deletion check of " + obj.getName()); delay = true; } @@ -167,7 +167,7 @@ public class JObjectRefProcessor { got.tryResolve(JObject.ResolutionStrategy.LOCAL_ONLY); - Log.trace("Deleting " + m.getName()); + Log.debug("Deleting " + m.getName()); m.markDeleted(); Collection extracted = null; diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectResolver.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectResolver.java index 2449bea8..c765243d 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectResolver.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectResolver.java @@ -175,7 +175,7 @@ public class JObjectResolver { public void removeLocal(JObject jObject, String name) { jObject.assertRWLock(); try { - Log.trace("Invalidating " + name); + Log.debug("Invalidating " + name); jObject.getMeta().getHaveLocalCopy().set(false); jObjectWriteback.remove(jObject); objectPersistentStore.deleteObjectData(name); diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectWriteback.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectWriteback.java index e226beec..412a4239 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectWriteback.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/jrepository/JObjectWriteback.java @@ -161,7 +161,7 @@ public class JObjectWriteback { if (!m.isDeletionCandidate()) throw new IllegalStateException("Object deleted but not deletable! " + m.getName()); // FIXME: assert Rw lock here? - Log.trace("Deleting from persistent storage " + m.getName()); + Log.debug("Deleting from persistent storage " + m.getName()); objectPersistentStore.deleteObject(m.getName()); return; } diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteHostManager.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteHostManager.java index c76fd843..0c4e2cc3 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteHostManager.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RemoteHostManager.java @@ -63,7 +63,7 @@ public class RemoteHostManager { .>map(host -> () -> { try { if (isReachable(host)) - Log.trace("Heartbeat: " + host); + Log.debug("Heartbeat: " + host); else Log.info("Trying to connect to " + host); if (pingCheck(host)) @@ -206,7 +206,7 @@ public class RemoteHostManager { var prev = _seenHostsButNotAdded.put(host, state); // Needed for tests if (prev == null) - Log.trace("Ignoring new address from unknown host " + ": addr=" + addr + " port=" + port); + Log.debug("Ignoring new address from unknown host " + ": addr=" + addr + " port=" + port); return; } else { _seenHostsButNotAdded.remove(host); diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RpcClientFactory.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RpcClientFactory.java index cc2f0edf..8b8f9e12 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RpcClientFactory.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/RpcClientFactory.java @@ -37,7 +37,7 @@ public class RpcClientFactory { return withObjSyncClient(target, fn); } catch (StatusRuntimeException e) { if (e.getStatus().getCode().equals(Status.UNAVAILABLE.getCode())) - Log.trace("Host " + target + " is unreachable: " + e.getMessage()); + Log.debug("Host " + target + " is unreachable: " + e.getMessage()); else Log.warn("When calling " + target + " " + e.getMessage()); } catch (Exception e) { diff --git a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/persistence/FileObjectPersistentStore.java b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/persistence/FileObjectPersistentStore.java index 36f6137e..cc564f7d 100644 --- a/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/persistence/FileObjectPersistentStore.java +++ b/dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/persistence/FileObjectPersistentStore.java @@ -107,9 +107,9 @@ public class FileObjectPersistentStore implements ObjectPersistentStore { } private T readObjectImpl(T defaultInstance, Path path) { - try (var fsb = new FileInputStream(path.toFile()); - var fs = new BufferedInputStream(fsb, 131072)) { - return (T) defaultInstance.getParserForType().parseFrom(fs); + try (var fsb = new FileInputStream(path.toFile())) { + var file = fsb.readAllBytes(); + return (T) defaultInstance.getParserForType().parseFrom(file); } catch (FileNotFoundException | NoSuchFileException fx) { throw new StatusRuntimeExceptionNoStacktrace(Status.NOT_FOUND); } catch (IOException e) { @@ -132,9 +132,8 @@ public class FileObjectPersistentStore implements ObjectPersistentStore { private void writeObjectImpl(Path path, Message data) { try { - try (var fsb = new FileOutputStream(path.toFile(), false); - var fs = new BufferedOutputStream(fsb, 131072)) { - data.writeTo(fs); + try (var fsb = new FileOutputStream(path.toFile(), false)) { + fsb.write(data.toByteArray()); } } catch (IOException e) { Log.error("Error writing file " + path, e);