reduce beacon publishing logging

salesforce · May 26, 2024 · 6f51664 · 6f51664
1 parent ad4b01d
commit 6f51664
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/choam/src/main/java/com/salesforce/apollo/choam/CHOAM.java b/choam/src/main/java/com/salesforce/apollo/choam/CHOAM.java
@@ -542,10 +542,16 @@ public Block produce(ULong height, Digest prev, Executions executions, HashedBlo
             }
 
             @Override
-            public void publish(Digest hash, CertifiedBlock cb) {
-                log.info("Publishing: {} hash: {} height: {} certifications: {} on: {}", cb.getBlock().getBodyCase(),
-                         hash, ULong.valueOf(cb.getBlock().getHeader().getHeight()), cb.getCertificationsCount(),
-                         params.member().getId());
+            public void publish(Digest hash, CertifiedBlock cb, boolean beacon) {
+                if (beacon) {
+                    log.trace("Publishing beacon: {} hash: {} height: {} certifications: {} on: {}",
+                              cb.getBlock().getBodyCase(), hash, ULong.valueOf(cb.getBlock().getHeader().getHeight()),
+                              cb.getCertificationsCount(), params.member().getId());
+                } else {
+                    log.info("Publishing: {} hash: {} height: {} certifications: {} on: {}",
+                             cb.getBlock().getBodyCase(), hash, ULong.valueOf(cb.getBlock().getHeader().getHeight()),
+                             cb.getCertificationsCount(), params.member().getId());
+                }
                 combine.publish(cb, true);
             }
 
@@ -1022,7 +1028,7 @@ public interface BlockProducer {
 
         Block produce(ULong height, Digest prev, Executions executions, HashedBlock checkpoint);
 
-        void publish(Digest hash, CertifiedBlock cb);
+        void publish(Digest hash, CertifiedBlock cb, boolean beacon);
 
         Block reconfigure(Map<Digest, Join> joining, Digest nextViewId, HashedBlock previous, HashedBlock checkpoint);
     }

diff --git a/choam/src/main/java/com/salesforce/apollo/choam/GenesisAssembly.java b/choam/src/main/java/com/salesforce/apollo/choam/GenesisAssembly.java
@@ -207,7 +207,7 @@ public void publish() {
                  .sorted(Comparator.comparing(e -> e.getKey().getId()))
                  .map(Map.Entry::getValue)
                  .forEach(v -> b.addCertifications(v.getWitness()));
-        view.publish(new HashedCertifiedBlock(params().digestAlgorithm(), b.build()));
+        view.publish(new HashedCertifiedBlock(params().digestAlgorithm(), b.build()), false);
         controller.completeIt();
         log.info("Genesis block: {} published with {} witnesses for: {} on: {}", reconfiguration.hash, witnesses.size(),
                  view.context().getId(), params().member().getId());

diff --git a/choam/src/main/java/com/salesforce/apollo/choam/Producer.java b/choam/src/main/java/com/salesforce/apollo/choam/Producer.java
@@ -312,23 +312,23 @@ private void publish(PendingBlock p) {
         this.publish(p, false);
     }
 
-    private void publish(PendingBlock p, boolean force) {
+    private void publish(PendingBlock p, boolean beacon) {
         assert p.witnesses.size() >= params().majority() : "Publishing non majority block";
         var publish = p.published.compareAndSet(false, true);
-        if (!publish && !force) {
+        if (!publish && !beacon) {
             log.trace("Already published: {} hash: {} height: {} witnesses: {} on: {}", p.block.block.getBodyCase(),
                       p.block.hash, p.block.height(), p.witnesses.values().size(), params().member().getId());
             return;
         }
-        log.trace("Publishing {}pending: {} hash: {} height: {} witnesses: {} on: {}", force ? "(forced) " : "",
+        log.trace("Publishing {}pending: {} hash: {} height: {} witnesses: {} on: {}", beacon ? "(beacon) " : "",
                   p.block.block.getBodyCase(), p.block.hash, p.block.height(), p.witnesses.values().size(),
                   params().member().getId());
         final var cb = CertifiedBlock.newBuilder()
                                      .setBlock(p.block.block)
                                      .addAllCertifications(
                                      p.witnesses.values().stream().map(Validate::getWitness).toList())
                                      .build();
-        view.publish(new HashedCertifiedBlock(params().digestAlgorithm(), cb));
+        view.publish(new HashedCertifiedBlock(params().digestAlgorithm(), cb), beacon);
     }
 
     private void reconfigure() {

diff --git a/choam/src/main/java/com/salesforce/apollo/choam/ViewContext.java b/choam/src/main/java/com/salesforce/apollo/choam/ViewContext.java
@@ -158,8 +158,8 @@ public Block produce(ULong height, Digest prev, Assemble assemble, HashedBlock c
         return blockProducer.produce(height, prev, assemble, checkpoint);
     }
 
-    public void publish(HashedCertifiedBlock block) {
-        blockProducer.publish(block.hash, block.certifiedBlock);
+    public void publish(HashedCertifiedBlock block, boolean beacon) {
+        blockProducer.publish(block.hash, block.certifiedBlock, beacon);
     }
 
     public Block reconfigure(Map<Digest, Join> aggregate, Digest nextViewId, HashedBlock lastBlock,

diff --git a/choam/src/test/java/com/salesforce/apollo/choam/GenesisAssemblyTest.java b/choam/src/test/java/com/salesforce/apollo/choam/GenesisAssemblyTest.java
@@ -149,7 +149,7 @@ public Block produce(ULong height, Digest prev, Executions executions, HashedBlo
                 }
 
                 @Override
-                public void publish(Digest hash, CertifiedBlock cb) {
+                public void publish(Digest hash, CertifiedBlock cb, boolean beacon) {
                     complete.countDown();
                 }