mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-08-31 21:27:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

add logic to propagate extended commits (#8433)

Browse Source
This commit is contained in:
Callum Waters
2022-10-24 12:30:52 +02:00
parent c095798bd9
commit 574fc51efa
16 changed files with 345 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
store/store.go
+21 -15
View File
@@ -313,8 +313,12 @@ func (bs *BlockStore) PruneBlocks(height int64) (uint64, error) {
// tries to access missing blocks.
bs.mtx.Lock()
bs.base = base
bss := &tmstore.BlockStoreState{
Base: bs.base,
Height: bs.height,
}
bs.mtx.Unlock()
bs.saveState()
SaveBlockStoreState(batch, bss)
err := batch.WriteSync()
if err != nil {
@@ -401,7 +405,7 @@ func (bs *BlockStore) SaveBlockWithExtendedCommit(block *types.Block, blockParts
panic("BlockStore can only save a non-nil block")
}
if err := seenExtendedCommit.EnsureExtensions(); err != nil {
panic(fmt.Errorf("saving block with extensions: %w", err))
panic(fmt.Errorf("saving block without extensions: %w", err))
}
batch := bs.db.NewBatch()
if err := bs.saveBlockToBatch(batch, block, blockParts, seenExtendedCommit.ToCommit()); err != nil {
@@ -479,6 +483,18 @@ func (bs *BlockStore) saveBlockToBatch(batch dbm.Batch, block *types.Block, bloc
return err
}
bs.mtx.Lock()
bs.height = height
if bs.base == 0 {
bs.base = height
}
bss := &tmstore.BlockStoreState{
Base: bs.base,
Height: bs.height,
}
bs.mtx.Unlock()
SaveBlockStoreState(batch, bss)
return nil
}
@@ -493,16 +509,6 @@ func (bs *BlockStore) saveBlockPart(height int64, index int, part *types.Part, b
}
}
func (bs *BlockStore) saveState() {
bs.mtx.RLock()
bss := tmstore.BlockStoreState{
Base: bs.base,
Height: bs.height,
}
bs.mtx.RUnlock()
SaveBlockStoreState(&bss, bs.db)
}
// SaveSeenCommit saves a seen commit, used by e.g. the state sync reactor when bootstrapping node.
func (bs *BlockStore) SaveSeenCommit(height int64, seenCommit *types.Commit) error {
pbc := seenCommit.ToProto()
@@ -548,12 +554,12 @@ func calcExtCommitKey(height int64) []byte {
var blockStoreKey = []byte("blockStore")
// SaveBlockStoreState persists the blockStore state to the database.
func SaveBlockStoreState(bsj *tmstore.BlockStoreState, db dbm.DB) {
bytes, err := proto.Marshal(bsj)
func SaveBlockStoreState(batch dbm.Batch, bss *tmstore.BlockStoreState) {
bytes, err := proto.Marshal(bss)
if err != nil {
panic(fmt.Sprintf("Could not marshal state bytes: %v", err))
}
if err := db.SetSync(blockStoreKey, bytes); err != nil {
if err := batch.Set(blockStoreKey, bytes); err != nil {
panic(err)
}
}
store/store_test.go
+35 -30
View File
@@ -51,7 +51,7 @@ func makeTestExtCommit(height int64, timestamp time.Time) *types.ExtendedCommit
}
}
func makeStateAndBlockStore(t *testing.T) (sm.State, *BlockStore) {
func makeStateAndBlockStore(t *testing.T) (sm.State, dbm.DB, *BlockStore) {
config := cfg.ResetTestRoot("blockchain_reactor_test")
t.Cleanup(func() { os.RemoveAll(config.RootDir) })
@@ -64,7 +64,7 @@ func makeStateAndBlockStore(t *testing.T) (sm.State, *BlockStore) {
if err != nil {
panic(fmt.Errorf("error constructing state from genesis file: %w", err))
}
return state, NewBlockStore(blockDB)
return state, blockDB, NewBlockStore(blockDB)
}
func TestLoadBlockStoreState(t *testing.T) {
@@ -84,7 +84,10 @@ func TestLoadBlockStoreState(t *testing.T) {
for _, tc := range testCases {
db := dbm.NewMemDB()
SaveBlockStoreState(tc.bss, db)
batch := db.NewBatch()
SaveBlockStoreState(batch, tc.bss)
batch.WriteSync()
batch.Close()
retrBSJ := LoadBlockStoreState(db)
assert.Equal(t, tc.want, retrBSJ, "expected the retrieved DBs to match: %s", tc.testName)
}
@@ -127,19 +130,14 @@ func TestNewBlockStore(t *testing.T) {
assert.Equal(t, bs.Height(), int64(0), "expecting empty bytes to be unmarshaled alright")
}
func freshBlockStore() (*BlockStore, dbm.DB) {
db := dbm.NewMemDB()
return NewBlockStore(db), db
}
var (
state sm.State
block *types.Block
partSet *types.PartSet
part1 *types.Part
part2 *types.Part
seenCommit1 *types.Commit
)
// var (
// state sm.State
// block *types.Block
// partSet *types.PartSet
// part1 *types.Part
// part2 *types.Part
// seenCommit1 *types.Commit
// )
// func TestMain(m *testing.M) {
// var cleanup cleanupFunc
@@ -162,7 +160,7 @@ var (
// TODO: This test should be simplified ...
func TestBlockStoreSaveLoadBlock(t *testing.T) {
state, bs := makeStateAndBlockStore(t)
state, _, bs := makeStateAndBlockStore(t)
require.Equal(t, bs.Base(), int64(0), "initially the base should be zero")
require.Equal(t, bs.Height(), int64(0), "initially the height should be zero")
@@ -178,13 +176,14 @@ func TestBlockStoreSaveLoadBlock(t *testing.T) {
block := state.MakeBlock(bs.Height()+1, nil, new(types.Commit), nil, state.Validators.GetProposer().Address)
validPartSet, err := block.MakePartSet(2)
require.NoError(t, err)
seenCommit := makeTestExtCommit(10, tmtime.Now())
bs.SaveBlockWithExtendedCommit(block, partSet, seenCommit)
seenCommit := makeTestExtCommit(1, tmtime.Now())
bs.SaveBlockWithExtendedCommit(block, validPartSet, seenCommit)
require.EqualValues(t, 1, bs.Base(), "expecting the new height to be changed")
require.EqualValues(t, block.Header.Height, bs.Height(), "expecting the new height to be changed")
incompletePartSet := types.NewPartSetFromHeader(types.PartSetHeader{Total: 2})
uncontiguousPartSet := types.NewPartSetFromHeader(types.PartSetHeader{Total: 0})
part2 := validPartSet.GetPart(1)
_, err = uncontiguousPartSet.AddPart(part2)
require.Error(t, err)
@@ -238,9 +237,10 @@ func TestBlockStoreSaveLoadBlock(t *testing.T) {
},
{
block: newBlock(header1, commitAtH10),
parts: incompletePartSet,
wantPanic: "only save complete block", // incomplete parts
block: newBlock(header1, commitAtH10),
parts: incompletePartSet,
seenCommit: seenCommit,
wantPanic: "only save complete block", // incomplete parts
},
{
@@ -297,7 +297,7 @@ func TestBlockStoreSaveLoadBlock(t *testing.T) {
for i, tuple := range tuples {
tuple := tuple
bs, db := freshBlockStore()
_, db, bs := makeStateAndBlockStore(t)
// SaveBlock
res, err, panicErr := doFn(func() (interface{}, error) {
bs.SaveBlockWithExtendedCommit(tuple.block, tuple.parts, tuple.seenCommit)
@@ -392,7 +392,7 @@ func TestSaveBlockWithExtendedCommitPanicOnAbsentExtension(t *testing.T) {
},
} {
t.Run(testCase.name, func(t *testing.T) {
state, bs := makeStateAndBlockStore(t)
state, _, bs := makeStateAndBlockStore(t)
block := test.MakeBlock(state)
seenCommit := makeTestExtCommit(block.Header.Height, tmtime.Now())
ps, err := block.MakePartSet(2)
@@ -430,7 +430,7 @@ func TestLoadBlockExtendedCommit(t *testing.T) {
},
} {
t.Run(testCase.name, func(t *testing.T) {
state, bs := makeStateAndBlockStore(t)
state, _, bs := makeStateAndBlockStore(t)
block := test.MakeBlock(state)
seenCommit := makeTestExtCommit(block.Header.Height, tmtime.Now())
ps, err := block.MakePartSet(2)
@@ -477,13 +477,18 @@ func TestLoadBaseMeta(t *testing.T) {
}
func TestLoadBlockPart(t *testing.T) {
bs, db := freshBlockStore()
state, db, bs := makeStateAndBlockStore(t)
height, index := int64(10), 1
loadPart := func() (interface{}, error) {
part := bs.LoadBlockPart(height, index)
return part, nil
}
block := state.MakeBlock(state.LastBlockHeight+1, test.MakeNTxs(state.LastBlockHeight+1, 10), new(types.Commit), nil, state.Validators.GetProposer().Address)
partSet, err := block.MakePartSet(2)
require.NoError(t, err)
part1 := partSet.GetPart(0)
// Initially no contents.
// 1. Requesting for a non-existent block shouldn't fail
res, _, panicErr := doFn(loadPart)
@@ -491,7 +496,7 @@ func TestLoadBlockPart(t *testing.T) {
require.Nil(t, res, "a non-existent block part should return nil")
// 2. Next save a corrupted block then try to load it
err := db.Set(calcBlockPartKey(height, index), []byte("Tendermint"))
err = db.Set(calcBlockPartKey(height, index), []byte("Tendermint"))
require.NoError(t, err)
res, _, panicErr = doFn(loadPart)
require.NotNil(t, panicErr, "expecting a non-nil panic")
@@ -601,7 +606,7 @@ func TestPruneBlocks(t *testing.T) {
}
func TestLoadBlockMeta(t *testing.T) {
bs, db := freshBlockStore()
_, db, bs := makeStateAndBlockStore(t)
height := int64(10)
loadMeta := func() (interface{}, error) {
meta := bs.LoadBlockMeta(height)
@@ -662,13 +667,13 @@ func TestLoadBlockMetaByHash(t *testing.T) {
}
func TestBlockFetchAtHeight(t *testing.T) {
state, bs := makeStateAndBlockStore(t)
state, _, bs := makeStateAndBlockStore(t)
require.Equal(t, bs.Height(), int64(0), "initially the height should be zero")
block := state.MakeBlock(bs.Height()+1, nil, new(types.Commit), nil, state.Validators.GetProposer().Address)
partSet, err := block.MakePartSet(2)
require.NoError(t, err)
seenCommit := makeTestExtCommit(10, tmtime.Now())
seenCommit := makeTestExtCommit(block.Height, tmtime.Now())
bs.SaveBlockWithExtendedCommit(block, partSet, seenCommit)
require.Equal(t, bs.Height(), block.Header.Height, "expecting the new height to be changed")