Revert zombie markers (minimal) #6069
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Wow, very minimal. Just load as though the zombie flag doesn't exist, prune as normal and move on. I think this is a fair approach. We'll probably want to run a couple nodes in parallel to validate our pruning behavior. As you suggested, new channels should probably have a different high water mark than existing channels, but that's a problem we have even now. This tests fine with my existing store (was under PR #6066). ACK 295b4ea |
tests/test_gossip.py
Outdated
| @@ -2229,6 +2229,7 @@ def test_gossip_private_updates(node_factory, bitcoind): | |||
| wait_for(lambda: l1.daemon.is_in_log(r'gossip_store_compact_offline: 5 deleted, 3 copied')) | |||
|
|
|||
|
|
|||
| @pytest.mark.skipIf(True, "Zombie research had unexpected side effects") | |||
There was a problem hiding this comment.
Suggested change
| @pytest.mark.skipIf(True, "Zombie research had unexpected side effects") | |
| @pytest.mark.skip("Zombie research had unexpected side effects") |
Signed-off-by: Rusty Russell <[email protected]>
Signed-off-by: Rusty Russell <[email protected]>
This reverts us to the v22.11 behaviour, pending a revisit for the next release. Changelog-Changed: gossipd: revert zombification change, keep all gossip for now. Signed-off-by: Rusty Russell <[email protected]>
endothermicdev
force-pushed
the
guilt/revert-zombies-minimal
branch
from
295b4ea
to
36e8ff2
Compare
|
ACK 36e8ff2 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Alternative to #6066
Then we can spend this release reworking the zombie logic, and checking that we're not eliminating any useful channels!