Skip to content

Commit

Permalink
Merge pull request #6117 from filecoin-project/opt/elvindu/snapimport…
Browse files Browse the repository at this point in the history
…-resume

Auto-resume interrupted snapshot imports / 自动重链快照导入失败时
  • Loading branch information
simlecode committed Aug 25, 2023
2 parents 7eb8d81 + 7c96899 commit f67f246
Show file tree
Hide file tree
Showing 2 changed files with 127 additions and 10 deletions.
16 changes: 6 additions & 10 deletions cmd/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import (
"context"
"fmt"
"io"
"net/http"
"os"
"strings"

"github.com/filecoin-project/venus/pkg/httpreader"

"github.com/DataDog/zstd"
"github.com/filecoin-project/venus/pkg/chain"
"github.com/filecoin-project/venus/pkg/repo"
Expand All @@ -30,18 +31,13 @@ func importChain(ctx context.Context, r repo.Repo, fname string) error {
var rd io.Reader
var l int64
if strings.HasPrefix(fname, "http://") || strings.HasPrefix(fname, "https://") {
resp, err := http.Get(fname) //nolint:gosec
rrd, err := httpreader.NewResumableReader(ctx, fname)
if err != nil {
return err
}
defer resp.Body.Close() //nolint:errcheck

if resp.StatusCode != http.StatusOK {
return fmt.Errorf("non-200 response: %d", resp.StatusCode)
return fmt.Errorf("fetching chain CAR failed: setting up resumable reader: %w", err)
}

rd = resp.Body
l = resp.ContentLength
rd = rrd
l = rrd.ContentLength()
} else {
fname, err := homedir.Expand(fname)
if err != nil {
Expand Down
121 changes: 121 additions & 0 deletions pkg/httpreader/resumable.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
package httpreader

import (
"context"
"fmt"
"io"
"net/http"
"strconv"

logging "github.com/ipfs/go-log/v2"
"go.uber.org/multierr"
)

var log = logging.Logger("httpreader")

type ResumableReader struct {
ctx context.Context
initialURL string
finalURL *string
position int64
contentLength int64
client *http.Client
reader io.ReadCloser
}

func NewResumableReader(ctx context.Context, url string) (*ResumableReader, error) {
finalURL := ""

client := &http.Client{
CheckRedirect: func(req *http.Request, via []*http.Request) error {
finalURL = req.URL.String()
if len(via) >= 10 {
return fmt.Errorf("stopped after 10 redirects")
}
return nil
},
}

r := &ResumableReader{
ctx: ctx,
initialURL: url,
finalURL: &finalURL,
position: 0,
client: client,
}

req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
if err != nil {
return nil, err
}

resp, err := r.client.Do(req)
if err != nil {
return nil, err
}

if resp.StatusCode != http.StatusOK {
return nil, fmt.Errorf("failed to fetch resource, status code: %d", resp.StatusCode)
}

contentLength, err := strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 64)
if err != nil {
if err = resp.Body.Close(); err != nil {
err = multierr.Append(err, err)
}
return nil, err
}

r.contentLength = contentLength
r.reader = resp.Body

return r, nil
}

func (r *ResumableReader) ContentLength() int64 {
return r.contentLength
}

func (r *ResumableReader) Read(p []byte) (n int, err error) {
for {
if r.reader == nil {
reqURL := r.initialURL
if *r.finalURL != "" {
reqURL = *r.finalURL
}

req, err := http.NewRequestWithContext(r.ctx, "GET", reqURL, nil)
if err != nil {
return 0, err
}
req.Header.Set("Range", fmt.Sprintf("bytes=%d-", r.position))
resp, err := r.client.Do(req)
if err != nil {
return 0, err
}

if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusPartialContent {
return 0, fmt.Errorf("non-resumable status code: %d", resp.StatusCode)
}
r.reader = resp.Body
}

n, err = r.reader.Read(p)
r.position += int64(n)

if err == io.EOF || err == io.ErrUnexpectedEOF {
if r.position == r.contentLength {
if err := r.reader.Close(); err != nil {
log.Warnf("error closing reader: %+v", err)
}
return n, io.EOF
}
if err := r.reader.Close(); err != nil {
log.Warnf("error closing reader: %+v", err)
}
r.reader = nil
} else {
return n, err
}
}
}

0 comments on commit f67f246

Please sign in to comment.