Beta compiler fix #5659

realbigsean · 2024-04-29T19:28:39Z

Issue Addressed

rename guards in the LoggingLayer struct so they aren't flagged as unused
there are some errors including unnamed fields that we log out but don't use otherwise. I added #[allow(dead_code)] to the unnamed fields
BlobRequestState's blob_download_queue is no longer used since Handle sync lookup request streams in network context #5583 but is now being flagged as unused, so I removed that

This reverts commit 0bef36b.

This reverts commit 23152cf.

pawanjay176 · 2024-04-29T20:04:24Z

common/logging/src/lib.rs

@@ -256,14 +256,12 @@ pub fn create_tracing_layer(base_tracing_log_path: PathBuf) {
        return;
    };

-    let (libp2p_non_blocking_writer, libp2p_guard) = NonBlocking::new(libp2p_writer);
-    let (discv5_non_blocking_writer, discv5_guard) = NonBlocking::new(discv5_writer);
+    let (libp2p_non_blocking_writer, _) = NonBlocking::new(libp2p_writer);


I think we need the guards for the logging to actually happen. From https://docs.rs/tracing-appender/latest/tracing_appender/non_blocking/index.html

Note that the WorkerGuard returned by non_blocking must be assigned to a binding that is not _, as _ will result in the WorkerGuard being dropped immediately. Unintentional drops of WorkerGuard remove the guarantee that logs will be flushed during a program’s termination, in a panic or otherwise.

💯 nice catch, added back

realbigsean · 2024-04-29T20:44:09Z

@mergify queue

mergify · 2024-04-29T20:44:17Z

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at c33edc8

* Fix execution integration tests (#5647) * update waiting status * revert to old nethermind version * Add electra presets to beacon API (#5630) * add presets to API * add extra fields to config spec in beacon API * remove unused * add mainnet presets for gnosis and fix minimal preset default values * Rename `Merge` to `Bellatrix` (#5601) * Rename Merge to Bellatrix * Remove tree-hash-cache which got readded from the rebase * Deterministic block generation for tests (#5654) * Deterministic block generation for tests * Electra other containers (#5652) * add new fields to execution payload and header * beacon state changes * partial beacon state * safe arith in upgrade to electra * initialize balances cache in interop genesis state * Revert "initialize balances cache in interop genesis state" This reverts commit c60b522. * always initialize balances cache if necessary in electra upgrade * build cache earlier * fix block test * per fork NUM_FIELDS_POW2 * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra-other-containers * fix lints * get fields based on post state, as is spec'd * fix type and move cache build * Add more electra helpers (#5653) * Add new helpers * Fix some stuff * Fix compilation errors * lint * Address review * Ignore gossip blob already imported (#5656) * Ignore gossip blob already imported * Beta compiler fix (#5659) * fix beta compiler compilation * remove unused import * Revert "remove unused import" This reverts commit 0bef36b. * Revert "fix beta compiler compilation" This reverts commit 23152cf. * rename ununsed fields * allow dead code on some error variants * remove unused blob download queue * add back debug to backfill error * more allow dead code on errors * fix(validator_client): raise soft fd limit (#4796) * fix(validator_client): raise soft fd limit * Merge branch 'unstable' of https://github.com/sigp/lighthouse into rkrasiuk/raise-vc-fdlimit * cargo lock * Merge branch 'unstable' of https://github.com/sigp/lighthouse into rkrasiuk/raise-vc-fdlimit * Proposer and attester slashing sse events (#5327) * default vc to block v3 endpoint and deprecate block-v3 flag * Merge branch 'unstable' of https://github.com/sigp/lighthouse into unstable * add proposer and attester event variants * add TOOOs * add tests, event triggers * Merge branch 'unstable' of https://github.com/sigp/lighthouse into proposer-and-attester-slashing-sse-events * revert * revert * remove double event tracking * Merge branch 'unstable' into proposer-and-attester-slashing-sse-events * remove todo, fix test * resolve merge conflicts * Merge branch 'proposer-and-attester-slashing-sse-events' of https://github.com/eserilev/lighthouse into proposer-and-attester-slashing-sse-events * leftover debugging * Merge branch 'unstable' of https://github.com/sigp/lighthouse into proposer-and-attester-slashing-sse-events * Merge branch 'unstable' of https://github.com/sigp/lighthouse into proposer-and-attester-slashing-sse-events * pin macos release runner to `macos-13` (#5665) * pin macos release runner to `macos-13` * Update .github/workflows/release.yml * Remove snapshot cache related code (#5661) * Remove snapshot cache and other references. * Fix default state cache size in docs * Remove cache miss comment entirely * Add state cache CLI tests * Uncomment self_hosted_runner after PR Merge #5137 (#5291) * Uncomment self_hosted_runner after PR Merge #5137 * Merge branch 'unstable' into fix_todo * Merge branch 'unstable' of https://github.com/sigp/lighthouse into fix_todo * Only `portable` builds (binaries) (#5615) * release workflow: portable builds by default * Delete outdated comment * Merge branch 'unstable' into portable-builds-binaries # Conflicts: # .github/workflows/release.yml * Merge parent and current sync lookups (#5655) * Drop lookup type trait for a simple arg * Drop reconstructed for processing * Send parent blocks one by one * Merge current and parent lookups * Merge current and parent lookups clean up todos * Merge current and parent lookups tests * Merge remote-tracking branch 'origin/unstable' into sync-merged-lookup * Merge branch 'unstable' of https://github.com/sigp/lighthouse into sync-merged-lookup * fix compile after merge * #5655 pr review (#26) * fix compile after merge * remove todos, fix typos etc * fix compile * stable rng * delete TODO and unfilled out test * make download result a struct * enums instead of bools as params * fix comment * Various fixes * Track ignored child components * Track dropped lookup reason as metric * fix test * add comment describing behavior of avail check error * update ordering * delete spammy log (#5672) * delete spammy log * Ensure block only range requests don't fail on download (#5675) * ensure pruned blobs don't fail on download * Typo * Improve ENR updates (#5483) * Improve ENR updates * forever fmt * Appease my old friend clippy * Merge network unstable * Check da_checker before doing a block lookup request (#5681) * Check da_checker before doing a block lookup request * Ensure consistent handling of lookup result * use req resp pre import cache rather than da checker * Update Cargo.lock (#5670) * update rust-yamux * update Cargo.lock * Merge branch 'unstable' of github.com:jxs/lighthouse into update-cargo * Merge branch 'unstable' of github.com:sigp/lighthouse into update-cargo * update to new libp2p versions * Add metric for current epoch total balance (#5688) * Add metric for current epoch total balance --------- Co-authored-by: realbigsean <sean@sigmaprime.io> Co-authored-by: Mac L <mjladson@pm.me> Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> Co-authored-by: Pawan Dhananjay <pawandhananjay@gmail.com> Co-authored-by: Roman Krasiuk <rokrassyuk@gmail.com> Co-authored-by: Eitan Seri-Levi <eserilev@ucsc.edu> Co-authored-by: antondlr <anton@delaruelle.net> Co-authored-by: Jimmy Chen <jchen.tc@gmail.com> Co-authored-by: Ærvin <arvin.morawej@gmail.com> Co-authored-by: Age Manning <Age@AgeManning.com> Co-authored-by: João Oliveira <hello@jxs.pt> Co-authored-by: Michael Sproul <michael@sigmaprime.io>

realbigsean added 2 commits April 29, 2024 15:25

fix beta compiler compilation

23152cf

remove unused import

0bef36b

realbigsean added ready-for-review The code is ready for review low-hanging-fruit Easy to resolve, get it before someone else does! labels Apr 29, 2024

realbigsean changed the title ~~Beta compiler fixes 04 29~~ Beta compiler fix Apr 29, 2024

realbigsean added 4 commits April 29, 2024 15:38

Revert "remove unused import"

b22f84b

This reverts commit 0bef36b.

Revert "fix beta compiler compilation"

db1e778

This reverts commit 23152cf.

rename ununsed fields

cc49a39

allow dead code on some error variants

4cd4204

pawanjay176 requested changes Apr 29, 2024

View reviewed changes

realbigsean added 3 commits April 29, 2024 16:05

remove unused blob download queue

b16c554

add back debug to backfill error

e63d9c1

more allow dead code on errors

3679ce4

pawanjay176 approved these changes Apr 29, 2024

View reviewed changes

mergify bot merged commit c33edc8 into sigp:unstable Apr 29, 2024
27 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Beta compiler fix #5659

Beta compiler fix #5659

realbigsean commented Apr 29, 2024 •

edited

Loading

pawanjay176 Apr 29, 2024

realbigsean Apr 29, 2024

realbigsean commented Apr 29, 2024

mergify bot commented Apr 29, 2024 •

edited

Loading

Beta compiler fix #5659

Beta compiler fix #5659

Conversation

realbigsean commented Apr 29, 2024 • edited Loading

Issue Addressed

pawanjay176 Apr 29, 2024

Choose a reason for hiding this comment

realbigsean Apr 29, 2024

Choose a reason for hiding this comment

realbigsean commented Apr 29, 2024

mergify bot commented Apr 29, 2024 • edited Loading

✅ The pull request has been merged automatically

realbigsean commented Apr 29, 2024 •

edited

Loading

mergify bot commented Apr 29, 2024 •

edited

Loading