Skip to content
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.

Sign up for GitHub

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

[Config Change] Removes HardReorg config from InboxReader #2542

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

[Config Change] Removes HardReorg config from InboxReader #2542

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2737e35
Removes HardReorg config from InboxReader
diegoximenes Jul 31, 2024
94a07f0
TestSequencerReorgFromDelayed
diegoximenes Oct 4, 2024
176ffb3
Fix lint issue
diegoximenes Oct 4, 2024
4f8f862
Improves TestSequencerReorgFromDelayed
diegoximenes Oct 4, 2024
fa075bf
TestSequencerReorgFromLastDelayedMsg
diegoximenes Oct 9, 2024
80bfa33
Fix setDelayedCountReorgAndWriteBatch
PlasmaPower Oct 22, 2024
6eb2896
Merge branch 'master' into rm_hard_reorg
PlasmaPower Oct 22, 2024
241aed5
Address PR comment and update test
PlasmaPower Oct 23, 2024
22bd828
Merge branch 'master' into rm_hard_reorg
joshuacolvin0 Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions arbnode/inbox_tracker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,7 @@ func (t *InboxTracker) AddDelayedMessages(messages []*DelayedInboxMessage) error
}
}

firstPos := pos
joshuacolvin0 marked this conversation as resolved.
Show resolved Hide resolved
batch := t.db.NewBatch()
for _, message := range messages {
seqNum, err := message.Message.Header.SeqNum()
Expand Down Expand Up @@ -504,13 +505,16 @@ func (t *InboxTracker) AddDelayedMessages(messages []*DelayedInboxMessage) error
pos++
}

return t.setDelayedCountReorgAndWriteBatch(batch, pos, true)
return t.setDelayedCountReorgAndWriteBatch(batch, firstPos, pos, true)
}

// All-in-one delayed message count adjuster. Can go forwards or backwards.
// Requires the mutex is held. Sets the delayed count and performs any sequencer batch reorg necessary.
// Also deletes any future delayed messages.
func (t *InboxTracker) setDelayedCountReorgAndWriteBatch(batch ethdb.Batch, newDelayedCount uint64, canReorgBatches bool) error {
func (t *InboxTracker) setDelayedCountReorgAndWriteBatch(batch ethdb.Batch, firstNewDelayedMessagePos uint64, newDelayedCount uint64, canReorgBatches bool) error {
if firstNewDelayedMessagePos > newDelayedCount {
return fmt.Errorf("firstNewDelayedMessagePos %v is after newDelayedCount %v", firstNewDelayedMessagePos, newDelayedCount)
}
err := deleteStartingAt(t.db, batch, rlpDelayedMessagePrefix, uint64ToKey(newDelayedCount))
if err != nil {
return err
Expand All @@ -533,7 +537,7 @@ func (t *InboxTracker) setDelayedCountReorgAndWriteBatch(batch ethdb.Batch, newD
return err
}

seqBatchIter := t.db.NewIterator(delayedSequencedPrefix, uint64ToKey(newDelayedCount+1))
seqBatchIter := t.db.NewIterator(delayedSequencedPrefix, uint64ToKey(firstNewDelayedMessagePos+1))
defer seqBatchIter.Release()
var reorgSeqBatchesToCount *uint64
for seqBatchIter.Next() {
Expand Down Expand Up @@ -865,7 +869,7 @@ func (t *InboxTracker) ReorgDelayedTo(count uint64) error {
return errors.New("attempted to reorg to future delayed count")
}

return t.setDelayedCountReorgAndWriteBatch(t.db.NewBatch(), count, false)
return t.setDelayedCountReorgAndWriteBatch(t.db.NewBatch(), count, count, false)
}

func (t *InboxTracker) ReorgBatchesTo(count uint64) error {
Expand Down