Skip to content

v2.3: remove calls to get EpochInfo from LeaderTpuCacheUpdater (backport of #6748) #6870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2025

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 7, 2025

Problem

We have logic related to EpochInfo updates which is actually not needed as soon as we have EpochSchedule.

Summary of Changes

This PR removes rpc call for EpochInfo. All we need it for is to get slots_in_epoch which is passed to fanout function to have upper bound for the fanout on the clusters where epoch is smaller than 2 * MAX_FANOUT_SLOTS == 200 (probably relevant for tests only?).


This is an automatic backport of pull request #6748 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Jul 7, 2025
@mergify mergify bot requested a review from a team as a code owner July 7, 2025 20:03
Copy link
Author

mergify bot commented Jul 7, 2025

Cherry-pick of fecc916 has failed:

On branch mergify/bp/v2.3/pr-6748
Your branch is up to date with 'origin/v2.3'.

You are currently cherry-picking commit fecc91633.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   Cargo.lock
	modified:   programs/sbf/Cargo.lock
	modified:   svm/examples/Cargo.lock
	modified:   tpu-client/Cargo.toml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tpu-client/src/nonblocking/tpu_client.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@KirillLykov KirillLykov force-pushed the mergify/bp/v2.3/pr-6748 branch from 7e53f01 to 28a6154 Compare July 9, 2025 19:34
@KirillLykov
Copy link

@t-nelson i've made this branch to be on top of the branch for #6734 (no conflicts)

@codecov-commenter
Copy link

codecov-commenter commented Jul 9, 2025

Codecov Report

Attention: Patch coverage is 70.58824% with 5 lines in your changes missing coverage. Please review.

Project coverage is 82.8%. Comparing base (273a091) to head (acc9fd9).
Report is 1 commits behind head on v2.3.

Additional details and impacted files
@@            Coverage Diff            @@
##             v2.3    #6870     +/-   ##
=========================================
- Coverage    82.8%    82.8%   -0.1%     
=========================================
  Files         850      850             
  Lines      379914   379909      -5     
=========================================
- Hits       314809   314746     -63     
- Misses      65105    65163     +58     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@KirillLykov
Copy link

KirillLykov commented Jul 11, 2025

@t-nelson the previous PR has been approved, can we merge both of these now (the second will need to be rebased and approved afterwards of course)?

@t-nelson
Copy link

@mergify rebase

Copy link
Author

mergify bot commented Jul 11, 2025

rebase

☑️ Nothing to do, the required conditions are not met

  • -conflict [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • queue-position = -1 [📌 rebase requirement]
  • any of:
    • #commits > 1 [📌 rebase requirement]
    • #commits-behind > 0 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]

@t-nelson
Copy link

hmm not sure why github has this flagged for conflicts... there are no conflict markers in the total diff nor either individual commit

gonna try to close and reopen

@t-nelson t-nelson closed this Jul 11, 2025
@t-nelson t-nelson reopened this Jul 11, 2025
@KirillLykov
Copy link

Maybe just drop commit 39e0078 from this branch?

@KirillLykov
Copy link

KirillLykov commented Jul 11, 2025

hmm not sure why github has this flagged for conflicts... there are no conflict markers in the total diff nor either individual commit

gonna try to close and reopen

Maybe just drop commit 39e0078 from this branch? This branch has been rebased on top of previous commit so it has the commit that has been added to the 2.3. I can just drop now this commit (?), if sounds reasonable

@t-nelson
Copy link

give it a shot i guess? honestly no idea where the error is coming from

@KirillLykov KirillLykov force-pushed the mergify/bp/v2.3/pr-6748 branch from 28a6154 to acc9fd9 Compare July 11, 2025 14:46
@KirillLykov
Copy link

I did git rebase --onto upstream/v2.3 HEAD~1, it compiles. Will see if pass all the checks.

@t-nelson
Copy link

conflicts flag is gone anyway 🤞

@t-nelson
Copy link

@steviez wanna sme here too?

Copy link

@steviez steviez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM and nice to leverage the existing math (from EpochSchedule) to figure out the last slot in the epoch

@t-nelson t-nelson merged commit 6a2cf78 into v2.3 Jul 11, 2025
46 checks passed
@t-nelson t-nelson deleted the mergify/bp/v2.3/pr-6748 branch July 11, 2025 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants