stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-28 20:47:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-06-16 15:27:11 +02:00
parent 0127d2148e
commit 804dbcbdef
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/DistributedObjectRepository.java
View File

@@ -60,10 +60,10 @@ public class DistributedObjectRepository implements ObjectRepository {
var info = infoOpt.get();
return info.runReadLocked(() -> {
if (objectPersistentStore.existsObject(namespace, name).await().indefinitely())
return objectPersistentStore.readObject(namespace, name).await().indefinitely();
if (objectPersistentStore.existsObject(namespace, name).await().indefinitely())
return objectPersistentStore.readObject(namespace, name).await().indefinitely();
return info.runWriteLocked(() -> {
return remoteObjectServiceClient.getObject(namespace, name).map(got -> {
objectPersistentStore.writeObject(namespace, got);
return got;

4
server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/ObjectIndex.java
View File

@@ -29,13 +29,13 @@ public class ObjectIndex implements Serializable {
}
public <R> R runWriteLocked(Callable<R> fn) {
_lock.readLock().lock();
_lock.writeLock().lock();
try {
return fn.call();
} catch (Exception e) {
throw new RuntimeException(e);
} finally {
_lock.readLock().unlock();
_lock.writeLock().unlock();
}
}

4
server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/distributed/ObjectMeta.java
View File

@@ -42,13 +42,13 @@ public class ObjectMeta implements Serializable {
}
public <R> R runWriteLocked(Callable<R> fn) {
_lock.readLock().lock();
_lock.writeLock().lock();
try {
return fn.call();
} catch (Exception e) {
throw new RuntimeException(e);
} finally {
_lock.readLock().unlock();
_lock.writeLock().unlock();
}
}
}