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

Backport: feat: sealing: Switch to calling PreCommitSectorBatch2 #11215

Merged
merged 9 commits into from
Aug 29, 2023
Merged

Backport: feat: sealing: Switch to calling PreCommitSectorBatch2 #11215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7db6f31
sealing: pc batch: Call PreCommitSectorBatch2
magik6k Aug 8, 2023
d6aed7b
pc batch: drop individual precommit processing
magik6k Aug 8, 2023
79b6ffe
ci: Drop legacy cc-replace itests
magik6k Aug 8, 2023
ecb6dee
sealing pipeline: Drop legacy single-pc1 submit path
magik6k Aug 8, 2023
1c447b2
sealing pipeline: Fix unit tests
magik6k Aug 8, 2023
556815f
sealing pipeline: Set commd in precommit params
magik6k Aug 8, 2023
3887bf9
sealing pipeline: Only set pc commd when deals are present
magik6k Aug 8, 2023
d94b1ca
itests: Drop sealing itests for legacy network versions
magik6k Aug 8, 2023
2ebd080
itests: Port deadline-toggling itest to nv20
magik6k Aug 9, 2023
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
36 changes: 0 additions & 36 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,12 +545,6 @@ workflows:
- build
suite: itest-batch_deal
target: "./itests/batch_deal_test.go"
- test:
name: test-itest-ccupgrade
requires:
- build
suite: itest-ccupgrade
target: "./itests/ccupgrade_test.go"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a bit surprised t see t tests being removed 👁️

Copy link
Contributor Author

@magik6k magik6k Aug 29, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the extremely old replace-sector-with-another-sector CC upgrade, not snapdeals.

It's not even supported in actors anymore

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Woah

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh that right thanks

- test:
name: test-itest-cli
requires:
Expand Down Expand Up @@ -876,12 +870,6 @@ workflows:
- build
suite: itest-remove_verifreg_datacap
target: "./itests/remove_verifreg_datacap_test.go"
- test:
name: test-itest-sdr_upgrade
requires:
- build
suite: itest-sdr_upgrade
target: "./itests/sdr_upgrade_test.go"
- test:
name: test-itest-sealing_resources
requires:
Expand All @@ -906,12 +894,6 @@ workflows:
- build
suite: itest-sector_import_simple
target: "./itests/sector_import_simple_test.go"
- test:
name: test-itest-sector_make_cc_avail
requires:
- build
suite: itest-sector_make_cc_avail
target: "./itests/sector_make_cc_avail_test.go"
- test:
name: test-itest-sector_miner_collateral
requires:
Expand All @@ -930,18 +912,6 @@ workflows:
- build
suite: itest-sector_pledge
target: "./itests/sector_pledge_test.go"
- test:
name: test-itest-sector_prefer_no_upgrade
requires:
- build
suite: itest-sector_prefer_no_upgrade
target: "./itests/sector_prefer_no_upgrade_test.go"
- test:
name: test-itest-sector_revert_available
requires:
- build
suite: itest-sector_revert_available
target: "./itests/sector_revert_available_test.go"
- test:
name: test-itest-sector_terminate
requires:
Expand All @@ -966,12 +936,6 @@ workflows:
- build
suite: itest-splitstore
target: "./itests/splitstore_test.go"
- test:
name: test-itest-tape
requires:
- build
suite: itest-tape
target: "./itests/tape_test.go"
- test:
name: test-itest-verifreg
requires:
Expand Down
9 changes: 2 additions & 7 deletions documentation/en/default-lotus-miner-config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,12 +581,6 @@
# env var: LOTUS_SEALING_DISABLECOLLATERALFALLBACK
#DisableCollateralFallback = false

# enable / disable precommit batching (takes effect after nv13)
#
# type: bool
# env var: LOTUS_SEALING_BATCHPRECOMMITS
#BatchPreCommits = true

# maximum precommit batch size - batches will be sent immediately above this size
#
# type: int
Expand Down Expand Up @@ -636,7 +630,8 @@
#CommitBatchSlack = "1h0m0s"

# network BaseFee below which to stop doing precommit batching, instead
# sending precommit messages to the chain individually
# sending precommit messages to the chain individually. When the basefee is
# below this threshold, precommit messages will get sent out immediately.
#
# type: types.FIL
# env var: LOTUS_SEALING_BATCHPRECOMMITABOVEBASEFEE
Expand Down
1 change: 0 additions & 1 deletion itests/batch_deal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ func TestBatchDealInput(t *testing.T) {
sc.MaxSealingSectorsForDeals = 3
sc.AlwaysKeepUnsealedCopy = true
sc.WaitDealsDelay = time.Hour
sc.BatchPreCommits = false
sc.AggregateCommits = false

return sc, nil
Expand Down
131 changes: 0 additions & 131 deletions itests/ccupgrade_test.go
View file
Open in desktop

This file was deleted.

Loading