Skip to content

Commit 95dae31

Browse files
committed
fix(coordinator): fix not-compatible-prover errors counting towards number of attempts (#1619)
1 parent 5f79735 commit 95dae31

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

coordinator/internal/logic/provertask/batch_prover_task.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@ func (bp *BatchProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato
135135
return nil, nil
136136
}
137137

138-
log.Info("start batch proof generation session", "task_id", batchTask.Hash, "public key", taskCtx.PublicKey, "prover name", taskCtx.ProverName)
139-
140138
hardForkName, getHardForkErr := bp.hardForkName(ctx, batchTask)
141139
if getHardForkErr != nil {
142140
bp.recoverActiveAttempts(ctx, batchTask)
@@ -146,13 +144,14 @@ func (bp *BatchProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato
146144

147145
if _, ok := taskCtx.HardForkNames[hardForkName]; !ok {
148146
bp.recoverActiveAttempts(ctx, batchTask)
149-
log.Error("incompatible prover version",
147+
log.Debug("incompatible prover version",
150148
"requisite hard fork name", hardForkName,
151149
"prover hard fork name", taskCtx.HardForkNames,
152150
"task_id", batchTask.Hash)
153-
return nil, ErrCoordinatorInternalFailure
151+
return nil, nil
154152
}
155153

154+
log.Info("start batch proof generation session", "task_id", batchTask.Hash, "public key", taskCtx.PublicKey, "prover name", taskCtx.ProverName)
156155
proverTask := orm.ProverTask{
157156
TaskID: batchTask.Hash,
158157
ProverPublicKey: taskCtx.PublicKey,

coordinator/internal/logic/provertask/bundle_prover_task.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@ func (bp *BundleProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinat
135135
return nil, nil
136136
}
137137

138-
log.Info("start bundle proof generation session", "task index", bundleTask.Index, "public key", taskCtx.PublicKey, "prover name", taskCtx.ProverName)
139-
140138
hardForkName, getHardForkErr := bp.hardForkName(ctx, bundleTask)
141139
if getHardForkErr != nil {
142140
bp.recoverActiveAttempts(ctx, bundleTask)
@@ -146,13 +144,14 @@ func (bp *BundleProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinat
146144

147145
if _, ok := taskCtx.HardForkNames[hardForkName]; !ok {
148146
bp.recoverActiveAttempts(ctx, bundleTask)
149-
log.Error("incompatible prover version",
147+
log.Debug("incompatible prover version",
150148
"requisite hard fork name", hardForkName,
151149
"prover hard fork name", taskCtx.HardForkNames,
152150
"task_id", bundleTask.Hash)
153-
return nil, ErrCoordinatorInternalFailure
151+
return nil, nil
154152
}
155153

154+
log.Info("start bundle proof generation session", "task index", bundleTask.Index, "public key", taskCtx.PublicKey, "prover name", taskCtx.ProverName)
156155
proverTask := orm.ProverTask{
157156
TaskID: bundleTask.Hash,
158157
ProverPublicKey: taskCtx.PublicKey,

coordinator/internal/logic/provertask/chunk_prover_task.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato
133133
return nil, nil
134134
}
135135

136-
log.Info("start chunk generation session", "task_id", chunkTask.Hash, "public key", taskCtx.PublicKey, "prover name", taskCtx.ProverName)
137-
138136
hardForkName, getHardForkErr := cp.hardForkName(ctx, chunkTask)
139137
if getHardForkErr != nil {
140138
cp.recoverActiveAttempts(ctx, chunkTask)
@@ -144,13 +142,14 @@ func (cp *ChunkProverTask) Assign(ctx *gin.Context, getTaskParameter *coordinato
144142

145143
if _, ok := taskCtx.HardForkNames[hardForkName]; !ok {
146144
cp.recoverActiveAttempts(ctx, chunkTask)
147-
log.Error("incompatible prover version",
145+
log.Debug("incompatible prover version",
148146
"requisite hard fork name", hardForkName,
149147
"prover hard fork name", taskCtx.HardForkNames,
150148
"task_id", chunkTask.Hash)
151-
return nil, ErrCoordinatorInternalFailure
149+
return nil, nil
152150
}
153151

152+
log.Info("start chunk generation session", "task_id", chunkTask.Hash, "public key", taskCtx.PublicKey, "prover name", taskCtx.ProverName)
154153
proverTask := orm.ProverTask{
155154
TaskID: chunkTask.Hash,
156155
ProverPublicKey: taskCtx.PublicKey,

0 commit comments

Comments
 (0)