Merge pull request #6326 from filecoin-project/chore/pick-6294

chore: pick 6294 6313

.circleci/config.yml

@@ -72,7 +72,7 @@ commands:
 executors:
   golang:
     docker:
-      - image: cimg/go:1.20.11
+      - image: cimg/go:1.21.7
 
 jobs:
   test_all:

.github/workflows/baisc_checks.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           cache: true
 
       - name: install deps
@@ -35,7 +35,7 @@ jobs:
 
       - name: Lint
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.51.0
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.57.2
           golangci-lint run --timeout 10m
 
       - name: Compatible all

.github/workflows/common_build_upload.yml

@@ -108,7 +108,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           cache: true
 
       - name: install deps
@@ -237,7 +237,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           cache: true
 
       - name: install more deps

.github/workflows/common_go.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           cache: true
 
       - name: vars
@@ -56,7 +56,7 @@ jobs:
 
       - name: Lint
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.51.0
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.57.2
           golangci-lint run --timeout 10m
 
       - name: Detect changes
@@ -70,13 +70,13 @@ jobs:
           export GOLOG_LOG_LEVEL=${{ inputs.log_level }}
           go test -coverpkg=./... -race -coverprofile=coverage.txt -covermode=atomic ./... -v --timeout ${{ inputs.test_timeout }}m
 
+      # https://github.com/codecov/codecov-action/issues/557#issuecomment-1216749652
       - name: Upload
         uses: codecov/codecov-action@v3
         with:
-          # https://github.com/codecov/codecov-action/issues/557#issuecomment-1216749652
           token: ${{ secrets.CODECOV_TOKEN }}
           files:  ./coverage.txt
           flags: unittests
           name: ${{steps.vars.outputs.repo_name}}
-          fail_ci_if_error: true
+          fail_ci_if_error: false
           verbose: true

.github/workflows/test.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           cache: true
 
       - name: install deps

.golangci.yml

@@ -5,7 +5,6 @@ linters:
     - govet
     - misspell
     - goconst
-    - revive
     - errcheck
     - unconvert
     - staticcheck

go.mod

@@ -1,6 +1,6 @@
 module github.com/filecoin-project/venus
 
-go 1.19
+go 1.21
 
 require (
 	contrib.go.opencensus.io/exporter/prometheus v0.4.2

pkg/shardedmutex/shardedmutex.go

@@ -5,14 +5,11 @@ import (
 	"sync"
 )
 
-const cacheline = 64
-
 // padding a mutex to a cacheline improves performance as the cachelines are not contested
 // name     old time/op  new time/op  delta
 // Locks-8  74.6ns ± 7%  12.3ns ± 2%  -83.54%  (p=0.000 n=20+18)
 type paddedMutex struct {
-	mt  sync.Mutex
-	pad [cacheline - 8]uint8 //nolint:unused
+	mt sync.Mutex
 }
 
 type ShardedMutex struct { //nolint:revive