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

paths: Fix local existing allocate requests in Finalize

Browse Source
This commit is contained in:
Łukasz Magiera 2024-03-24 14:48:25 +01:00 committed by Łukasz Magiera
parent c7ca271507
commit 021385116a
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
itests/path_type_filters_test.go
View File

@ -15,6 +15,7 @@ import (
)
func TestPathTypeFilters(t *testing.T) {
kit.QuietMiningLogs()
runTest := func(t *testing.T, name string, asserts func(t *testing.T, ctx context.Context, miner *kit.TestMiner, run func())) {
t.Run(name, func(t *testing.T) {

30
storage/paths/local.go
View File

@ -495,6 +495,22 @@ func (st *Local) AcquireSector(ctx context.Context, sid storiface.SectorRef, exi
var out storiface.SectorPaths
var storageIDs storiface.SectorPaths
allocPathOk := func(canSeal, canStore bool, allowTypes, denyTypes []string, fileType storiface.SectorFileType) bool {
if (pathType == storiface.PathSealing) && !canSeal {
return false
}
if (pathType == storiface.PathStorage) && !canStore {
return false
}
if !fileType.Allowed(allowTypes, denyTypes) {
return false
}
return true
}
// First find existing files
for _, fileType := range storiface.PathTypes {
// also try to find existing sectors if we're allocating
@ -520,6 +536,10 @@ func (st *Local) AcquireSector(ctx context.Context, sid storiface.SectorRef, exi
continue
}
if allocate.Has(fileType) && !allocPathOk(info.CanSeal, info.CanStore, info.AllowTypes, info.DenyTypes, fileType) {
continue // allocate request for a path of different type
}
spath := p.sectorPath(sid.ID, fileType)
storiface.SetPathByType(&out, fileType, spath)
storiface.SetPathByType(&storageIDs, fileType, string(info.ID))
@ -554,15 +574,7 @@ func (st *Local) AcquireSector(ctx context.Context, sid storiface.SectorRef, exi
continue
}
if (pathType == storiface.PathSealing) && !si.CanSeal {
continue
}
if (pathType == storiface.PathStorage) && !si.CanStore {
continue
}
if !fileType.Allowed(si.AllowTypes, si.DenyTypes) {
if !allocPathOk(si.CanSeal, si.CanStore, si.AllowTypes, si.DenyTypes, fileType) {
continue
}