Merge branch 'master' into log_down_peer

AndreMouche · Apr 17, 2024 · 70843be · 70843be
2 parents f250913 + 4c0a862
commit 70843be
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 40 deletions.
diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml
@@ -8,21 +8,11 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-      - uses: actions/setup-go@v3
-        with:
-          go-version: '1.21'
       - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Restore cache
-        uses: actions/cache@v3
+        uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          path: |
-            ~/go/pkg/mod
-            ~/.cache/go-build
-            **/.dashboard_download_cache
-          key: ${{ runner.os }}-golang-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-golang
+          go-version: '1.21'
       - name: Make Check
         run: |
           SWAGGER=1 make build

diff --git a/.github/workflows/label.yaml b/.github/workflows/label.yaml
@@ -7,7 +7,7 @@ jobs:
   add_labels:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v4
+      - uses: actions/github-script@v7
         name: Add labels
         with:
           script: |

diff --git a/.github/workflows/pd-docker-image.yaml b/.github/workflows/pd-docker-image.yaml
@@ -15,10 +15,10 @@ jobs:
     strategy:
       fail-fast: true
     steps:
-      - uses: actions/setup-go@v3
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: '1.21'
-      - name: Checkout code
-        uses: actions/checkout@v3
       - name: Make
         run: make docker-image
diff --git a/.github/workflows/pd-tests.yaml b/.github/workflows/pd-tests.yaml
@@ -29,20 +29,11 @@ jobs:
     outputs:
       job-total: 13
     steps:
-      - uses: actions/setup-go@v3
-        with:
-          go-version: '1.21'
       - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Restore cache
-        uses: actions/cache@v3
+        uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          path: |
-            ~/go/pkg/mod
-            ~/.cache/go-build
-            **/.tools
-            **/.dashboard_download_cache
-          key: ${{ runner.os }}-go-${{ matrix.worker_id }}-${{ hashFiles('**/go.sum') }}
+          go-version: '1.21'
       - name: Make Test
         env:
           WORKER_ID: ${{ matrix.worker_id }}
@@ -53,20 +44,21 @@ jobs:
           mv covprofile covprofile_$WORKER_ID
           sed -i "/failpoint_binding/d" covprofile_$WORKER_ID
       - name: Upload coverage result ${{ matrix.worker_id }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: cover-reports
+          name: cover-reports-${{ matrix.worker_id }}
           path: covprofile_${{ matrix.worker_id }}
   report-coverage:
     needs: chunks
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Download chunk report
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
-          name: cover-reports
+          pattern: cover-reports-*
+          merge-multiple: true
       - name: Merge
         env:
           TOTAL_JOBS: ${{needs.chunks.outputs.job-total}}

diff --git a/.github/workflows/tso-consistency-test.yaml b/.github/workflows/tso-consistency-test.yaml
@@ -8,10 +8,10 @@ jobs:
   tso-consistency-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: '1.21'
-      - name: Checkout code
-        uses: actions/checkout@v3
       - name: Make TSO Consistency Test
         run: make test-tso-consistency
diff --git a/.github/workflows/tso-function-test.yaml b/.github/workflows/tso-function-test.yaml
@@ -21,10 +21,10 @@ jobs:
   tso-function-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: '1.21'
-      - name: Checkout code
-        uses: actions/checkout@v3
       - name: Make TSO Function Test
         run: make test-tso-function
diff --git a/tests/integrations/mcs/scheduling/api_test.go b/tests/integrations/mcs/scheduling/api_test.go
@@ -651,6 +651,9 @@ func (suite *apiTestSuite) checkStores(cluster *tests.TestCluster) {
 	tests.MustPutRegion(re, cluster, 3, 6, []byte("a"), []byte("b"))
 	for _, store := range stores {
 		tests.MustPutStore(re, cluster, store)
+		if store.GetId() == 6 {
+			cluster.GetLeaderServer().GetRaftCluster().GetBasicCluster().UpdateStoreStatus(6)
+		}
 	}
 	// Test /stores
 	apiServerAddr := cluster.GetLeaderServer().GetAddr()