support mock wdpost faulty sectors

filecoin-project · Jan 17, 2022 · 55d9db6 · 55d9db6
1 parent f3afd92
commit 55d9db6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/.github/workflows/tag-workflow.yml b/.github/workflows/tag-workflow.yml
@@ -36,7 +36,8 @@ jobs:
           export job_url=$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID
           export oss_exists=0
           export ftp_exists=0
-          if [[ "${{github.event_name}}" == "create" ]] && ([[ "$github_tag" =~ "v1." ]] || [[ "$github_tag" =~ "v2." ]]); then
+          export rx='^v([0-9]+\.){0,2}(\*|[0-9]+)(-rc[0-9]*){0,1}$'
+          if [[ "${{github.ref_type}}" == "tag" ]] && [[ "${{github.event_name}}" == "create" ]] && [[ "$github_tag" =~ $rx ]]; then
             export pub_method=pushRelease
           fi
           if [[ "$branch" == "" ]]; then
@@ -101,8 +102,7 @@ jobs:
         run: sudo apt-get install make ncftp mesa-opencl-icd ocl-icd-opencl-dev gcc git bzr jq pkg-config curl clang build-essential hwloc libhwloc-dev wget -y && sudo apt upgrade -y
       - name: Build
         run: |
-          sudo make deps
-          sudo make
+          make deps && make 
           mkdir ./release && mv ./venus-sealer ./venus-worker ./release
       - name: Zip Release
         uses: TheDoctor0/[email protected]

diff --git a/app/venus-sealer/proving.go b/app/venus-sealer/proving.go
@@ -547,6 +547,11 @@ var provingMockWdPoStTaskCmd = &cli.Command{
 			Required: true,
 			Usage:    "specify the partition which need mock",
 		},
+		&cli.BoolFlag{
+			Name:  "include-faulty",
+			Value: false,
+			Usage: "whether include faulty sectors or not",
+		},
 	},
 	Action: func(cctx *cli.Context) error {
 
@@ -581,13 +586,14 @@ var provingMockWdPoStTaskCmd = &cli.Command{
 			return fmt.Errorf("partition-idx is range out of partitions array: %d <= %d", len(partitions), pidx)
 		}
 
-		toProve, err := bitfield.SubtractBitField(partitions[pidx].LiveSectors, partitions[pidx].FaultySectors)
-		if err != nil {
-			return err
+		toProve := partitions[pidx].LiveSectors
+		if !cctx.Bool("include-faulty") {
+			if toProve, err = bitfield.SubtractBitField(partitions[pidx].LiveSectors, partitions[pidx].FaultySectors); err != nil {
+				return err
+			}
 		}
 
-		toProve, err = bitfield.MergeBitFields(toProve, partitions[pidx].RecoveringSectors)
-		if err != nil {
+		if toProve, err = bitfield.MergeBitFields(toProve, partitions[pidx].RecoveringSectors); err != nil {
 			return err
 		}