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.

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

WIP: Integrate FIP0013 #6235

Merged
merged 46 commits into from
May 26, 2021
Merged
Show file tree
Hide file tree
Changes from 45 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
506f39b
WIP: Integrate FIP0013
magik6k Mar 10, 2021
5f8c805
Update to latest actors and FFI
arajasek May 17, 2021
8f42f37
Update ffi
magik6k May 17, 2021
6278bdc
Make things build
magik6k May 17, 2021
578bef4
Update gen
magik6k May 17, 2021
2afe725
Get PreCommitting to work
magik6k May 17, 2021
ba2032c
Fix some aggregation bugs
magik6k May 17, 2021
febf7cf
sane config defaults
vyzo May 18, 2021
357c086
proper config for termination batching and commit wait
vyzo May 18, 2021
e56960f
Merge pull request #6281 from filecoin-project/feat/fip-0013-addenda
magik6k May 18, 2021
fe9311e
update ffi
magik6k May 18, 2021
74bad49
correctly handle commit batch timer
vyzo May 18, 2021
6b3e04b
cache sector deadlines.
vyzo May 18, 2021
7512748
wire in sealing config values
vyzo May 18, 2021
c544f4c
avoid extraneous rpc call for storage start epoch
vyzo May 18, 2021
5614520
Merge pull request #6282 from filecoin-project/feat/fip-0013-addenda
magik6k May 18, 2021
c7ba083
Import precommit batcher
magik6k May 18, 2021
81b5d8c
Make things build with both batchers
magik6k May 18, 2021
d92c5e1
Missing precommit batcher
magik6k May 18, 2021
f66b9c5
Maybe working precommit batching
magik6k May 18, 2021
1946d2f
Wire up Precommit Batching
magik6k May 18, 2021
9690bc8
Test to trigger batching logic
magik6k May 18, 2021
e400bdf
Order proofs before aggregation
magik6k May 18, 2021
0419c64
CLI for precommit batching
magik6k May 18, 2021
dd393b4
Fix aggregation inputs
magik6k May 18, 2021
5112b9f
Lower default batch slack
magik6k May 18, 2021
2a0c0e3
Working default batching config
magik6k May 19, 2021
eafaf6d
Don't block on batching in node tests
magik6k May 19, 2021
a5677d1
ffiwrapper: Separate Prover interface
magik6k May 19, 2021
2a1b359
config: fmt
magik6k May 19, 2021
e088c71
marketadapter: Handle batch sealing messages
magik6k May 19, 2021
5113936
sealing: Handle full batches correctly
magik6k May 19, 2021
44bf9bf
tests: Better state logging in pledgeSectors
magik6k May 20, 2021
7edffcd
Update ffi
magik6k May 20, 2021
678812f
gofmt, lint
magik6k May 20, 2021
bb889a5
sealing: Fix max commit batch size check
magik6k May 20, 2021
d71334c
Address self-review
magik6k May 20, 2021
f3fda4a
Better asserts in TestPledgeBatching
magik6k May 20, 2021
13ff6ed
Test pledging before nv13 upgrade
magik6k May 20, 2021
e3255a0
sealing: Add missing states to SubmitPreCommitBatch planner
magik6k May 20, 2021
f540984
Some review addressing
magik6k May 25, 2021
d90ab2b
config: Document batching fields
magik6k May 25, 2021
04658e1
fix lint
magik6k May 25, 2021
7bd0fcb
sealing: Don't start batch timers with empty batches
magik6k May 25, 2021
4c6c9a0
Fix windowpost/deadline tests
magik6k May 25, 2021
fc76a09
mock: Use real aggregate lengths
magik6k May 26, 2021
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
10 changes: 10 additions & 0 deletions api/api_storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,16 @@ type StorageMiner interface {
// SectorTerminatePending returns a list of pending sector terminations to be sent in the next batch message
SectorTerminatePending(ctx context.Context) ([]abi.SectorID, error) //perm:admin
SectorMarkForUpgrade(ctx context.Context, id abi.SectorNumber) error //perm:admin
// SectorPreCommitFlush immediately sends a PreCommit message with sectors batched for PreCommit.
// Returns null if message wasn't sent
SectorPreCommitFlush(ctx context.Context) (*cid.Cid, error) //perm:admin
// SectorPreCommitPending returns a list of pending PreCommit sectors to be sent in the next batch message
SectorPreCommitPending(ctx context.Context) ([]abi.SectorID, error) //perm:admin
// SectorCommitFlush immediately sends a Commit message with sectors aggregated for Commit.
// Returns null if message wasn't sent
SectorCommitFlush(ctx context.Context) (*cid.Cid, error) //perm:admin
// SectorCommitPending returns a list of pending Commit sectors to be sent in the next aggregate message
SectorCommitPending(ctx context.Context) ([]abi.SectorID, error) //perm:admin

// WorkerConnect tells the node to connect to workers RPC
WorkerConnect(context.Context, string) error //perm:admin retry:true
Expand Down
24 changes: 24 additions & 0 deletions api/apistruct/struct.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/test/deadlines.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func TestDeadlineToggling(t *testing.T, b APIBuilder, blocktime time.Duration) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

n, sn := b(t, []FullNodeOpts{FullNodeWithLatestActorsAt(upgradeH)}, OneMiner)
n, sn := b(t, []FullNodeOpts{FullNodeWithV4ActorsAt(upgradeH)}, OneMiner)

client := n[0].FullNode.(*impl.FullNodeAPI)
minerA := sn[0]
Expand Down
2 changes: 2 additions & 0 deletions api/test/deals.go
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,8 @@ func startSealingWaiting(t *testing.T, ctx context.Context, miner TestStorageNod
require.NoError(t, miner.SectorStartSealing(ctx, snum))
}
}

flushSealingBatches(t, ctx, miner)
}

func testRetrieval(t *testing.T, ctx context.Context, client api.FullNode, fcid cid.Cid, piece *cid.Cid, carExport bool, data []byte) {
Expand Down
Loading