implement getKS(id, seq) - wow. Gate with empty check on reconcile.

salesforce · Jan 17, 2024 · ee0aeae · ee0aeae
1 parent 7a71d6d
commit ee0aeae
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/...ips/src/main/java/com/salesforce/apollo/membership/messaging/rbc/ReliableBroadcaster.java b/...ips/src/main/java/com/salesforce/apollo/membership/messaging/rbc/ReliableBroadcaster.java
@@ -241,12 +241,15 @@ private void handle(Optional<Reconcile> result,
             }
             Reconcile gossip = result.get();
             buffer.receive(gossip.getUpdatesList());
-            destination.link()
-                       .update(ReconcileContext.newBuilder()
-                                               .setRing(destination.ring())
-                                               .addAllUpdates(buffer.reconcile(BloomFilter.from(gossip.getDigests()),
-                                                                               destination.member().getId()))
-                                               .build());
+            var biff = gossip.getDigests();
+            if (!Biff.getDefaultInstance().equals(biff)) {
+                destination.link()
+                           .update(ReconcileContext.newBuilder()
+                                                   .setRing(destination.ring())
+                                                   .addAllUpdates(buffer.reconcile(BloomFilter.from(biff),
+                                                                                   destination.member().getId()))
+                                                   .build());
+            }
         } finally {
             if (timer != null) {
                 timer.stop();
@@ -403,9 +406,9 @@ public class Service implements Router.ServiceRouting {
         public Reconcile gossip(MessageBff request, Digest from) {
             Member predecessor = context.ring(request.getRing()).predecessor(member);
             if (predecessor == null || !from.equals(predecessor.getId())) {
-                log.info("Invalid inbound messages gossip on {}:{} from: {} on ring: {} - not predecessor: {}",
-                         context.getId(), member.getId(), from, request.getRing(),
-                         predecessor == null ? "<null>" : predecessor.getId());
+                log.trace("Invalid inbound messages gossip on {}:{} from: {} on ring: {} - not predecessor: {}",
+                          context.getId(), member.getId(), from, request.getRing(),
+                          predecessor == null ? "<null>" : predecessor.getId());
                 return Reconcile.getDefaultInstance();
             }
             return Reconcile.newBuilder()

diff --git a/thoth/src/main/java/com/salesforce/apollo/thoth/KerlDHT.java b/thoth/src/main/java/com/salesforce/apollo/thoth/KerlDHT.java
@@ -1123,7 +1123,11 @@ public KeyState_ getKeyState(EventCoords coordinates) {
 
         @Override
         public KeyState_ getKeyState(Ident identifier, long sequenceNumber) {
-            return null;
+            if (log.isTraceEnabled()) {
+                log.trace("get key state for {}:{} on: {}", Identifier.from(identifier), ULong.valueOf(sequenceNumber),
+                          member.getId());
+            }
+            return complete(k -> k.getKeyState(identifier, sequenceNumber));
         }
 
         @Override