fixed localfs and remotefs processors to check for timestamp equality…

… only with second precission
LIBCAS · Nov 4, 2024 · afd3e84 · afd3e84
1 parent aa3d486
commit afd3e84
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ data
 application.yml
 application.properties
 local-storage-folder/
+sample-storage-dir/
diff --git a/src/main/java/cz/cas/lib/arcstorage/storage/fs/LocalFsProcessor.java b/src/main/java/cz/cas/lib/arcstorage/storage/fs/LocalFsProcessor.java
@@ -19,6 +19,7 @@
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 import java.time.Instant;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -196,7 +197,7 @@ public void forgetObject(String objectIdAtStorage, String dataSpace, Instant for
                 Files.deleteIfExists(folder.resolve(objectIdAtStorage));
             } else {
                 if (objectMetadata != null) {
-                    if (objectMetadata.getCreated() != null && objectMetadata.getCreated().isAfter(forgetAuditTimestamp)) {
+                    if (objectMetadata.getCreated() != null && objectMetadata.getCreated().truncatedTo(ChronoUnit.MILLIS).isAfter(forgetAuditTimestamp.truncatedTo(ChronoUnit.MILLIS))) {
                         log.trace("skipping propagation of FORGET operation on {} as the forget operation was related to object which has been overridden by other", objectIdAtStorage);
                         return;
                     }
@@ -376,7 +377,7 @@ private ObjectConsistencyVerificationResultDto fillObjectStateInfo(ObjectConsist
         if (metadataAtStorage == null)
             throw new FileDoesNotExistException(metadataFilePath(folder, object.getStorageId()).toString(), storage);
         boolean stateMetadataConsistent = metadataAtStorage.getState() == object.getState();
-        boolean timestampMetadataConsistent = object.getCreated().equals(metadataAtStorage.getCreated());
+        boolean timestampMetadataConsistent = object.getCreated().getEpochSecond() == (metadataAtStorage.getCreated().getEpochSecond());
         boolean checksumMetadataConsistent = object.getChecksum().equals(metadataAtStorage.getChecksum());
         info.setMetadataConsistent(stateMetadataConsistent && checksumMetadataConsistent && timestampMetadataConsistent);
         if (object.getState().contentMustBeStoredAtLogicalStorage()) {

diff --git a/src/main/java/cz/cas/lib/arcstorage/storage/fs/RemoteFsProcessor.java b/src/main/java/cz/cas/lib/arcstorage/storage/fs/RemoteFsProcessor.java
@@ -347,7 +347,7 @@ private ObjectConsistencyVerificationResultDto fillObjectStateInfo(ObjectConsist
                 if (metadataAtStorage == null)
                     throw new FileDoesNotExistException(metadataFilePath(folder, object.getStorageId()), storage);
                 boolean stateMetadataConsistent = metadataAtStorage.getState() == object.getState();
-                boolean timestampMetadataConsistent = object.getCreated().equals(metadataAtStorage.getCreated());
+                boolean timestampMetadataConsistent = object.getCreated().getEpochSecond() == (metadataAtStorage.getCreated().getEpochSecond());
                 boolean checksumMetadataConsistent = object.getChecksum().equals(metadataAtStorage.getChecksum());
                 info.setMetadataConsistent(stateMetadataConsistent && checksumMetadataConsistent && timestampMetadataConsistent);
                 if (object.getState().contentMustBeStoredAtLogicalStorage()) {

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -16,7 +16,6 @@ spring:
     password: changeme
   jpa:
     show-sql: false
-    database-platform: org.hibernate.dialect.PostgreSQLDialect
     hibernate:
       ddl-auto: validate
       naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy