diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjectDeleter.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjectDeleter.java index b3555794..08530b2b 100644 --- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjectDeleter.java +++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjectDeleter.java @@ -138,7 +138,7 @@ public class RemoteObjectDeleter { .map(PeerInfo::id) .filter(id -> !finalTarget.confirmedDeletes().contains(id)).toList(); - var ret = remoteObjectServiceClient.canDelete(missing, objName, target.refsFrom()); + var ret = remoteObjectServiceClient.canDelete(missing, objName); long ok = 0; diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RemoteObjectServiceClient.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RemoteObjectServiceClient.java index 4797546f..4089d4ca 100644 --- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RemoteObjectServiceClient.java +++ b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RemoteObjectServiceClient.java @@ -117,15 +117,11 @@ public class RemoteObjectServiceClient { return OpPushReply.getDefaultInstance(); } - public Collection> canDelete(Collection targets, JObjectKey objKey, Collection ourReferrers) { + public Collection> canDelete(Collection targets, JObjectKey objKey) { Log.trace("Asking canDelete for " + objKey + " from " + targets.stream().map(PeerId::toString).collect(Collectors.joining(", "))); try { return _batchExecutor.invokeAll(targets.stream().>>map(h -> () -> { var req = CanDeleteRequest.newBuilder().setName(JObjectKeyP.newBuilder().setName(objKey.toString()).build()); - assert ourReferrers.isEmpty(); - for (var ref : ourReferrers) { - req.addOurReferrers(JObjectKeyP.newBuilder().setName(ref.obj().toString()).build()); - } return Pair.of(h, rpcClientFactory.withObjSyncClient(h, (p, client) -> client.canDelete(req.build()))); }).toList()).stream().map(f -> { try { diff --git a/dhfs-parent/sync-base/src/main/proto/dhfs_sync.proto b/dhfs-parent/sync-base/src/main/proto/dhfs_sync.proto index a4b012e9..6e94efd7 100644 --- a/dhfs-parent/sync-base/src/main/proto/dhfs_sync.proto +++ b/dhfs-parent/sync-base/src/main/proto/dhfs_sync.proto @@ -32,7 +32,6 @@ message GetObjectReply { message CanDeleteRequest { dhfs.persistence.JObjectKeyP name = 2; - repeated dhfs.persistence.JObjectKeyP ourReferrers = 3; } message CanDeleteReply {