Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Adjust bpf epoch for tests, not effecting prod.#12387

Merged
ryoqun merged 2 commits intosolana-labs:v1.2from
ryoqun:bpf-epoch-work-around-v1.2
Sep 22, 2020
Merged

Adjust bpf epoch for tests, not effecting prod.#12387
ryoqun merged 2 commits intosolana-labs:v1.2from
ryoqun:bpf-epoch-work-around-v1.2

Conversation

@ryoqun
Copy link
Copy Markdown
Contributor

@ryoqun ryoqun commented Sep 22, 2020

Problem

rolling upgrade system test doesn't work, chopped on this inconsistent gating in v1.3 and v1.2

Summary of Changes

Due to somewhat large cost for the right fix, let's do some work-around.

For details, please see in-source comment

Fixes #

@ryoqun ryoqun requested a review from t-nelson September 22, 2020 07:42
@codecov
Copy link
Copy Markdown

codecov Bot commented Sep 22, 2020

Codecov Report

Merging #12387 into v1.2 will increase coverage by 0.0%.
The diff coverage is 100.0%.

@@          Coverage Diff           @@
##            v1.2   #12387   +/-   ##
======================================
  Coverage   82.0%    82.0%           
======================================
  Files        322      322           
  Lines      77774    77774           
======================================
+ Hits       63784    63787    +3     
+ Misses     13990    13987    -3     

@ryoqun ryoqun mentioned this pull request Sep 22, 2020
Copy link
Copy Markdown
Contributor

@t-nelson t-nelson left a comment

Choose a reason for hiding this comment

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

Nice! This looks good to me!

Aside: If we were to want to leave logic like this in the code base, we could also fix it by making solana-ledger-tool --warp-slot WARP_SLOT aware of all interesting historical events and stopping off at each one between slot 0 and the requested WARP_SLOT, right?

@ryoqun
Copy link
Copy Markdown
Contributor Author

ryoqun commented Sep 22, 2020

Nice! This looks good to me!

Thanks! I'll merge this shortly.

Aside: If we were to want to leave logic like this in the code base, we could also fix it by making solana-ledger-tool --warp-slot WARP_SLOT aware of all interesting historical events and stopping off at each one between slot 0 and the requested WARP_SLOT, right?

Hehe, it already does in fact. :)

warp_from_parent in master and v1.3 does correct handling for skipped interesting epoches. That's why warped bank (epoch 97) starts to complain something wrong around the bpf loader (epoch 34), only in v1.3 branch.

@t-nelson
Copy link
Copy Markdown
Contributor

t-nelson commented Sep 22, 2020

Hehe, it already does in fact. :)

Oh, nice! :shipit:

@ryoqun ryoqun merged commit 3612964 into solana-labs:v1.2 Sep 22, 2020
@t-nelson
Copy link
Copy Markdown
Contributor

t-nelson commented Oct 9, 2020

@ryoqun can this go into 1.3? I'm hitting the same BPFLoader error on start for a 1.3 -> 1.4 rolling upgrade check

failed build: https://buildkite.com/solana-labs/rolling-upgrade-tests/builds/119#b87a39c7-1e3c-4ecb-aa66-7f4e923a6864

@ryoqun
Copy link
Copy Markdown
Contributor Author

ryoqun commented Oct 9, 2020

@t-nelson Odd? Both v1.3 and v1.4 are finished to transition to new runtime feature activation, so this shouldn't be problem now. I'll take a look at this.

@t-nelson
Copy link
Copy Markdown
Contributor

t-nelson commented Oct 9, 2020

@ryoqun any luck here? I'll take a poke at it if you haven't had a chance to get to it yet

@ryoqun
Copy link
Copy Markdown
Contributor Author

ryoqun commented Oct 9, 2020

@t-nelson Could you test upgrade test with #12759? It's probably the fix. This is possibly affected by the bug too.

@ryoqun
Copy link
Copy Markdown
Contributor Author

ryoqun commented Oct 12, 2020

@ryoqun can this go into 1.3? I'm hitting the same BPFLoader error on start for a 1.3 -> 1.4 rolling upgrade check

this issue was ultimately fixed at #12759

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants