cleanup

salesforce · Jun 23, 2024 · b158e5c · b158e5c
1 parent 129fa49
commit b158e5c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/fireflies/src/main/java/com/salesforce/apollo/fireflies/View.java b/fireflies/src/main/java/com/salesforce/apollo/fireflies/View.java
@@ -344,16 +344,18 @@ void finalizeViewChange() {
             return;
         }
         viewChange(() -> {
+            final var current = currentView();
             final var supermajority = context.getRingCount() * 3 / 4;
             final var majority = context.size() == 1 ? 1 : supermajority;
             final var valid = observations.values()
                                           .stream()
+                                          .filter(vc -> current.equals(Digest.from(vc.getChange().getCurrent())))
                                           .filter(svc -> viewManagement.observers.contains(
                                           Digest.from(svc.getChange().getObserver())))
                                           .toList();
-            log.info("Finalize view change, observations: {} valid: {} observers: {} on: {}",
-                     observations.values().stream().map(sv -> Digest.from(sv.getChange().getObserver())).toList(),
-                     valid.size(), viewManagement.observersList(), node.getId());
+            log.trace("Finalize view change, observations: {} valid: {} observers: {} on: {}",
+                      observations.values().stream().map(sv -> Digest.from(sv.getChange().getObserver())).toList(),
+                      valid.size(), viewManagement.observersList(), node.getId());
             observations.clear();
             if (valid.size() < majority) {
                 log.info("Do not have majority: {} required: {} observers: {} for: {} on: {}", valid.size(), majority,
@@ -364,8 +366,7 @@ void finalizeViewChange() {
             log.info("Finalizing view change: {} required: {} observers: {} for: {} on: {}", context.getId(), majority,
                      viewManagement.observersList(), currentView(), node.getId());
             HashMultiset<Ballot> ballots = HashMultiset.create();
-            final var current = currentView();
-            valid.stream().filter(vc -> current.equals(Digest.from(vc.getChange().getCurrent()))).forEach(vc -> {
+            valid.forEach(vc -> {
                 final var leaving = vc.getChange()
                                       .getLeavesList()
                                       .stream()

diff --git a/fireflies/src/main/java/com/salesforce/apollo/fireflies/ViewManagement.java b/fireflies/src/main/java/com/salesforce/apollo/fireflies/ViewManagement.java
@@ -513,22 +513,22 @@ Redirect seed(Registration registration, Digest from) {
         final var requestView = Digest.from(registration.getView());
 
         if (!joined()) {
-            log.warn("Not joined, ignored seed view: {} from: {} on: {}", requestView, from, node.getId());
+            log.trace("Not joined, ignored seed view: {} from: {} on: {}", requestView, from, node.getId());
             return Redirect.getDefaultInstance();
         }
         if (!bootstrapView.equals(requestView)) {
-            log.warn("Invalid bootstrap view: {} expected: {} from: {} on: {}", bootstrapView, requestView, from,
-                     node.getId());
+            log.trace("Invalid bootstrap view: {} expected: {} from: {} on: {}", bootstrapView, requestView, from,
+                      node.getId());
             return Redirect.getDefaultInstance();
         }
         var note = new NoteWrapper(registration.getNote(), digestAlgo);
         if (!from.equals(note.getId())) {
-            log.warn("Invalid bootstrap note: {} from: {} claiming: {} on: {}", requestView, from, note.getId(),
-                     node.getId());
+            log.trace("Invalid bootstrap note: {} from: {} claiming: {} on: {}", requestView, from, note.getId(),
+                      node.getId());
             return Redirect.getDefaultInstance();
         }
         if (!view.validate(note.getIdentifier())) {
-            log.warn("Invalid identifier: {} from: {}  on: {}", note.getIdentifier(), from, node.getId());
+            log.trace("Invalid identifier: {} from: {}  on: {}", note.getIdentifier(), from, node.getId());
             return Redirect.getDefaultInstance();
         }
         return view.stable(() -> {
@@ -573,12 +573,12 @@ private void initiateViewChange() {
             }
             view.scheduleFinalizeViewChange();
             if (!isObserver(node.getId())) {
-                log.info("Initiating (non observer) view change: {} joins: {} leaves: {} on: {}", currentView(),
-                         joins.size(), view.streamShunned().count(), node.getId());
+                log.debug("Initiating (non observer) view change: {} joins: {} leaves: {} on: {}", currentView(),
+                          joins.size(), view.streamShunned().count(), node.getId());
                 return;
             }
-            log.warn("Initiating (observer) view change vote: {} joins: {} leaves: {} observers: {} on: {}",
-                     currentView(), joins.size(), view.streamShunned().count(), observersList(), node.getId());
+            log.debug("Initiating (observer) view change vote: {} joins: {} leaves: {} observers: {} on: {}",
+                      currentView(), joins.size(), view.streamShunned().count(), observersList(), node.getId());
             final var builder = ViewChange.newBuilder()
                                           .setObserver(node.getId().toDigeste())
                                           .setCurrent(currentView().toDigeste())
@@ -593,8 +593,8 @@ private void initiateViewChange() {
                                                    .setSignature(signature.toSig())
                                                    .build();
             view.initiate(viewChange);
-            log.warn("View change vote: {} joins: {} leaves: {} on: {}", currentView(), change.getJoinsCount(),
-                     change.getLeavesCount(), node.getId());
+            log.trace("View change vote: {} joins: {} leaves: {} on: {}", currentView(), change.getJoinsCount(),
+                      change.getLeavesCount(), node.getId());
         });
     }