fix: enabling verify_pc2 will automatically abort task. because pc2_out is not correctly set to sector state

CHANGELOG.zh.md

@@ -14,7 +14,7 @@
 
 - damocles-worker
   - 修复无法从统一链服务入口获取 piece 文件 [#1041](https://github.com/ipfs-force-community/damocles/pull/1041)
-  - 支持校验 pc2 的结果 [#1060](https://github.com/ipfs-force-community/damocles/pull/1060)
+  - 支持在 pc2 完成后校验封装的结果 [#1060](https://github.com/ipfs-force-community/damocles/pull/1060)
 
 ## v0.9.0
 

damocles-worker/src/config.rs

@@ -63,8 +63,8 @@ pub struct Sealing {
     /// max retry times for request task from sector manager
     pub request_task_max_retries: u32,
 
-    // whether to verify the results of pc2
-    pub verify_pc2: bool,
+    // whether to verify the sealing results alfter pc2
+    pub verify_after_pc2: bool,
 }
 
 impl Default for Sealing {
@@ -82,7 +82,7 @@ impl Default for Sealing {
             rpc_polling_interval: Duration::from_secs(180),
             ignore_proof_check: false,
             request_task_max_retries: 3,
-            verify_pc2: false,
+            verify_after_pc2: false,
         }
     }
 }
@@ -132,8 +132,8 @@ pub struct SealingOptional {
     /// max retry times for request task from sector manager
     pub request_task_max_retries: Option<u32>,
 
-    // whether to verify the results of pc2
-    pub verify_pc2: Option<bool>,
+    // whether to verify the sealing results after pc2
+    pub verify_after_pc2: Option<bool>,
 }
 
 /// configuration for remote store

damocles-worker/src/sealing/config.rs

@@ -160,7 +160,7 @@ pub(crate) fn merge_sealing_fields(
             rpc_polling_interval,
             ignore_proof_check,
             request_task_max_retries,
-            verify_pc2,
+            verify_after_pc2,
         },
     }
 }
@@ -397,7 +397,7 @@ mod tests {
                         rpc_polling_interval: ms(1000),
                         ignore_proof_check: true,
                         request_task_max_retries: 10,
-                        verify_pc2: false,
+                        verify_after_pc2: false,
                     },
                 },
                 SealingThreadInner {
@@ -415,7 +415,7 @@ mod tests {
                         rpc_polling_interval: Some(ms(1000)),
                         ignore_proof_check: None,
                         request_task_max_retries: Some(11),
-                        verify_pc2: Some(true),
+                        verify_after_pc2: Some(true),
                     }),
                 },
                 SealingWithPlan {
@@ -433,7 +433,7 @@ mod tests {
                         rpc_polling_interval: ms(1000),
                         ignore_proof_check: true,
                         request_task_max_retries: 11,
-                        verify_pc2: true,
+                        verify_after_pc2: true,
                     },
                 },
             ),

damocles-worker/src/sealing/sealing_thread/planner/common/sealing.rs

@@ -333,6 +333,7 @@ pub(crate) fn pre_commit2(
                 seed: [0; 32].into(),
                 epoch: 0,
             },
+            out.clone(),
         )?;
     }
 
@@ -348,12 +349,18 @@ pub(crate) fn commit1_with_seed(
 ) -> Result<SealCommitPhase1Output, Failure> {
     let _token = task.sealing_ctrl.ctrl_ctx().wait(STAGE_NAME_C1).crit()?;
 
-    commit1_with_seed_inner(task, seed)
+    cloned_required! {
+        pc2out,
+        task.sector.phases.pc2out
+    }
+
+    commit1_with_seed_inner(task, seed, pc2out)
 }
 
 pub(crate) fn commit1_with_seed_inner(
     task: &Task,
     seed: Seed,
+    pc2out: SealPreCommitPhase2Output,
 ) -> Result<SealCommitPhase1Output, Failure> {
     let sector_id = task.sector_id()?;
 
@@ -374,11 +381,6 @@ pub(crate) fn commit1_with_seed_inner(
         task.sector.phases.ticket.as_ref()
     }
 
-    cloned_required! {
-        p2out,
-        task.sector.phases.pc2out
-    }
-
     let cache_dir = task.cache_dir(sector_id);
     let sealed_file = task.sealed_file(sector_id);
 
@@ -389,7 +391,7 @@ pub(crate) fn commit1_with_seed_inner(
         seal_sector_id,
         ticket.ticket.0,
         seed.seed.0,
-        p2out,
+        pc2out,
         piece_infos,
     )
     .perm()?;

damocles-worker/src/sealing/sealing_thread/planner/sealer.rs

@@ -267,8 +267,8 @@ impl<'t> Sealer<'t> {
     }
 
     fn handle_pc1_done(&self) -> Result<Event, Failure> {
-        let verify_pc2 = self.task.sealing_ctrl.config().verify_pc2;
-        common::pre_commit2(self.task, verify_pc2).map(|out| {
+        let verify_after_pc2 = self.task.sealing_ctrl.config().verify_after_pc2;
+        common::pre_commit2(self.task, verify_after_pc2).map(|out| {
             if out
                 .registered_proof
                 .feature_enabled(ApiFeature::SyntheticPoRep)

docs/en/03.damocles-worker-config.md

@@ -277,9 +277,9 @@ rpc_client.addr = "/ip4/127.0.0.1/tcp/1789"
 # default is 3
 # request_task_max_retries = 3
 
-# Whether to enable verification of PC2 results
+# whether to verify the sealing results after pc2
 # default is false
-# verify_pc2 = false
+# verify_after_pc2 = false
 ```
 
 The configuration items in `sealing` usually have default items preset from experiences, which removes the need for manual configurations in most cases.

docs/zh/03.damocles-worker的配置解析.md

@@ -279,9 +279,9 @@ rpc_client.addr = "/ip4/127.0.0.1/tcp/1789"
 # 默认为 3
 # request_task_max_retries = 3
 
-# 是否启用校验 pc2 的结果
+# 是否启用在 pc2 完成后校验封装的结果
 # 默认为 false
-# verify_pc2 = false
+# verify_after_pc2 = false
 ```
 
 `sealing` 中的配置项通常有根据经验预设的默认项，这使得我们在绝大多数情况下无需自行配置。