Skip to content

Commit 93f9b26

Browse files
nonsensedirkmc
andauthored
boostd inspect command (#636)
* wip: unsealed file testing * feat: piece metadata * rename PieceMeta to Inspect * add inspect menu item * re-arrange menu items * fixup doctor cmd * rename doctor to inspect * fixup * fixup * fixup * add links to legacy deal detail * remove inspect command, as it is the same as pieces piece-info * fix: inspect page styles Co-authored-by: Dirk McCormick <[email protected]>
1 parent 4c79501 commit 93f9b26

18 files changed

+753
-43
lines changed

cmd/boostd/pieces.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414

1515
var piecesCmd = &cli.Command{
1616
Name: "pieces",
17-
Usage: "interact with the piecestore",
17+
Usage: "Interact with the Piece Store",
1818
Description: "The piecestore is a database that tracks and manages data that is made available to the retrieval market",
1919
Subcommands: []*cli.Command{
2020
piecesListPiecesCmd,
@@ -26,7 +26,7 @@ var piecesCmd = &cli.Command{
2626

2727
var piecesListPiecesCmd = &cli.Command{
2828
Name: "list-pieces",
29-
Usage: "list registered pieces",
29+
Usage: "List registered pieces",
3030
Action: func(cctx *cli.Context) error {
3131
nodeApi, closer, err := bcli.GetBoostAPI(cctx)
3232
if err != nil {
@@ -49,7 +49,7 @@ var piecesListPiecesCmd = &cli.Command{
4949

5050
var piecesListCidInfosCmd = &cli.Command{
5151
Name: "list-cids",
52-
Usage: "list registered payload CIDs",
52+
Usage: "List registered payload CIDs",
5353
Flags: []cli.Flag{
5454
&cli.BoolFlag{
5555
Name: "verbose",
@@ -123,7 +123,7 @@ var piecesListCidInfosCmd = &cli.Command{
123123

124124
var piecesInfoCmd = &cli.Command{
125125
Name: "piece-info",
126-
Usage: "get registered information for a given piece CID",
126+
Usage: "Get registered information for a given piece CID",
127127
Action: func(cctx *cli.Context) error {
128128
if !cctx.Args().Present() {
129129
return lcli.ShowHelp(cctx, fmt.Errorf("must specify piece cid"))
@@ -158,7 +158,7 @@ var piecesInfoCmd = &cli.Command{
158158

159159
var piecesCidInfoCmd = &cli.Command{
160160
Name: "cid-info",
161-
Usage: "get registered information for a given payload CID",
161+
Usage: "Get registered information for a given payload CID",
162162
Action: func(cctx *cli.Context) error {
163163
if !cctx.Args().Present() {
164164
return lcli.ShowHelp(cctx, fmt.Errorf("must specify payload cid"))

cmd/boostx/utils_cmd.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package main
22

33
import (
4-
"bufio"
54
"context"
65
"fmt"
76
"io"
@@ -213,16 +212,6 @@ var commpCmd = &cli.Command{
213212
}
214213
defer rdr.Close() //nolint:errcheck
215214

216-
// check that the data is a car file; if it's not, retrieval won't work
217-
_, err = car.ReadHeader(bufio.NewReader(rdr))
218-
if err != nil {
219-
return fmt.Errorf("not a car file: %w", err)
220-
}
221-
222-
if _, err := rdr.Seek(0, io.SeekStart); err != nil {
223-
return fmt.Errorf("seek to start: %w", err)
224-
}
225-
226215
w := &writer.Writer{}
227216
_, err = io.CopyBuffer(w, rdr, make([]byte, writer.CommPBuf))
228217
if err != nil {

db/deals.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,14 @@ func (d *DealsDB) ByPublishCID(ctx context.Context, publishCid string) ([]*types
212212
return deals, nil
213213
}
214214

215+
func (d *DealsDB) ByPieceCID(ctx context.Context, pieceCid cid.Cid) ([]*types.ProviderDealState, error) {
216+
return d.list(ctx, 0, 0, "PieceCID=?", pieceCid.String())
217+
}
218+
219+
func (d *DealsDB) ByRootPayloadCID(ctx context.Context, payloadCid cid.Cid) ([]*types.ProviderDealState, error) {
220+
return d.list(ctx, 0, 0, "DealDataRoot=?", payloadCid.String())
221+
}
222+
215223
func (d *DealsDB) BySignedProposalCID(ctx context.Context, proposalCid cid.Cid) (*types.ProviderDealState, error) {
216224
qry := "SELECT " + dealFieldsStr + " FROM Deals WHERE SignedProposalCID=?"
217225
row := d.db.QueryRowContext(ctx, qry, proposalCid.String())

gql/resolver.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"encoding/hex"
66
"errors"
77
"fmt"
8-
98
"github.com/filecoin-project/boost/db"
109
"github.com/filecoin-project/boost/fundmanager"
1110
gqltypes "github.com/filecoin-project/boost/gql/types"
@@ -16,6 +15,9 @@ import (
1615
"github.com/filecoin-project/boost/storagemarket/types"
1716
"github.com/filecoin-project/boost/storagemarket/types/dealcheckpoints"
1817
"github.com/filecoin-project/boost/transport"
18+
"github.com/filecoin-project/dagstore"
19+
"github.com/filecoin-project/go-fil-markets/piecestore"
20+
"github.com/filecoin-project/go-fil-markets/retrievalmarket"
1921
lotus_storagemarket "github.com/filecoin-project/go-fil-markets/storagemarket"
2022
"github.com/filecoin-project/lotus/api/v1api"
2123
"github.com/filecoin-project/lotus/markets/storageadapter"
@@ -49,12 +51,15 @@ type resolver struct {
4951
provider *storagemarket.Provider
5052
legacyProv lotus_storagemarket.StorageProvider
5153
legacyDT lotus_dtypes.ProviderDataTransfer
54+
ps piecestore.PieceStore
55+
sa retrievalmarket.SectorAccessor
56+
dagst dagstore.Interface
5257
publisher *storageadapter.DealPublisher
5358
spApi sealingpipeline.API
5459
fullNode v1api.FullNode
5560
}
5661

57-
func NewResolver(cfg *config.Boost, r lotus_repo.LockedRepo, h host.Host, dealsDB *db.DealsDB, logsDB *db.LogsDB, plDB *db.ProposalLogsDB, fundsDB *db.FundsDB, fundMgr *fundmanager.FundManager, storageMgr *storagemanager.StorageManager, spApi sealingpipeline.API, provider *storagemarket.Provider, legacyProv lotus_storagemarket.StorageProvider, legacyDT lotus_dtypes.ProviderDataTransfer, publisher *storageadapter.DealPublisher, fullNode v1api.FullNode) *resolver {
62+
func NewResolver(cfg *config.Boost, r lotus_repo.LockedRepo, h host.Host, dealsDB *db.DealsDB, logsDB *db.LogsDB, plDB *db.ProposalLogsDB, fundsDB *db.FundsDB, fundMgr *fundmanager.FundManager, storageMgr *storagemanager.StorageManager, spApi sealingpipeline.API, provider *storagemarket.Provider, legacyProv lotus_storagemarket.StorageProvider, legacyDT lotus_dtypes.ProviderDataTransfer, ps piecestore.PieceStore, sa retrievalmarket.SectorAccessor, dagst dagstore.Interface, publisher *storageadapter.DealPublisher, fullNode v1api.FullNode) *resolver {
5863
return &resolver{
5964
cfg: cfg,
6065
repo: r,
@@ -68,6 +73,9 @@ func NewResolver(cfg *config.Boost, r lotus_repo.LockedRepo, h host.Host, dealsD
6873
provider: provider,
6974
legacyProv: legacyProv,
7075
legacyDT: legacyDT,
76+
ps: ps,
77+
sa: sa,
78+
dagst: dagst,
7179
publisher: publisher,
7280
spApi: spApi,
7381
fullNode: fullNode,

0 commit comments

Comments
 (0)