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 +2 -1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b123e700ea - Show all commits

3
provider/lpffi/sdr_funcs.go
View File

@ -69,7 +69,7 @@ func (l *storageProvider) AcquireSector(ctx context.Context, taskID *harmonytask
if taskID != nil { if taskID != nil {
resv, ok = l.storageReservations.Load(*taskID) resv, ok = l.storageReservations.Load(*taskID)
} }
if ok { if ok && resv != nil {
if resv.Alloc != allocate || resv.Existing != existing { if resv.Alloc != allocate || resv.Existing != existing {
// this should never happen, only when task definition is wrong // this should never happen, only when task definition is wrong
return storiface.SectorPaths{}, nil, xerrors.Errorf("storage reservation type mismatch") return storiface.SectorPaths{}, nil, xerrors.Errorf("storage reservation type mismatch")
@ -78,6 +78,7 @@ func (l *storageProvider) AcquireSector(ctx context.Context, taskID *harmonytask
log.Debugw("using existing storage reservation", "task", taskID, "sector", sector, "existing", existing, "allocate", allocate) log.Debugw("using existing storage reservation", "task", taskID, "sector", sector, "existing", existing, "allocate", allocate)
paths = resv.Paths paths = resv.Paths
storageIDs = resv.PathIDs
releaseStorage = resv.Release releaseStorage = resv.Release
} else { } else {
var err error var err error