2021-06-18 18:45:29 +00:00
|
|
|
package kit
|
2021-06-11 17:26:25 +00:00
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
2021-09-06 15:39:35 +00:00
|
|
|
"errors"
|
2021-06-23 17:13:29 +00:00
|
|
|
"fmt"
|
2021-06-11 17:26:25 +00:00
|
|
|
"io/ioutil"
|
2021-06-13 23:10:37 +00:00
|
|
|
"os"
|
2021-09-06 15:39:35 +00:00
|
|
|
"strings"
|
2021-06-11 17:26:25 +00:00
|
|
|
"testing"
|
|
|
|
"time"
|
|
|
|
|
2021-11-10 16:28:23 +00:00
|
|
|
"github.com/filecoin-project/go-fil-markets/shared_testutil"
|
2021-06-11 17:26:25 +00:00
|
|
|
"github.com/filecoin-project/go-fil-markets/storagemarket"
|
|
|
|
"github.com/filecoin-project/go-state-types/abi"
|
|
|
|
"github.com/filecoin-project/lotus/api"
|
|
|
|
"github.com/filecoin-project/lotus/build"
|
|
|
|
"github.com/filecoin-project/lotus/chain/types"
|
|
|
|
sealing "github.com/filecoin-project/lotus/extern/storage-sealing"
|
2021-06-23 17:13:29 +00:00
|
|
|
"github.com/ipfs/go-cid"
|
|
|
|
files "github.com/ipfs/go-ipfs-files"
|
2021-06-11 17:26:25 +00:00
|
|
|
ipld "github.com/ipfs/go-ipld-format"
|
|
|
|
dag "github.com/ipfs/go-merkledag"
|
|
|
|
dstest "github.com/ipfs/go-merkledag/test"
|
|
|
|
unixfile "github.com/ipfs/go-unixfs/file"
|
2021-06-23 17:13:29 +00:00
|
|
|
"github.com/ipld/go-car"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"golang.org/x/sync/errgroup"
|
2021-06-11 17:26:25 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
type DealHarness struct {
|
|
|
|
t *testing.T
|
|
|
|
client *TestFullNode
|
2021-06-23 09:24:55 +00:00
|
|
|
main *TestMiner
|
|
|
|
market *TestMiner
|
2021-06-11 17:26:25 +00:00
|
|
|
}
|
|
|
|
|
2021-06-14 04:10:34 +00:00
|
|
|
type MakeFullDealParams struct {
|
integrate DAG store and CARv2 in deal-making (#6671)
This commit removes badger from the deal-making processes, and
moves to a new architecture with the dagstore as the cental
component on the miner-side, and CARv2s on the client-side.
Every deal that has been handed off to the sealing subsystem becomes
a shard in the dagstore. Shards are mounted via the LotusMount, which
teaches the dagstore how to load the related piece when serving
retrievals.
When the miner starts the Lotus for the first time with this patch,
we will perform a one-time migration of all active deals into the
dagstore. This is a lightweight process, and it consists simply
of registering the shards in the dagstore.
Shards are backed by the unsealed copy of the piece. This is currently
a CARv1. However, the dagstore keeps CARv2 indices for all pieces, so
when it's time to acquire a shard to serve a retrieval, the unsealed
CARv1 is joined with its index (safeguarded by the dagstore), to form
a read-only blockstore, thus taking the place of the monolithic
badger.
Data transfers have been adjusted to interface directly with CARv2 files.
On inbound transfers (client retrievals, miner storage deals), we stream
the received data into a CARv2 ReadWrite blockstore. On outbound transfers
(client storage deals, miner retrievals), we serve the data off a CARv2
ReadOnly blockstore.
Client-side imports are managed by the refactored *imports.Manager
component (when not using IPFS integration). Just like it before, we use
the go-filestore library to avoid duplicating the data from the original
file in the resulting UnixFS DAG (concretely the leaves). However, the
target of those imports are what we call "ref-CARv2s": CARv2 files placed
under the `$LOTUS_PATH/imports` directory, containing the intermediate
nodes in full, and the leaves as positional references to the original file
on disk.
Client-side retrievals are placed into CARv2 files in the location:
`$LOTUS_PATH/retrievals`.
A new set of `Dagstore*` JSON-RPC operations and `lotus-miner dagstore`
subcommands have been introduced on the miner-side to inspect and manage
the dagstore.
Despite moving to a CARv2-backed system, the IPFS integration has been
respected, and it continues to be possible to make storage deals with data
held in an IPFS node, and to perform retrievals directly into an IPFS node.
NOTE: because the "staging" and "client" Badger blockstores are no longer
used, existing imports on the client will be rendered useless. On startup,
Lotus will enumerate all imports and print WARN statements on the log for
each import that needs to be reimported. These log lines contain these
messages:
- import lacks carv2 path; import will not work; please reimport
- import has missing/broken carv2; please reimport
At the end, we will print a "sanity check completed" message indicating
the count of imports found, and how many were deemed broken.
Co-authored-by: Aarsh Shah <aarshkshah1992@gmail.com>
Co-authored-by: Dirk McCormick <dirkmdev@gmail.com>
Co-authored-by: Raúl Kripalani <raul@protocol.ai>
Co-authored-by: Dirk McCormick <dirkmdev@gmail.com>
2021-08-16 22:34:32 +00:00
|
|
|
Rseed int
|
|
|
|
FastRet bool
|
|
|
|
StartEpoch abi.ChainEpoch
|
|
|
|
UseCARFileForStorageDeal bool
|
2021-06-23 18:14:27 +00:00
|
|
|
|
|
|
|
// SuspendUntilCryptoeconStable suspends deal-making, until cryptoecon
|
|
|
|
// parameters are stabilised. This affects projected collateral, and tests
|
|
|
|
// will fail in network version 13 and higher if deals are started too soon
|
|
|
|
// after network birth.
|
|
|
|
//
|
|
|
|
// The reason is that the formula for collateral calculation takes
|
|
|
|
// circulating supply into account:
|
|
|
|
//
|
|
|
|
// [portion of power this deal will be] * [~1% of tokens].
|
|
|
|
//
|
|
|
|
// In the first epochs after genesis, the total circulating supply is
|
|
|
|
// changing dramatically in percentual terms. Therefore, if the deal is
|
|
|
|
// proposed too soon, by the time it gets published on chain, the quoted
|
|
|
|
// provider collateral will no longer be valid.
|
|
|
|
//
|
|
|
|
// The observation is that deals fail with:
|
|
|
|
//
|
|
|
|
// GasEstimateMessageGas error: estimating gas used: message execution
|
|
|
|
// failed: exit 16, reason: Provider collateral out of bounds. (RetCode=16)
|
|
|
|
//
|
|
|
|
// Enabling this will suspend deal-making until the network has reached a
|
2021-06-23 18:21:42 +00:00
|
|
|
// height of 300.
|
2021-06-23 18:14:27 +00:00
|
|
|
SuspendUntilCryptoeconStable bool
|
2021-06-14 04:10:34 +00:00
|
|
|
}
|
|
|
|
|
2021-06-11 17:26:25 +00:00
|
|
|
// NewDealHarness creates a test harness that contains testing utilities for deals.
|
2021-06-23 09:24:55 +00:00
|
|
|
func NewDealHarness(t *testing.T, client *TestFullNode, main *TestMiner, market *TestMiner) *DealHarness {
|
2021-06-11 17:26:25 +00:00
|
|
|
return &DealHarness{
|
|
|
|
t: t,
|
|
|
|
client: client,
|
2021-06-23 09:24:55 +00:00
|
|
|
main: main,
|
|
|
|
market: market,
|
2021-06-11 17:26:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// MakeOnlineDeal makes an online deal, generating a random file with the
|
|
|
|
// supplied seed, and setting the specified fast retrieval flag and start epoch
|
|
|
|
// on the storage deal. It returns when the deal is sealed.
|
|
|
|
//
|
|
|
|
// TODO: convert input parameters to struct, and add size as an input param.
|
2021-06-21 17:19:26 +00:00
|
|
|
func (dh *DealHarness) MakeOnlineDeal(ctx context.Context, params MakeFullDealParams) (deal *cid.Cid, res *api.ImportRes, path string) {
|
integrate DAG store and CARv2 in deal-making (#6671)
This commit removes badger from the deal-making processes, and
moves to a new architecture with the dagstore as the cental
component on the miner-side, and CARv2s on the client-side.
Every deal that has been handed off to the sealing subsystem becomes
a shard in the dagstore. Shards are mounted via the LotusMount, which
teaches the dagstore how to load the related piece when serving
retrievals.
When the miner starts the Lotus for the first time with this patch,
we will perform a one-time migration of all active deals into the
dagstore. This is a lightweight process, and it consists simply
of registering the shards in the dagstore.
Shards are backed by the unsealed copy of the piece. This is currently
a CARv1. However, the dagstore keeps CARv2 indices for all pieces, so
when it's time to acquire a shard to serve a retrieval, the unsealed
CARv1 is joined with its index (safeguarded by the dagstore), to form
a read-only blockstore, thus taking the place of the monolithic
badger.
Data transfers have been adjusted to interface directly with CARv2 files.
On inbound transfers (client retrievals, miner storage deals), we stream
the received data into a CARv2 ReadWrite blockstore. On outbound transfers
(client storage deals, miner retrievals), we serve the data off a CARv2
ReadOnly blockstore.
Client-side imports are managed by the refactored *imports.Manager
component (when not using IPFS integration). Just like it before, we use
the go-filestore library to avoid duplicating the data from the original
file in the resulting UnixFS DAG (concretely the leaves). However, the
target of those imports are what we call "ref-CARv2s": CARv2 files placed
under the `$LOTUS_PATH/imports` directory, containing the intermediate
nodes in full, and the leaves as positional references to the original file
on disk.
Client-side retrievals are placed into CARv2 files in the location:
`$LOTUS_PATH/retrievals`.
A new set of `Dagstore*` JSON-RPC operations and `lotus-miner dagstore`
subcommands have been introduced on the miner-side to inspect and manage
the dagstore.
Despite moving to a CARv2-backed system, the IPFS integration has been
respected, and it continues to be possible to make storage deals with data
held in an IPFS node, and to perform retrievals directly into an IPFS node.
NOTE: because the "staging" and "client" Badger blockstores are no longer
used, existing imports on the client will be rendered useless. On startup,
Lotus will enumerate all imports and print WARN statements on the log for
each import that needs to be reimported. These log lines contain these
messages:
- import lacks carv2 path; import will not work; please reimport
- import has missing/broken carv2; please reimport
At the end, we will print a "sanity check completed" message indicating
the count of imports found, and how many were deemed broken.
Co-authored-by: Aarsh Shah <aarshkshah1992@gmail.com>
Co-authored-by: Dirk McCormick <dirkmdev@gmail.com>
Co-authored-by: Raúl Kripalani <raul@protocol.ai>
Co-authored-by: Dirk McCormick <dirkmdev@gmail.com>
2021-08-16 22:34:32 +00:00
|
|
|
if params.UseCARFileForStorageDeal {
|
|
|
|
res, _, path = dh.client.ClientImportCARFile(ctx, params.Rseed, 200)
|
|
|
|
} else {
|
|
|
|
res, path = dh.client.CreateImportFile(ctx, params.Rseed, 0)
|
|
|
|
}
|
2021-06-11 17:26:25 +00:00
|
|
|
|
|
|
|
dh.t.Logf("FILE CID: %s", res.Root)
|
|
|
|
|
2021-06-23 18:14:27 +00:00
|
|
|
if params.SuspendUntilCryptoeconStable {
|
|
|
|
dh.t.Logf("deal-making suspending until cryptecon parameters have stabilised")
|
2021-06-23 18:21:42 +00:00
|
|
|
ts := dh.client.WaitTillChain(ctx, HeightAtLeast(300))
|
2021-06-23 18:14:27 +00:00
|
|
|
dh.t.Logf("deal-making continuing; current height is %d", ts.Height())
|
|
|
|
}
|
|
|
|
|
2021-07-24 01:02:00 +00:00
|
|
|
dp := dh.DefaultStartDealParams()
|
|
|
|
dp.Data.Root = res.Root
|
|
|
|
dp.DealStartEpoch = params.StartEpoch
|
|
|
|
dp.FastRetrieval = params.FastRet
|
|
|
|
deal = dh.StartDeal(ctx, dp)
|
2021-06-11 17:26:25 +00:00
|
|
|
|
|
|
|
// TODO: this sleep is only necessary because deals don't immediately get logged in the dealstore, we should fix this
|
|
|
|
time.Sleep(time.Second)
|
|
|
|
dh.WaitDealSealed(ctx, deal, false, false, nil)
|
|
|
|
|
|
|
|
return deal, res, path
|
|
|
|
}
|
|
|
|
|
2021-07-24 01:02:00 +00:00
|
|
|
func (dh *DealHarness) DefaultStartDealParams() api.StartDealParams {
|
|
|
|
dp := api.StartDealParams{
|
|
|
|
Data: &storagemarket.DataRef{TransferType: storagemarket.TTGraphsync},
|
|
|
|
EpochPrice: types.NewInt(1000000),
|
|
|
|
MinBlocksDuration: uint64(build.MinDealDuration),
|
|
|
|
}
|
2021-06-11 17:26:25 +00:00
|
|
|
|
2021-07-24 01:02:00 +00:00
|
|
|
var err error
|
|
|
|
dp.Miner, err = dh.main.ActorAddress(context.Background())
|
2021-06-11 17:26:25 +00:00
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
2021-07-24 01:02:00 +00:00
|
|
|
dp.Wallet, err = dh.client.WalletDefaultAddress(context.Background())
|
2021-06-11 17:26:25 +00:00
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
2021-07-24 01:02:00 +00:00
|
|
|
return dp
|
|
|
|
}
|
|
|
|
|
|
|
|
// StartDeal starts a storage deal between the client and the miner.
|
|
|
|
func (dh *DealHarness) StartDeal(ctx context.Context, dealParams api.StartDealParams) *cid.Cid {
|
|
|
|
dealProposalCid, err := dh.client.ClientStartDeal(ctx, &dealParams)
|
|
|
|
require.NoError(dh.t, err)
|
|
|
|
return dealProposalCid
|
2021-06-11 17:26:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// WaitDealSealed waits until the deal is sealed.
|
|
|
|
func (dh *DealHarness) WaitDealSealed(ctx context.Context, deal *cid.Cid, noseal, noSealStart bool, cb func()) {
|
|
|
|
loop:
|
|
|
|
for {
|
|
|
|
di, err := dh.client.ClientGetDealInfo(ctx, *deal)
|
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
|
|
|
switch di.State {
|
|
|
|
case storagemarket.StorageDealAwaitingPreCommit, storagemarket.StorageDealSealing:
|
|
|
|
if noseal {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if !noSealStart {
|
|
|
|
dh.StartSealingWaiting(ctx)
|
|
|
|
}
|
|
|
|
case storagemarket.StorageDealProposalRejected:
|
|
|
|
dh.t.Fatal("deal rejected")
|
|
|
|
case storagemarket.StorageDealFailing:
|
|
|
|
dh.t.Fatal("deal failed")
|
|
|
|
case storagemarket.StorageDealError:
|
|
|
|
dh.t.Fatal("deal errored", di.Message)
|
|
|
|
case storagemarket.StorageDealActive:
|
|
|
|
dh.t.Log("COMPLETE", di)
|
|
|
|
break loop
|
|
|
|
}
|
|
|
|
|
2021-06-23 09:24:55 +00:00
|
|
|
mds, err := dh.market.MarketListIncompleteDeals(ctx)
|
2021-06-11 17:26:25 +00:00
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
|
|
|
var minerState storagemarket.StorageDealStatus
|
|
|
|
for _, md := range mds {
|
|
|
|
if md.DealID == di.DealID {
|
|
|
|
minerState = md.State
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
dh.t.Logf("Deal %d state: client:%s provider:%s\n", di.DealID, storagemarket.DealStates[di.State], storagemarket.DealStates[minerState])
|
|
|
|
time.Sleep(time.Second / 2)
|
|
|
|
if cb != nil {
|
|
|
|
cb()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-10-08 10:52:56 +00:00
|
|
|
// WaitDealSealedQuiet waits until the deal is sealed, without logging anything.
|
|
|
|
func (dh *DealHarness) WaitDealSealedQuiet(ctx context.Context, deal *cid.Cid, noseal, noSealStart bool, cb func()) {
|
|
|
|
loop:
|
|
|
|
for {
|
|
|
|
di, err := dh.client.ClientGetDealInfo(ctx, *deal)
|
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
|
|
|
switch di.State {
|
|
|
|
case storagemarket.StorageDealAwaitingPreCommit, storagemarket.StorageDealSealing:
|
|
|
|
if noseal {
|
|
|
|
return
|
|
|
|
}
|
|
|
|
if !noSealStart {
|
|
|
|
dh.StartSealingWaiting(ctx)
|
|
|
|
}
|
|
|
|
case storagemarket.StorageDealProposalRejected:
|
|
|
|
dh.t.Fatal("deal rejected")
|
|
|
|
case storagemarket.StorageDealFailing:
|
|
|
|
dh.t.Fatal("deal failed")
|
|
|
|
case storagemarket.StorageDealError:
|
|
|
|
dh.t.Fatal("deal errored", di.Message)
|
|
|
|
case storagemarket.StorageDealActive:
|
|
|
|
break loop
|
|
|
|
}
|
|
|
|
|
|
|
|
_, err = dh.market.MarketListIncompleteDeals(ctx)
|
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
|
|
|
time.Sleep(time.Second / 2)
|
|
|
|
if cb != nil {
|
|
|
|
cb()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-09-06 15:39:35 +00:00
|
|
|
func (dh *DealHarness) ExpectDealFailure(ctx context.Context, deal *cid.Cid, errs string) error {
|
|
|
|
for {
|
|
|
|
di, err := dh.client.ClientGetDealInfo(ctx, *deal)
|
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
|
|
|
switch di.State {
|
|
|
|
case storagemarket.StorageDealAwaitingPreCommit, storagemarket.StorageDealSealing:
|
|
|
|
return fmt.Errorf("deal is sealing, and we expected an error: %s", errs)
|
|
|
|
case storagemarket.StorageDealProposalRejected:
|
|
|
|
if strings.Contains(di.Message, errs) {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
return fmt.Errorf("unexpected error: %s ; expected: %s", di.Message, errs)
|
|
|
|
case storagemarket.StorageDealFailing:
|
|
|
|
if strings.Contains(di.Message, errs) {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
return fmt.Errorf("unexpected error: %s ; expected: %s", di.Message, errs)
|
|
|
|
case storagemarket.StorageDealError:
|
|
|
|
if strings.Contains(di.Message, errs) {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
return fmt.Errorf("unexpected error: %s ; expected: %s", di.Message, errs)
|
|
|
|
case storagemarket.StorageDealActive:
|
|
|
|
return errors.New("expected to get an error, but didn't get one")
|
|
|
|
}
|
|
|
|
|
|
|
|
mds, err := dh.market.MarketListIncompleteDeals(ctx)
|
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
|
|
|
var minerState storagemarket.StorageDealStatus
|
|
|
|
for _, md := range mds {
|
|
|
|
if md.DealID == di.DealID {
|
|
|
|
minerState = md.State
|
|
|
|
break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
dh.t.Logf("Deal %d state: client:%s provider:%s\n", di.DealID, storagemarket.DealStates[di.State], storagemarket.DealStates[minerState])
|
|
|
|
time.Sleep(time.Second / 2)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-06-13 23:10:37 +00:00
|
|
|
// WaitDealPublished waits until the deal is published.
|
2021-06-11 17:26:25 +00:00
|
|
|
func (dh *DealHarness) WaitDealPublished(ctx context.Context, deal *cid.Cid) {
|
|
|
|
subCtx, cancel := context.WithCancel(ctx)
|
|
|
|
defer cancel()
|
|
|
|
|
2021-06-23 09:24:55 +00:00
|
|
|
updates, err := dh.market.MarketGetDealUpdates(subCtx)
|
2021-06-11 17:26:25 +00:00
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
|
|
|
for {
|
|
|
|
select {
|
|
|
|
case <-ctx.Done():
|
|
|
|
dh.t.Fatal("context timeout")
|
|
|
|
case di := <-updates:
|
|
|
|
if deal.Equals(di.ProposalCid) {
|
|
|
|
switch di.State {
|
|
|
|
case storagemarket.StorageDealProposalRejected:
|
|
|
|
dh.t.Fatal("deal rejected")
|
|
|
|
case storagemarket.StorageDealFailing:
|
|
|
|
dh.t.Fatal("deal failed")
|
|
|
|
case storagemarket.StorageDealError:
|
|
|
|
dh.t.Fatal("deal errored", di.Message)
|
|
|
|
case storagemarket.StorageDealFinalizing, storagemarket.StorageDealAwaitingPreCommit, storagemarket.StorageDealSealing, storagemarket.StorageDealActive:
|
|
|
|
dh.t.Log("COMPLETE", di)
|
|
|
|
return
|
|
|
|
}
|
|
|
|
dh.t.Log("Deal state: ", storagemarket.DealStates[di.State])
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (dh *DealHarness) StartSealingWaiting(ctx context.Context) {
|
2021-06-23 09:24:55 +00:00
|
|
|
snums, err := dh.main.SectorsList(ctx)
|
2021-06-11 17:26:25 +00:00
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
|
|
|
for _, snum := range snums {
|
2021-06-23 09:24:55 +00:00
|
|
|
si, err := dh.main.SectorsStatus(ctx, snum, false)
|
2021-06-11 17:26:25 +00:00
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
|
|
|
dh.t.Logf("Sector state: %s", si.State)
|
|
|
|
if si.State == api.SectorState(sealing.WaitDeals) {
|
2021-06-23 09:24:55 +00:00
|
|
|
require.NoError(dh.t, dh.main.SectorStartSealing(ctx, snum))
|
2021-06-11 17:26:25 +00:00
|
|
|
}
|
|
|
|
|
2021-06-23 09:24:55 +00:00
|
|
|
dh.main.FlushSealingBatches(ctx)
|
2021-06-11 17:26:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-09-10 13:12:43 +00:00
|
|
|
func (dh *DealHarness) PerformRetrieval(ctx context.Context, dealCid *cid.Cid, root cid.Cid, carExport bool) (path string) {
|
2021-06-11 17:26:25 +00:00
|
|
|
// perform retrieval.
|
2021-09-10 13:12:43 +00:00
|
|
|
info, err := dh.client.ClientGetDealInfo(ctx, *dealCid)
|
2021-06-11 17:26:25 +00:00
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
|
|
|
offers, err := dh.client.ClientFindData(ctx, root, &info.PieceCID)
|
|
|
|
require.NoError(dh.t, err)
|
|
|
|
require.NotEmpty(dh.t, offers, "no offers")
|
|
|
|
|
2021-09-10 13:12:43 +00:00
|
|
|
return dh.PerformRetrievalForOffer(ctx, carExport, offers[0])
|
|
|
|
}
|
|
|
|
|
|
|
|
func (dh *DealHarness) PerformRetrievalForOffer(ctx context.Context, carExport bool, offer api.QueryOffer) string {
|
2021-09-17 07:27:53 +00:00
|
|
|
outputF, err := ioutil.TempFile(dh.t.TempDir(), "ret-car")
|
2021-06-11 17:26:25 +00:00
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
2021-09-17 07:27:53 +00:00
|
|
|
defer outputF.Close() //nolint:errcheck
|
2021-06-11 17:26:25 +00:00
|
|
|
|
|
|
|
caddr, err := dh.client.WalletDefaultAddress(ctx)
|
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
|
|
|
ref := &api.FileRef{
|
2021-09-17 07:27:53 +00:00
|
|
|
Path: outputF.Name(),
|
2021-06-11 17:26:25 +00:00
|
|
|
IsCAR: carExport,
|
|
|
|
}
|
|
|
|
|
2021-09-10 13:12:43 +00:00
|
|
|
order := offer.Order(caddr)
|
|
|
|
updates, err := dh.client.ClientRetrieveWithEvents(ctx, order, ref)
|
2021-06-11 17:26:25 +00:00
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
|
|
|
for update := range updates {
|
|
|
|
require.Emptyf(dh.t, update.Err, "retrieval failed: %s", update.Err)
|
|
|
|
}
|
|
|
|
|
2021-09-17 07:27:53 +00:00
|
|
|
ret := outputF.Name()
|
2021-06-11 17:26:25 +00:00
|
|
|
|
2021-06-13 23:10:37 +00:00
|
|
|
return ret
|
2021-06-11 17:26:25 +00:00
|
|
|
}
|
|
|
|
|
2021-06-13 23:10:37 +00:00
|
|
|
func (dh *DealHarness) ExtractFileFromCAR(ctx context.Context, file *os.File) (out *os.File) {
|
2021-06-11 17:26:25 +00:00
|
|
|
bserv := dstest.Bserv()
|
2021-06-13 23:10:37 +00:00
|
|
|
ch, err := car.LoadCar(bserv.Blockstore(), file)
|
2021-06-11 17:26:25 +00:00
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
|
|
|
b, err := bserv.GetBlock(ctx, ch.Roots[0])
|
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
|
|
|
nd, err := ipld.Decode(b)
|
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
|
|
|
dserv := dag.NewDAGService(bserv)
|
|
|
|
fil, err := unixfile.NewUnixfsFile(ctx, dserv, nd)
|
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
|
|
|
tmpfile, err := ioutil.TempFile(dh.t.TempDir(), "file-in-car")
|
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
2021-06-13 23:10:37 +00:00
|
|
|
defer tmpfile.Close() //nolint:errcheck
|
2021-06-11 17:26:25 +00:00
|
|
|
|
|
|
|
err = files.WriteTo(fil, tmpfile.Name())
|
|
|
|
require.NoError(dh.t, err)
|
|
|
|
|
2021-06-13 23:10:37 +00:00
|
|
|
return tmpfile
|
2021-06-11 17:26:25 +00:00
|
|
|
}
|
2021-06-23 17:13:29 +00:00
|
|
|
|
|
|
|
type RunConcurrentDealsOpts struct {
|
integrate DAG store and CARv2 in deal-making (#6671)
This commit removes badger from the deal-making processes, and
moves to a new architecture with the dagstore as the cental
component on the miner-side, and CARv2s on the client-side.
Every deal that has been handed off to the sealing subsystem becomes
a shard in the dagstore. Shards are mounted via the LotusMount, which
teaches the dagstore how to load the related piece when serving
retrievals.
When the miner starts the Lotus for the first time with this patch,
we will perform a one-time migration of all active deals into the
dagstore. This is a lightweight process, and it consists simply
of registering the shards in the dagstore.
Shards are backed by the unsealed copy of the piece. This is currently
a CARv1. However, the dagstore keeps CARv2 indices for all pieces, so
when it's time to acquire a shard to serve a retrieval, the unsealed
CARv1 is joined with its index (safeguarded by the dagstore), to form
a read-only blockstore, thus taking the place of the monolithic
badger.
Data transfers have been adjusted to interface directly with CARv2 files.
On inbound transfers (client retrievals, miner storage deals), we stream
the received data into a CARv2 ReadWrite blockstore. On outbound transfers
(client storage deals, miner retrievals), we serve the data off a CARv2
ReadOnly blockstore.
Client-side imports are managed by the refactored *imports.Manager
component (when not using IPFS integration). Just like it before, we use
the go-filestore library to avoid duplicating the data from the original
file in the resulting UnixFS DAG (concretely the leaves). However, the
target of those imports are what we call "ref-CARv2s": CARv2 files placed
under the `$LOTUS_PATH/imports` directory, containing the intermediate
nodes in full, and the leaves as positional references to the original file
on disk.
Client-side retrievals are placed into CARv2 files in the location:
`$LOTUS_PATH/retrievals`.
A new set of `Dagstore*` JSON-RPC operations and `lotus-miner dagstore`
subcommands have been introduced on the miner-side to inspect and manage
the dagstore.
Despite moving to a CARv2-backed system, the IPFS integration has been
respected, and it continues to be possible to make storage deals with data
held in an IPFS node, and to perform retrievals directly into an IPFS node.
NOTE: because the "staging" and "client" Badger blockstores are no longer
used, existing imports on the client will be rendered useless. On startup,
Lotus will enumerate all imports and print WARN statements on the log for
each import that needs to be reimported. These log lines contain these
messages:
- import lacks carv2 path; import will not work; please reimport
- import has missing/broken carv2; please reimport
At the end, we will print a "sanity check completed" message indicating
the count of imports found, and how many were deemed broken.
Co-authored-by: Aarsh Shah <aarshkshah1992@gmail.com>
Co-authored-by: Dirk McCormick <dirkmdev@gmail.com>
Co-authored-by: Raúl Kripalani <raul@protocol.ai>
Co-authored-by: Dirk McCormick <dirkmdev@gmail.com>
2021-08-16 22:34:32 +00:00
|
|
|
N int
|
|
|
|
FastRetrieval bool
|
|
|
|
CarExport bool
|
|
|
|
StartEpoch abi.ChainEpoch
|
|
|
|
UseCARFileForStorageDeal bool
|
2021-11-10 16:28:23 +00:00
|
|
|
IndexerProvider *shared_testutil.MockIndexProvider
|
2021-06-23 17:13:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func (dh *DealHarness) RunConcurrentDeals(opts RunConcurrentDealsOpts) {
|
2021-09-20 06:04:21 +00:00
|
|
|
ctx := context.Background()
|
2021-06-23 17:13:29 +00:00
|
|
|
errgrp, _ := errgroup.WithContext(context.Background())
|
|
|
|
for i := 0; i < opts.N; i++ {
|
|
|
|
i := i
|
|
|
|
errgrp.Go(func() (err error) {
|
2021-07-16 16:30:45 +00:00
|
|
|
defer dh.t.Logf("finished concurrent deal %d/%d", i, opts.N)
|
2021-06-23 17:13:29 +00:00
|
|
|
defer func() {
|
|
|
|
// This is necessary because golang can't deal with test
|
|
|
|
// failures being reported from children goroutines ¯\_(ツ)_/¯
|
|
|
|
if r := recover(); r != nil {
|
|
|
|
err = fmt.Errorf("deal failed: %s", r)
|
|
|
|
}
|
|
|
|
}()
|
2021-07-16 16:30:45 +00:00
|
|
|
|
|
|
|
dh.t.Logf("making storage deal %d/%d", i, opts.N)
|
|
|
|
|
2021-06-23 17:13:29 +00:00
|
|
|
deal, res, inPath := dh.MakeOnlineDeal(context.Background(), MakeFullDealParams{
|
integrate DAG store and CARv2 in deal-making (#6671)
This commit removes badger from the deal-making processes, and
moves to a new architecture with the dagstore as the cental
component on the miner-side, and CARv2s on the client-side.
Every deal that has been handed off to the sealing subsystem becomes
a shard in the dagstore. Shards are mounted via the LotusMount, which
teaches the dagstore how to load the related piece when serving
retrievals.
When the miner starts the Lotus for the first time with this patch,
we will perform a one-time migration of all active deals into the
dagstore. This is a lightweight process, and it consists simply
of registering the shards in the dagstore.
Shards are backed by the unsealed copy of the piece. This is currently
a CARv1. However, the dagstore keeps CARv2 indices for all pieces, so
when it's time to acquire a shard to serve a retrieval, the unsealed
CARv1 is joined with its index (safeguarded by the dagstore), to form
a read-only blockstore, thus taking the place of the monolithic
badger.
Data transfers have been adjusted to interface directly with CARv2 files.
On inbound transfers (client retrievals, miner storage deals), we stream
the received data into a CARv2 ReadWrite blockstore. On outbound transfers
(client storage deals, miner retrievals), we serve the data off a CARv2
ReadOnly blockstore.
Client-side imports are managed by the refactored *imports.Manager
component (when not using IPFS integration). Just like it before, we use
the go-filestore library to avoid duplicating the data from the original
file in the resulting UnixFS DAG (concretely the leaves). However, the
target of those imports are what we call "ref-CARv2s": CARv2 files placed
under the `$LOTUS_PATH/imports` directory, containing the intermediate
nodes in full, and the leaves as positional references to the original file
on disk.
Client-side retrievals are placed into CARv2 files in the location:
`$LOTUS_PATH/retrievals`.
A new set of `Dagstore*` JSON-RPC operations and `lotus-miner dagstore`
subcommands have been introduced on the miner-side to inspect and manage
the dagstore.
Despite moving to a CARv2-backed system, the IPFS integration has been
respected, and it continues to be possible to make storage deals with data
held in an IPFS node, and to perform retrievals directly into an IPFS node.
NOTE: because the "staging" and "client" Badger blockstores are no longer
used, existing imports on the client will be rendered useless. On startup,
Lotus will enumerate all imports and print WARN statements on the log for
each import that needs to be reimported. These log lines contain these
messages:
- import lacks carv2 path; import will not work; please reimport
- import has missing/broken carv2; please reimport
At the end, we will print a "sanity check completed" message indicating
the count of imports found, and how many were deemed broken.
Co-authored-by: Aarsh Shah <aarshkshah1992@gmail.com>
Co-authored-by: Dirk McCormick <dirkmdev@gmail.com>
Co-authored-by: Raúl Kripalani <raul@protocol.ai>
Co-authored-by: Dirk McCormick <dirkmdev@gmail.com>
2021-08-16 22:34:32 +00:00
|
|
|
Rseed: 5 + i,
|
|
|
|
FastRet: opts.FastRetrieval,
|
|
|
|
StartEpoch: opts.StartEpoch,
|
|
|
|
UseCARFileForStorageDeal: opts.UseCARFileForStorageDeal,
|
2021-06-23 17:13:29 +00:00
|
|
|
})
|
2021-07-16 16:30:45 +00:00
|
|
|
|
2021-11-10 16:28:23 +00:00
|
|
|
// Check that the storage provider announced the deal to indexers
|
|
|
|
if opts.IndexerProvider != nil {
|
|
|
|
notifs := opts.IndexerProvider.GetNotifs()
|
|
|
|
_, ok := notifs[string(deal.Bytes())]
|
|
|
|
require.True(dh.t, ok)
|
|
|
|
}
|
|
|
|
|
2021-07-16 16:30:45 +00:00
|
|
|
dh.t.Logf("retrieving deal %d/%d", i, opts.N)
|
|
|
|
|
2021-06-23 17:13:29 +00:00
|
|
|
outPath := dh.PerformRetrieval(context.Background(), deal, res.Root, opts.CarExport)
|
2021-09-20 06:04:21 +00:00
|
|
|
|
|
|
|
if opts.CarExport {
|
|
|
|
f, err := os.Open(outPath)
|
|
|
|
require.NoError(dh.t, err)
|
|
|
|
actualFile := dh.ExtractFileFromCAR(ctx, f)
|
|
|
|
require.NoError(dh.t, f.Close())
|
|
|
|
|
|
|
|
AssertFilesEqual(dh.t, inPath, actualFile.Name())
|
|
|
|
} else {
|
|
|
|
AssertFilesEqual(dh.t, inPath, outPath)
|
|
|
|
}
|
|
|
|
|
2021-06-23 17:13:29 +00:00
|
|
|
return nil
|
|
|
|
})
|
|
|
|
}
|
|
|
|
require.NoError(dh.t, errgrp.Wait())
|
|
|
|
}
|