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

v1.27.0-a #10

Closed
jonathanface wants to merge 473 commits from v1.27.0-a into master
pull from: v1.27.0-a
merge into: cerc-io:master
Conversation 0 Commits 473 Files Changed 452 +9 -6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0634dfce07 - Show all commits

4
provider/lpproof/treed_build_test.go
View File

@ -315,7 +315,9 @@ func Test32G(t *testing.T) {
// dump tree.dat // dump tree.dat
datFile, err := os.Open(tempFile) datFile, err := os.Open(tempFile)
require.NoError(t, err) require.NoError(t, err)
defer datFile.Close() defer func() {
require.NoError(t, datFile.Close())
}()
actualD := hexPrint32LDedup(bufio.NewReaderSize(datFile, 1<<20)) actualD := hexPrint32LDedup(bufio.NewReaderSize(datFile, 1<<20))
fmt.Println(actualD) fmt.Println(actualD)

5
storage/paths/remote.go
View File

@ -430,13 +430,14 @@ func (r *Remote) FsStat(ctx context.Context, id storiface.ID) (fsutil.FsStat, er
} }
_ = resp.Body.Close() _ = resp.Body.Close()
return out, nil // Successfully decoded, return the result return out, nil // Successfully decoded, return the result
} else { }
// non-200 status code
b, _ := io.ReadAll(resp.Body) // Best-effort read the body for logging b, _ := io.ReadAll(resp.Body) // Best-effort read the body for logging
log.Warnw("request to endpoint failed", "url", rl.String(), "statusCode", resp.StatusCode, "response", string(b)) log.Warnw("request to endpoint failed", "url", rl.String(), "statusCode", resp.StatusCode, "response", string(b))
_ = resp.Body.Close() _ = resp.Body.Close()
// Continue to try the next URL, don't return here as we want to try all URLs // Continue to try the next URL, don't return here as we want to try all URLs
} }
}
return fsutil.FsStat{}, xerrors.Errorf("all endpoints failed for remote storage %s", id) return fsutil.FsStat{}, xerrors.Errorf("all endpoints failed for remote storage %s", id)
} }