cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

driver: option for VM flushing.

Browse Source
This commit is contained in:
Raúl Kripalani 2020-09-27 20:55:09 +01:00
parent a712c109d8
commit f5f23f7291
3 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/tvx/extract.go
View File

@ -164,7 +164,9 @@ func runExtract(_ *cli.Context) error {
g = NewSurgeon(ctx, api, pst) g = NewSurgeon(ctx, api, pst)
) )
driver := conformance.NewDriver(ctx, schema.Selector{}) driver := conformance.NewDriver(ctx, schema.Selector{}, conformance.DriverOpts{
DisableVMFlush: true,
})
// this is the root of the state tree we start with. // this is the root of the state tree we start with.
root := incTs.ParentState() root := incTs.ParentState()

35
conformance/driver.go
View File

@ -33,10 +33,24 @@ var (
type Driver struct { type Driver struct {
ctx context.Context ctx context.Context
selector schema.Selector selector schema.Selector
vmFlush bool
} }
func NewDriver(ctx context.Context, selector schema.Selector) *Driver { type DriverOpts struct {
return &Driver{ctx: ctx, selector: selector} // DisableVMFlush, when true, avoids calling VM.Flush(), forces a blockstore
// recursive copy, from the temporary buffer blockstore, to the real
// system's blockstore. Disabling VM flushing is useful when extracting test
// vectors and trimming state, as we don't want to force an accidental
// deep copy of the state tree.
//
// Disabling VM flushing almost always should go hand-in-hand with
// LOTUS_DISABLE_VM_BUF=iknowitsabadidea. That way, state tree writes are
// immediately committed to the blockstore.
DisableVMFlush bool
}
func NewDriver(ctx context.Context, selector schema.Selector, opts DriverOpts) *Driver {
return &Driver{ctx: ctx, selector: selector, vmFlush: !opts.DisableVMFlush}
} }
type ExecuteTipsetResult struct { type ExecuteTipsetResult struct {
@ -155,12 +169,17 @@ func (d *Driver) ExecuteMessage(bs blockstore.Blockstore, preroot cid.Cid, epoch
return nil, cid.Undef, err return nil, cid.Undef, err
} }
// do not flush the VM, as this forces a recursive copy to the blockstore, var root cid.Cid
// walking the full state tree, which we don't require. if d.vmFlush {
// root, err := lvm.Flush(d.ctx) // flush the VM, committing the state tree changes and forcing a
// // recursive copoy from the temporary blcokstore to the real blockstore.
// instead, flush the pending writes on the state tree. root, err = lvm.Flush(d.ctx)
root, err := lvm.StateTree().(*state.StateTree).Flush(d.ctx) } else {
// do not flush the VM, just the state tree; this should be used with
// LOTUS_DISABLE_VM_BUF enabled, so writes will anyway be visible.
root, err = lvm.StateTree().(*state.StateTree).Flush(d.ctx)
}
return ret, root, err return ret, root, err
} }

4
conformance/runner.go
View File

@ -43,7 +43,7 @@ func ExecuteMessageVector(r Reporter, vector *schema.TestVector) {
} }
// Create a new Driver. // Create a new Driver.
driver := NewDriver(ctx, vector.Selector) driver := NewDriver(ctx, vector.Selector, DriverOpts{})
// Apply every message. // Apply every message.
for i, m := range vector.ApplyMessages { for i, m := range vector.ApplyMessages {
@ -93,7 +93,7 @@ func ExecuteTipsetVector(r Reporter, vector *schema.TestVector) {
} }
// Create a new Driver. // Create a new Driver.
driver := NewDriver(ctx, vector.Selector) driver := NewDriver(ctx, vector.Selector, DriverOpts{})
// Apply every tipset. // Apply every tipset.
var receiptsIdx int var receiptsIdx int