Skip to content

Make inserts and reorg handling atomic #192

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

Merged
merged 1 commit into from
Apr 17, 2025
Merged

Make inserts and reorg handling atomic #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 5 additions & 6 deletions internal/orchestrator/committer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,18 +168,17 @@ func (c *Committer) commit(blockData []common.BlockData) error {
}
log.Debug().Msgf("Committing %d blocks", len(blockNumbers))

if err := c.storage.MainStorage.InsertBlockData(blockData); err != nil {
log.Error().Err(err).Msgf("Failed to commit blocks: %v", blockNumbers)
return fmt.Errorf("error saving data to main storage: %v", err)
}

go func() {
if err := c.publisher.PublishBlockData(blockData); err != nil {
log.Error().Err(err).Msg("Failed to publish block data to kafka")
}
}()

// TODO if next parts (saving or deleting) fail, we'll have to do a rollback
if err := c.storage.MainStorage.InsertBlockData(blockData); err != nil {
log.Error().Err(err).Msgf("Failed to commit blocks: %v", blockNumbers)
return fmt.Errorf("error saving data to main storage: %v", err)
}

if err := c.storage.StagingStorage.DeleteStagingData(blockData); err != nil {
return fmt.Errorf("error deleting data from staging storage: %v", err)
}
Expand Down
9 changes: 3 additions & 6 deletions internal/orchestrator/reorg_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,13 +281,10 @@ func (rh *ReorgHandler) handleReorg(reorgedBlockNumbers []*big.Int) error {
})
blocksToDelete = append(blocksToDelete, result.BlockNumber)
}
// TODO make delete and insert atomic
deletedBlockData, err := rh.storage.MainStorage.DeleteBlockData(rh.rpc.GetChainID(), blocksToDelete)

deletedBlockData, err := rh.storage.MainStorage.ReplaceBlockData(data)
if err != nil {
return fmt.Errorf("error deleting data for blocks %v: %w", blocksToDelete, err)
}
if err := rh.storage.MainStorage.InsertBlockData(data); err != nil {
return fmt.Errorf("error saving data to main storage: %w", err)
return fmt.Errorf("error replacing reorged data for blocks %v: %w", blocksToDelete, err)
}
if rh.publisher != nil {
// Publish block data asynchronously
Expand Down
22 changes: 6 additions & 16 deletions internal/orchestrator/reorg_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,7 @@ func TestHandleReorg(t *testing.T) {
})
mockOrchestratorStorage.EXPECT().GetLastReorgCheckedBlockNumber(big.NewInt(1)).Return(big.NewInt(3), nil)

mockMainStorage.EXPECT().DeleteBlockData(big.NewInt(1), mock.Anything).Return([]common.BlockData{}, nil)
mockMainStorage.EXPECT().InsertBlockData(mock.Anything).Return(nil)
mockMainStorage.EXPECT().ReplaceBlockData(mock.Anything).Return([]common.BlockData{}, nil)

handler := NewReorgHandler(mockRPC, mockStorage)
err := handler.handleReorg([]*big.Int{big.NewInt(1), big.NewInt(2), big.NewInt(3)})
Expand Down Expand Up @@ -611,12 +610,9 @@ func TestHandleReorgWithSingleBlockReorg(t *testing.T) {
{BlockNumber: big.NewInt(105), Data: common.BlockData{}},
})

mockMainStorage.EXPECT().DeleteBlockData(big.NewInt(1), mock.MatchedBy(func(blocks []*big.Int) bool {
mockMainStorage.EXPECT().ReplaceBlockData(mock.MatchedBy(func(blocks []common.BlockData) bool {
return len(blocks) == 1
})).Return([]common.BlockData{}, nil)
mockMainStorage.EXPECT().InsertBlockData(mock.MatchedBy(func(data []common.BlockData) bool {
return len(data) == 1
})).Return(nil)

handler := NewReorgHandler(mockRPC, mockStorage)
mostRecentBlockChecked, err := handler.RunFromBlock(big.NewInt(99))
Expand Down Expand Up @@ -679,12 +675,9 @@ func TestHandleReorgWithLatestBlockReorged(t *testing.T) {
{BlockNumber: big.NewInt(108), Data: common.BlockData{}},
})

mockMainStorage.EXPECT().DeleteBlockData(big.NewInt(1), mock.MatchedBy(func(blocks []*big.Int) bool {
return len(blocks) == 8
})).Return([]common.BlockData{}, nil)
mockMainStorage.EXPECT().InsertBlockData(mock.MatchedBy(func(data []common.BlockData) bool {
mockMainStorage.EXPECT().ReplaceBlockData(mock.MatchedBy(func(data []common.BlockData) bool {
return len(data) == 8
})).Return(nil)
})).Return([]common.BlockData{}, nil)

handler := NewReorgHandler(mockRPC, mockStorage)
mostRecentBlockChecked, err := handler.RunFromBlock(big.NewInt(99))
Expand Down Expand Up @@ -743,12 +736,9 @@ func TestHandleReorgWithManyBlocks(t *testing.T) {
{BlockNumber: big.NewInt(103), Data: common.BlockData{}},
})

mockMainStorage.EXPECT().DeleteBlockData(big.NewInt(1), mock.MatchedBy(func(blocks []*big.Int) bool {
return len(blocks) == 5
})).Return([]common.BlockData{}, nil)
mockMainStorage.EXPECT().InsertBlockData(mock.MatchedBy(func(data []common.BlockData) bool {
mockMainStorage.EXPECT().ReplaceBlockData(mock.MatchedBy(func(data []common.BlockData) bool {
return len(data) == 5
})).Return(nil)
})).Return([]common.BlockData{}, nil)

handler := NewReorgHandler(mockRPC, mockStorage)
mostRecentBlockChecked, err := handler.RunFromBlock(big.NewInt(99))
Expand Down
Loading