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

Merge pull request #8243 from filecoin-project/release/v1.14.4

Browse Source 
chore: build: v1.14.4
This commit is contained in:
Jiaying Wang 2022-03-03 21:28:31 -05:00 committed by GitHub
commit 5b33555fda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 110 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.md
View File

@ -1,5 +1,15 @@
# Lotus changelog # Lotus changelog
# 1.14.4 / 2022-03-03
This is a *highly recommended* optional release for storage providers that are doing snap deals. This fix the bug
that causes some snap deal sectors are stuck in `FinalizeReplicaUpdate`. In addition, SPs should be able to force
update sectors status without getting blocked by `normal shutdown of state machine`.
# v1.14.3 / 2022-02-28
This is an **optional** release, that includes a fix to properly register the `--really-do-it` flag for abort-upgrade.
# 1.14.2 / 2022-02-24 # 1.14.2 / 2022-02-24
This is an **optional** release of lotus, that's had a couple more improvements w.r.t Snap experience for storage providers in preparation of the[upcoming OhSnap upgrade](https://github.com/filecoin-project/community/discussions/74?sort=new#discussioncomment-1922550). This is an **optional** release of lotus, that's had a couple more improvements w.r.t Snap experience for storage providers in preparation of the[upcoming OhSnap upgrade](https://github.com/filecoin-project/community/discussions/74?sort=new#discussioncomment-1922550).

BIN
build/openrpc/full.json.gz
View File

Binary file not shown.

BIN
build/openrpc/miner.json.gz
View File

Binary file not shown.

BIN
build/openrpc/worker.json.gz
View File

Binary file not shown.

2
build/version.go
View File

@ -37,7 +37,7 @@ func BuildTypeString() string {
} }
// BuildVersion is the local build version // BuildVersion is the local build version
const BuildVersion = "1.14.2" const BuildVersion = "1.14.4"
func UserVersion() string { func UserVersion() string {
if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" { if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" {

1
cmd/lotus-miner/info.go
View File

@ -527,6 +527,7 @@ var stateList = []stateMeta{
{col: color.FgRed, state: sealing.SnapDealsDealsExpired}, {col: color.FgRed, state: sealing.SnapDealsDealsExpired},
{col: color.FgRed, state: sealing.ReplicaUpdateFailed}, {col: color.FgRed, state: sealing.ReplicaUpdateFailed},
{col: color.FgRed, state: sealing.ReleaseSectorKeyFailed}, {col: color.FgRed, state: sealing.ReleaseSectorKeyFailed},
{col: color.FgRed, state: sealing.FinalizeReplicaUpdateFailed},
} }
func init() { func init() {

2
documentation/en/cli-lotus-miner.md
View File

@ -7,7 +7,7 @@ USAGE:
lotus-miner [global options] command [command options] [arguments...] lotus-miner [global options] command [command options] [arguments...]
VERSION: VERSION:
1.14.2 1.14.4
COMMANDS: COMMANDS:
init Initialize a lotus miner repo init Initialize a lotus miner repo

2
documentation/en/cli-lotus-worker.md
View File

@ -7,7 +7,7 @@ USAGE:
lotus-worker [global options] command [command options] [arguments...] lotus-worker [global options] command [command options] [arguments...]
VERSION: VERSION:
1.14.2 1.14.4
COMMANDS: COMMANDS:
run Start lotus worker run Start lotus worker

2
documentation/en/cli-lotus.md
View File

@ -7,7 +7,7 @@ USAGE:
lotus [global options] command [command options] [arguments...] lotus [global options] command [command options] [arguments...]
VERSION: VERSION:
1.14.2 1.14.4
COMMANDS: COMMANDS:
daemon Start a lotus daemon process daemon Start a lotus daemon process

42
extern/storage-sealing/fsm.go vendored
View File

@ -19,7 +19,13 @@ import (
func (m *Sealing) Plan(events []statemachine.Event, user interface{}) (interface{}, uint64, error) { func (m *Sealing) Plan(events []statemachine.Event, user interface{}) (interface{}, uint64, error) {
next, processed, err := m.plan(events, user.(*SectorInfo)) next, processed, err := m.plan(events, user.(*SectorInfo))
if err != nil || next == nil { if err != nil || next == nil {
return nil, processed, err l := Log{
Timestamp: uint64(time.Now().Unix()),
Message: fmt.Sprintf("state machine error: %s", err),
Kind: fmt.Sprintf("error;%T", err),
}
user.(*SectorInfo).logAppend(l)
return nil, processed, nil
} }
return func(ctx statemachine.Context, si SectorInfo) error { return func(ctx statemachine.Context, si SectorInfo) error {
@ -175,6 +181,7 @@ var fsmPlanners = map[SectorState]func(events []statemachine.Event, state *Secto
), ),
FinalizeReplicaUpdate: planOne( FinalizeReplicaUpdate: planOne(
on(SectorFinalized{}, UpdateActivating), on(SectorFinalized{}, UpdateActivating),
on(SectorFinalizeFailed{}, FinalizeReplicaUpdateFailed),
), ),
UpdateActivating: planOne( UpdateActivating: planOne(
on(SectorUpdateActive{}, ReleaseSectorKey), on(SectorUpdateActive{}, ReleaseSectorKey),
@ -267,6 +274,9 @@ var fsmPlanners = map[SectorState]func(events []statemachine.Event, state *Secto
ReleaseSectorKeyFailed: planOne( ReleaseSectorKeyFailed: planOne(
on(SectorUpdateActive{}, ReleaseSectorKey), on(SectorUpdateActive{}, ReleaseSectorKey),
), ),
FinalizeReplicaUpdateFailed: planOne(
on(SectorRetryFinalize{}, FinalizeReplicaUpdate),
),
// Post-seal // Post-seal
@ -309,6 +319,21 @@ var fsmPlanners = map[SectorState]func(events []statemachine.Event, state *Secto
FailedUnrecoverable: final, FailedUnrecoverable: final,
} }
func (state *SectorInfo) logAppend(l Log) {
if len(state.Log) > 8000 {
log.Warnw("truncating sector log", "sector", state.SectorNumber)
state.Log[2000] = Log{
Timestamp: uint64(time.Now().Unix()),
Message: "truncating log (above 8000 entries)",
Kind: fmt.Sprintf("truncate"),
}
state.Log = append(state.Log[:2000], state.Log[6000:]...)
}
state.Log = append(state.Log, l)
}
func (m *Sealing) logEvents(events []statemachine.Event, state *SectorInfo) { func (m *Sealing) logEvents(events []statemachine.Event, state *SectorInfo) {
for _, event := range events { for _, event := range events {
log.Debugw("sector event", "sector", state.SectorNumber, "type", fmt.Sprintf("%T", event.User), "event", event.User) log.Debugw("sector event", "sector", state.SectorNumber, "type", fmt.Sprintf("%T", event.User), "event", event.User)
@ -337,18 +362,7 @@ func (m *Sealing) logEvents(events []statemachine.Event, state *SectorInfo) {
l.Trace = fmt.Sprintf("%+v", err) l.Trace = fmt.Sprintf("%+v", err)
} }
if len(state.Log) > 8000 { state.logAppend(l)
log.Warnw("truncating sector log", "sector", state.SectorNumber)
state.Log[2000] = Log{
Timestamp: uint64(time.Now().Unix()),
Message: "truncating log (above 8000 entries)",
Kind: fmt.Sprintf("truncate"),
}
state.Log = append(state.Log[:2000], state.Log[6000:]...)
}
state.Log = append(state.Log, l)
} }
} }
@ -536,6 +550,8 @@ func (m *Sealing) plan(events []statemachine.Event, state *SectorInfo) (func(sta
return m.handleSubmitReplicaUpdateFailed, processed, nil return m.handleSubmitReplicaUpdateFailed, processed, nil
case ReleaseSectorKeyFailed: case ReleaseSectorKeyFailed:
return m.handleReleaseSectorKeyFailed, 0, err return m.handleReleaseSectorKeyFailed, 0, err
case FinalizeReplicaUpdateFailed:
return m.handleFinalizeFailed, processed, nil
case AbortUpgrade: case AbortUpgrade:
return m.handleAbortUpgrade, processed, nil return m.handleAbortUpgrade, processed, nil

130
extern/storage-sealing/sector_state.go vendored
View File

@ -3,64 +3,65 @@ package sealing
type SectorState string type SectorState string
var ExistSectorStateList = map[SectorState]struct{}{ var ExistSectorStateList = map[SectorState]struct{}{
Empty: {}, Empty: {},
WaitDeals: {}, WaitDeals: {},
Packing: {}, Packing: {},
AddPiece: {}, AddPiece: {},
AddPieceFailed: {}, AddPieceFailed: {},
GetTicket: {}, GetTicket: {},
PreCommit1: {}, PreCommit1: {},
PreCommit2: {}, PreCommit2: {},
PreCommitting: {}, PreCommitting: {},
PreCommitWait: {}, PreCommitWait: {},
SubmitPreCommitBatch: {}, SubmitPreCommitBatch: {},
PreCommitBatchWait: {}, PreCommitBatchWait: {},
WaitSeed: {}, WaitSeed: {},
Committing: {}, Committing: {},
CommitFinalize: {}, CommitFinalize: {},
CommitFinalizeFailed: {}, CommitFinalizeFailed: {},
SubmitCommit: {}, SubmitCommit: {},
CommitWait: {}, CommitWait: {},
SubmitCommitAggregate: {}, SubmitCommitAggregate: {},
CommitAggregateWait: {}, CommitAggregateWait: {},
FinalizeSector: {}, FinalizeSector: {},
Proving: {}, Proving: {},
FailedUnrecoverable: {}, FailedUnrecoverable: {},
SealPreCommit1Failed: {}, SealPreCommit1Failed: {},
SealPreCommit2Failed: {}, SealPreCommit2Failed: {},
PreCommitFailed: {}, PreCommitFailed: {},
ComputeProofFailed: {}, ComputeProofFailed: {},
CommitFailed: {}, CommitFailed: {},
PackingFailed: {}, PackingFailed: {},
FinalizeFailed: {}, FinalizeFailed: {},
DealsExpired: {}, DealsExpired: {},
RecoverDealIDs: {}, RecoverDealIDs: {},
Faulty: {}, Faulty: {},
FaultReported: {}, FaultReported: {},
FaultedFinal: {}, FaultedFinal: {},
Terminating: {}, Terminating: {},
TerminateWait: {}, TerminateWait: {},
TerminateFinality: {}, TerminateFinality: {},
TerminateFailed: {}, TerminateFailed: {},
Removing: {}, Removing: {},
RemoveFailed: {}, RemoveFailed: {},
Removed: {}, Removed: {},
SnapDealsWaitDeals: {}, SnapDealsWaitDeals: {},
SnapDealsAddPiece: {}, SnapDealsAddPiece: {},
SnapDealsPacking: {}, SnapDealsPacking: {},
UpdateReplica: {}, UpdateReplica: {},
ProveReplicaUpdate: {}, ProveReplicaUpdate: {},
SubmitReplicaUpdate: {}, SubmitReplicaUpdate: {},
ReplicaUpdateWait: {}, ReplicaUpdateWait: {},
UpdateActivating: {}, UpdateActivating: {},
ReleaseSectorKey: {}, ReleaseSectorKey: {},
FinalizeReplicaUpdate: {}, FinalizeReplicaUpdate: {},
SnapDealsAddPieceFailed: {}, SnapDealsAddPieceFailed: {},
SnapDealsDealsExpired: {}, SnapDealsDealsExpired: {},
SnapDealsRecoverDealIDs: {}, SnapDealsRecoverDealIDs: {},
ReplicaUpdateFailed: {}, ReplicaUpdateFailed: {},
ReleaseSectorKeyFailed: {}, ReleaseSectorKeyFailed: {},
AbortUpgrade: {}, FinalizeReplicaUpdateFailed: {},
AbortUpgrade: {},
} }
// cmd/lotus-miner/info.go defines CLI colors corresponding to these states // cmd/lotus-miner/info.go defines CLI colors corresponding to these states
@ -124,12 +125,13 @@ const (
RecoverDealIDs SectorState = "RecoverDealIDs" RecoverDealIDs SectorState = "RecoverDealIDs"
// snap deals error modes // snap deals error modes
SnapDealsAddPieceFailed SectorState = "SnapDealsAddPieceFailed" SnapDealsAddPieceFailed SectorState = "SnapDealsAddPieceFailed"
SnapDealsDealsExpired SectorState = "SnapDealsDealsExpired" SnapDealsDealsExpired SectorState = "SnapDealsDealsExpired"
SnapDealsRecoverDealIDs SectorState = "SnapDealsRecoverDealIDs" SnapDealsRecoverDealIDs SectorState = "SnapDealsRecoverDealIDs"
AbortUpgrade SectorState = "AbortUpgrade" AbortUpgrade SectorState = "AbortUpgrade"
ReplicaUpdateFailed SectorState = "ReplicaUpdateFailed" ReplicaUpdateFailed SectorState = "ReplicaUpdateFailed"
ReleaseSectorKeyFailed SectorState = "ReleaseSectorKeyFailed" ReleaseSectorKeyFailed SectorState = "ReleaseSectorKeyFailed"
FinalizeReplicaUpdateFailed SectorState = "FinalizeReplicaUpdateFailed"
Faulty SectorState = "Faulty" // sector is corrupted or gone for some reason Faulty SectorState = "Faulty" // sector is corrupted or gone for some reason
FaultReported SectorState = "FaultReported" // sector has been declared as a fault on chain FaultReported SectorState = "FaultReported" // sector has been declared as a fault on chain