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

Merge pull request #7363 from filecoin-project/nonsense/fix-filepath-join

Browse Source 
fix staging area path buildup
This commit is contained in:
Łukasz Magiera 2021-09-21 16:06:36 +01:00 committed by GitHub
commit fe56995244
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
node/modules/storageminer.go
View File

@ -70,7 +70,10 @@ import (
"github.com/filecoin-project/lotus/storage" "github.com/filecoin-project/lotus/storage"
) )
var StorageCounterDSPrefix = "/storage/nextid" var (
StorageCounterDSPrefix = "/storage/nextid"
StagingAreaDirName = "deal-staging"
)
func minerAddrFromDS(ds dtypes.MetadataDS) (address.Address, error) { func minerAddrFromDS(ds dtypes.MetadataDS) (address.Address, error) {
maddrb, err := ds.Get(datastore.NewKey("miner-address")) maddrb, err := ds.Get(datastore.NewKey("miner-address"))
@ -536,7 +539,8 @@ func BasicDealFilter(cfg config.DealmakingConfig, user dtypes.StorageDealFilter)
return false, "miner error", err return false, "miner error", err
} }
diskUsageBytes, err := r.DiskUsage(r.Path() + "/deal-staging") dir := filepath.Join(r.Path(), StagingAreaDirName)
diskUsageBytes, err := r.DiskUsage(dir)
if err != nil { if err != nil {
return false, "miner error", err return false, "miner error", err
} }
@ -574,7 +578,7 @@ func StorageProvider(minerAddress dtypes.MinerAddress,
) (storagemarket.StorageProvider, error) { ) (storagemarket.StorageProvider, error) {
net := smnet.NewFromLibp2pHost(h) net := smnet.NewFromLibp2pHost(h)
dir := filepath.Join(r.Path(), "deal-staging") dir := filepath.Join(r.Path(), StagingAreaDirName)
// migrate temporary files that were created directly under the repo, by // migrate temporary files that were created directly under the repo, by
// moving them to the new directory and symlinking them. // moving them to the new directory and symlinking them.