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

support http in lotus-miner sealing data-cid

Browse Source
This commit is contained in:
Łukasz Magiera 2022-05-24 15:47:49 +02:00
parent 6095aba4dd
commit 3fa2ada987
1 changed files with 50 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
cmd/lotus-miner/sealing.go
View File

@ -4,7 +4,10 @@ import (
"encoding/hex" "encoding/hex"
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/filecoin-project/lotus/lib/httpreader"
"io"
"math" "math"
"net/http"
"os" "os"
"sort" "sort"
"strings" "strings"
@ -358,7 +361,13 @@ var sealingAbortCmd = &cli.Command{
var sealingDataCidCmd = &cli.Command{ var sealingDataCidCmd = &cli.Command{
Name: "data-cid", Name: "data-cid",
Usage: "Compute data CID using workers", Usage: "Compute data CID using workers",
ArgsUsage: "[file] <padded piece size>", ArgsUsage: "[file/url] <padded piece size>",
Flags: []cli.Flag{
&cli.Uint64Flag{
Name: "file-size",
Usage: "real file size",
},
},
Action: func(cctx *cli.Context) error { Action: func(cctx *cli.Context) error {
if cctx.Args().Len() < 1 || cctx.Args().Len() > 2 { if cctx.Args().Len() < 1 || cctx.Args().Len() > 2 {
return xerrors.Errorf("expected 1 or 2 arguments") return xerrors.Errorf("expected 1 or 2 arguments")
@ -372,19 +381,45 @@ var sealingDataCidCmd = &cli.Command{
ctx := lcli.ReqContext(cctx) ctx := lcli.ReqContext(cctx)
p, err := homedir.Expand(cctx.Args().First()) var r io.Reader
if err != nil { sz := cctx.Uint64("file-size")
return xerrors.Errorf("expanding path: %w", err)
}
f, err := os.OpenFile(p, os.O_RDONLY, 0) if strings.HasPrefix(cctx.Args().First(), "http://") || strings.HasPrefix(cctx.Args().First(), "https://") {
if err != nil { r = &httpreader.HttpReader{
return xerrors.Errorf("opening source file: %w", err) URL: cctx.Args().First(),
} }
st, err := f.Stat() if !cctx.IsSet("file-size") {
if err != nil { resp, err := http.Head(cctx.Args().First())
return xerrors.Errorf("stat: %w", err) if err != nil {
return xerrors.Errorf("http head: %w", err)
}
if resp.ContentLength < 0 {
return xerrors.Errorf("head response didn't contain content length; specify --file-size")
}
sz = uint64(resp.ContentLength)
}
} else {
p, err := homedir.Expand(cctx.Args().First())
if err != nil {
return xerrors.Errorf("expanding path: %w", err)
}
f, err := os.OpenFile(p, os.O_RDONLY, 0)
if err != nil {
return xerrors.Errorf("opening source file: %w", err)
}
if !cctx.IsSet("file-size") {
st, err := f.Stat()
if err != nil {
return xerrors.Errorf("stat: %w", err)
}
sz = uint64(st.Size())
}
r = f
} }
var psize abi.PaddedPieceSize var psize abi.PaddedPieceSize
@ -397,19 +432,14 @@ var sealingDataCidCmd = &cli.Command{
if err := psize.Validate(); err != nil { if err := psize.Validate(); err != nil {
return xerrors.Errorf("checking piece size: %w", err) return xerrors.Errorf("checking piece size: %w", err)
} }
if st.Size() > int64(psize.Unpadded()) { if sz > uint64(psize.Unpadded()) {
return xerrors.Errorf("file larger than the piece") return xerrors.Errorf("file larger than the piece")
} }
} else { } else {
psize = padreader.PaddedSize(uint64(st.Size())).Padded() psize = padreader.PaddedSize(uint64(sz)).Padded()
} }
ir, err := padreader.NewInflator(f, uint64(st.Size()), psize.Unpadded()) pc, err := nodeApi.ComputeDataCid(ctx, psize.Unpadded(), r)
if err != nil {
return err
}
pc, err := nodeApi.ComputeDataCid(ctx, psize.Unpadded(), ir)
if err != nil { if err != nil {
return xerrors.Errorf("computing data CID: %w", err) return xerrors.Errorf("computing data CID: %w", err)
} }