dm: fix MariaDB up down test (#11750)

close #4287
pingcap · Dec 26, 2024 · bcc2220 · bcc2220
1 parent 1d14c1d
commit bcc2220
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/dm_mariadb_master_down_and_up.yaml b/.github/workflows/dm_mariadb_master_down_and_up.yaml
@@ -63,3 +63,15 @@ jobs:
           name: upstream-switch-logs
           path: |
             ./logs
+
+      # Send feishu notification if failed.
+      - name: Feishu notification
+        continue-on-error: true
+        uses: foxundermoon/feishu-action@v2
+        if: ${{ failure() }}
+        with:
+          url: ${{ secrets.ENGINE_FEISHU_NOTIFY_URL }}
+          msg_type: text
+          content: |
+            text: |
+              mariadb restart job failed, see https://github.com/pingcap/tiflow/actions/runs/${{ github.run_id }}
diff --git a/dm/tests/mariadb_master_down_and_up/case.sh b/dm/tests/mariadb_master_down_and_up/case.sh
@@ -143,6 +143,7 @@ function test_master_down_and_up() {
 function run() {
 	wait_mysql 3306 1
 	wait_mysql 3307 2
+	exec_tidb $tidb_port "set global tidb_general_log='on';"
 	test_master_down_and_up no_relay
 	test_master_down_and_up relay
 }

diff --git a/dm/tests/mariadb_master_down_and_up/docker-compose.yml b/dm/tests/mariadb_master_down_and_up/docker-compose.yml
@@ -17,7 +17,7 @@ x-node: &default-node
 services:
   mariadb_master:
     <<: *default-node
-    image: mariadb:10.1
+    image: mariadb:11.3 # change to latest after fix https://github.com/pingcap/tiflow/issues/11784
     command: --log-bin=/var/lib/mysql/mysql-bin --log_slave_updates=ON --server-id=1 --gtid_domain_id=0 --binlog-format=ROW
     container_name: mariadb_master
     hostname: mariadb_master
@@ -26,7 +26,7 @@ services:
 
   mariadb_slave:
     <<: *default-node
-    image: mariadb:10.1
+    image: mariadb:11.3
     command: --log-bin=/var/lib/mysql/mysql-bin --log_slave_updates=ON --server-id=2 --gtid_domain_id=0 --binlog-format=ROW
     container_name: mariadb_slave
     hostname: mariadb_slave