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

use aborted on failing to resolve conflict if we don't have local copy

Browse Source
This commit is contained in:
Stepan Usatiuk
2024-06-23 22:08:03 +02:00
parent 3f444329e4
commit 4e9ba6508e
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/com/usatiuk/dhfs/storage/files/conflicts/DirectoryConflictResolver.java
View File

@@ -7,6 +7,8 @@ import com.usatiuk.dhfs.storage.objects.repository.distributed.ConflictResolver;
import com.usatiuk.dhfs.storage.objects.repository.distributed.ObjectMetadata;
import com.usatiuk.dhfs.storage.objects.repository.distributed.PersistentRemoteHostsService;
import com.usatiuk.dhfs.storage.objects.repository.distributed.RemoteObjectServiceClient;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
import io.quarkus.logging.Log;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
@@ -40,7 +42,7 @@ public class DirectoryConflictResolver implements ConflictResolver {
var oursAsDir = (JObject<Directory>) ours;
oursAsDir.runWriteLockedMeta((a, b, c) -> {
if (!ours.tryLocalResolve())
throw new NotImplementedException("Conflict but we don't have local copy for " + ours.getName());
throw new StatusRuntimeException(Status.ABORTED.withDescription("Conflict but we don't have local copy"));
oursAsDir.runWriteLocked((m, oursDir, bump) -> {

6
server/src/main/java/com/usatiuk/dhfs/storage/files/conflicts/FileConflictResolver.java
View File

@@ -9,6 +9,8 @@ import com.usatiuk.dhfs.storage.objects.repository.distributed.ConflictResolver;
import com.usatiuk.dhfs.storage.objects.repository.distributed.ObjectMetadata;
import com.usatiuk.dhfs.storage.objects.repository.distributed.PersistentRemoteHostsService;
import com.usatiuk.dhfs.storage.objects.repository.distributed.RemoteObjectServiceClient;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
import io.quarkus.logging.Log;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
@@ -46,12 +48,12 @@ public class FileConflictResolver implements ConflictResolver {
_oursDir.runWriteLockedMeta((a, b, c) -> {
if (!_oursDir.tryLocalResolve())
throw new NotImplementedException("Conflict but we don't have local copy for " + _oursDir.getName());
throw new StatusRuntimeException(Status.ABORTED.withDescription("Conflict but we don't have local copy"));
_oursDir.runWriteLocked((mD, oursDir, bumpDir) -> {
oursAsFile.runWriteLockedMeta((a2, b2, c2) -> {
if (!ours.tryLocalResolve())
throw new NotImplementedException("Conflict but we don't have local copy for " + ours.getName());
throw new StatusRuntimeException(Status.ABORTED.withDescription("Conflict but we don't have local copy"));
oursAsFile.runWriteLocked((m, oursFile, bumpFile) -> {