diff --git a/choam/src/main/java/com/salesforce/apollo/choam/CHOAM.java b/choam/src/main/java/com/salesforce/apollo/choam/CHOAM.java index d534feb0a9..c3c2e1718d 100644 --- a/choam/src/main/java/com/salesforce/apollo/choam/CHOAM.java +++ b/choam/src/main/java/com/salesforce/apollo/choam/CHOAM.java @@ -1013,6 +1013,7 @@ public void awaitSynchronization() { return; } roundScheduler.schedule(AWAIT_SYNC, () -> { + log.trace("Synchronization failed on: {}", params.member().getId()); synchronizationFailed(); }, params.synchronizationCycles()); } @@ -1244,6 +1245,7 @@ private Formation() { assembly = new GenesisAssembly(vc, comm, next.get().member, consumer); nextViewId.set(params.genesisViewId()); } else { + log.trace("No formation on: {}", params.member().getId()); assembly = null; } } diff --git a/choam/src/test/resources/logback-test.xml b/choam/src/test/resources/logback-test.xml index 847bad04d1..de375794ed 100644 --- a/choam/src/test/resources/logback-test.xml +++ b/choam/src/test/resources/logback-test.xml @@ -2,63 +2,34 @@ - + - %d{mm:ss.SSS} [%thread] %-5level %logger{0} - - %msg%n - + %d{mm:ss.SSS} [%thread] %-5level %logger{0} + - %msg%n + - + - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - + + - - + + - + - \ No newline at end of file + diff --git a/ethereal/src/main/java/com/salesforce/apollo/ethereal/Ethereal.java b/ethereal/src/main/java/com/salesforce/apollo/ethereal/Ethereal.java index 4ba911cb09..e086a3cc5e 100644 --- a/ethereal/src/main/java/com/salesforce/apollo/ethereal/Ethereal.java +++ b/ethereal/src/main/java/com/salesforce/apollo/ethereal/Ethereal.java @@ -93,7 +93,7 @@ public void run() { private static final Logger log = LoggerFactory.getLogger(Ethereal.class); public static ThreadPoolExecutor consumer(String label) { - return new ThreadPoolExecutor(1, 1, 1, TimeUnit.NANOSECONDS, new PriorityBlockingQueue<>(), + return new ThreadPoolExecutor(1, 1, 1, TimeUnit.SECONDS, new PriorityBlockingQueue<>(), Thread.ofVirtual().name("Ethereal Consumer[" + label + "]").factory(), (r, t) -> log.trace("Shutdown, cannot consume unit", t)); } diff --git a/fireflies/src/test/resources/logback-test.xml b/fireflies/src/test/resources/logback-test.xml index f865df222d..4791e0131b 100644 --- a/fireflies/src/test/resources/logback-test.xml +++ b/fireflies/src/test/resources/logback-test.xml @@ -6,9 +6,7 @@ - - - %msg%n - + - %msg%n @@ -28,7 +26,7 @@ - + @@ -51,4 +49,4 @@ - \ No newline at end of file + diff --git a/memberships/src/main/java/com/salesforce/apollo/membership/Ring.java b/memberships/src/main/java/com/salesforce/apollo/membership/Ring.java index 862dd4acde..310ed6bed2 100644 --- a/memberships/src/main/java/com/salesforce/apollo/membership/Ring.java +++ b/memberships/src/main/java/com/salesforce/apollo/membership/Ring.java @@ -223,7 +223,7 @@ public Digest hash(T m) { } public T insert(T m) { - LoggerFactory.getLogger(getClass()).trace("Adding: {} to ring: {}", m, index); + LoggerFactory.getLogger(getClass()).trace("Adding: {} to ring: {}", m.getId(), index); return ring.put(hash(m), m); } diff --git a/memberships/src/main/java/com/salesforce/apollo/membership/messaging/rbc/ReliableBroadcaster.java b/memberships/src/main/java/com/salesforce/apollo/membership/messaging/rbc/ReliableBroadcaster.java index d3d653fad5..64cecc5a4c 100644 --- a/memberships/src/main/java/com/salesforce/apollo/membership/messaging/rbc/ReliableBroadcaster.java +++ b/memberships/src/main/java/com/salesforce/apollo/membership/messaging/rbc/ReliableBroadcaster.java @@ -182,7 +182,7 @@ public void start(Duration duration) { var initialDelay = Entropy.nextBitsStreamLong(duration.toMillis()); log.info("Starting Reliable Broadcaster[{}] for {}", context.getId(), member.getId()); comm.register(context.getId(), new Service()); - var scheduler = Executors.newScheduledThreadPool(1, Thread.ofVirtual().factory()); + var scheduler = Executors.newScheduledThreadPool(2, Thread.ofVirtual().factory()); scheduler.schedule(() -> oneRound(duration, scheduler), initialDelay, TimeUnit.MILLISECONDS); } @@ -190,7 +190,7 @@ public void stop() { if (!started.compareAndSet(true, false)) { return; } - log.info("Stopping Reliable Broadcaster[{}] for {}", context.getId(), member.getId()); + log.info("Stopping Reliable Broadcaster[{}] on: {}", context.getId(), member.getId()); buffer.clear(); gossiper.reset(); comm.deregister(context.getId()); @@ -214,14 +214,14 @@ private Reconcile gossipRound(ReliableBroadcast link, int ring) { if (!started.get()) { return null; } - log.trace("rbc gossiping[{}] from {} with {} on {}", buffer.round(), member.getId(), link.getMember().getId(), - ring); + log.trace("rbc gossiping[{}] with: {} ring: {} on: {}", buffer.round(), member.getId(), link.getMember().getId(), + ring, member.getId()); try { return link.gossip( MessageBff.newBuilder().setRing(ring).setDigests(buffer.forReconcilliation().toBff()).build()); } catch (Throwable e) { - log.trace("rbc gossiping[{}] failed from {} with {} on {}", buffer.round(), member.getId(), - link.getMember().getId(), ring, e); + log.trace("rbc gossiping[{}] failed with: {} ring: {} on: {}", buffer.round(), link.getMember().getId(), + ring, member.getId(), e); return null; } } @@ -229,10 +229,10 @@ private Reconcile gossipRound(ReliableBroadcast link, int ring) { private void handle(Optional result, RingCommunications.Destination destination, Duration duration, ScheduledExecutorService scheduler, Timer.Context timer) { - if (result.isEmpty()) { - return; - } try { + if (result.isEmpty()) { + return; + } Reconcile gossip = result.get(); buffer.receive(gossip.getUpdatesList()); destination.link() diff --git a/memberships/src/main/java/com/salesforce/apollo/ring/RingCommunications.java b/memberships/src/main/java/com/salesforce/apollo/ring/RingCommunications.java index 807f6f9f33..2509f5d0ca 100644 --- a/memberships/src/main/java/com/salesforce/apollo/ring/RingCommunications.java +++ b/memberships/src/main/java/com/salesforce/apollo/ring/RingCommunications.java @@ -154,7 +154,7 @@ private void execute(BiFunction round, SyncHandler void internalIterate(Digest digest, Runnable onMajority, BiFunction< Q result = null; try { result = round.apply(link, next.ring()); - } catch (StatusRuntimeException e) { + } catch (Throwable e) { log.trace("Exception in round for: {} on: {} iteration: {} from: {} on: {}", digest, context.getId(), iteration(), link.getMember() == null ? null : link.getMember().getId(), member.getId()); } diff --git a/memberships/src/test/resources/logback-test.xml b/memberships/src/test/resources/logback-test.xml index dfac015277..95e670a71a 100644 --- a/memberships/src/test/resources/logback-test.xml +++ b/memberships/src/test/resources/logback-test.xml @@ -1,31 +1,25 @@ - - + + - - - - %d{mm:ss.SSS} [%thread] %-5level %logger{0} - - %msg%n + + + + %d{mm:ss.SSS} [%thread] %-5level %logger{0} +- %msg%n - - - - - - - - - - - - - - - - - + + + + + + + + + + +