fix application of applyEvent.writeFunc

Author: meiji163

go/logic/migrator.go

@@ -1293,9 +1293,9 @@ func (this *Migrator) onApplyEventStruct(eventStruct *applyEventStruct) error {
 		}
 		return nil
 	}
-	// if eventStruct.dmlEvent == nil {
-	// 	return handleNonDMLEventStruct(eventStruct)
-	// }
+	if eventStruct.writeFunc != nil {
+		return handleNonDMLEventStruct(eventStruct)
+	}
 	if eventStruct.trxEvent != nil {
 		this.migrationContext.Log.Infof("got transaction: %+v", eventStruct.trxEvent)
 		batchSize := int(atomic.LoadInt64(&this.migrationContext.DMLBatchSize))

localtests/docker-compose.yml

@@ -2,9 +2,9 @@ services:
   mysql-primary:
     image: mysql:8.0.39
     container_name: mysql-primary
-    command: --server-id=1 --log-bin=mysql-bin --binlog-format=row --gtid-mode=ON
-    volumes:
-      - /var/lib/mysql
+    command: --server-id=1 --log-bin=mysql-bin --binlog-format=row --gtid-mode=ON --enforce-gtid-consistency=ON
+    # volumes:
+    #   - /var/lib/mysql
     environment:
       MYSQL_ROOT_PASSWORD: opensesame
       MYSQL_DATABASE: test
@@ -18,9 +18,9 @@ services:
   mysql-replica:
     image: mysql:8.0.39
     container_name: mysql-replica
-    command: --server-id=2 --log-bin=mysql-bin --binlog-format=row --gtid-mode=ON
-    volumes:
-      - /var/lib/mysql
+    command: --server-id=2 --log-bin=mysql-bin --binlog-format=row --gtid-mode=ON --enforce-gtid-consistency=ON
+    # volumes:
+    #   - /var/lib/mysql
     environment:
       MYSQL_ROOT_PASSWORD: opensesame
       MYSQL_DATABASE: test

localtests/test.sh

@@ -23,15 +23,18 @@ master_port=
 replica_host=
 replica_port=
 original_sql_mode=
+docker=false
 
 OPTIND=1
-while getopts "b:s:" OPTION
+while getopts "b:s:d" OPTION
 do
   case $OPTION in
     b)
       ghost_binary="$OPTARG";;
     s)
       storage_engine="$OPTARG";;
+    d)
+      docker=true;;
   esac
 done
 shift $((OPTIND-1))
@@ -94,20 +97,17 @@ start_replication() {
   done
 }
 
-test_single_docker() {
-  #docker compose setup
-  master_host="0.0.0.0"
-  master_port="3307"
-  replica_host="0.0.0.0"
-  replica_port="3308"
-
-  test_single "$1"
-}
-
 test_single() {
   local test_name
   test_name="$1"
 
+  if [ "$docker" = true ]; then
+    master_host="0.0.0.0"
+    master_port="3307"
+    replica_host="0.0.0.0"
+    replica_port="3308"
+  fi
+
   if [ -f $tests_path/$test_name/ignore_versions ] ; then
     ignore_versions=$(cat $tests_path/$test_name/ignore_versions)
     mysql_version=$(gh-ost-test-mysql-master -s -s -e "select @@version")

script/docker-gh-ost-replica-tests

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 verbose=true
+# execute from gh-ost repo root directory
 root_dir="$PWD"
 
 container_exec() {
@@ -10,14 +11,6 @@ container_exec() {
     docker exec "$1" bash -c "MYSQL_PWD=opensesame mysql -uroot -Ne \"$2\" test"
 }
 
-primary_exec() {
-    container_exec "mysql-primary" "$1"
-}
-
-replica_exec() {
-    container_exec "mysql-replica" "$1"
-}
-
 poll_container() {
     CTR=0
     while ! container_exec "$1" "select 1;" 2>&1 | grep -q "1"
@@ -37,11 +30,16 @@ setup() {
     poll_container "mysql-primary"
     poll_container "mysql-replica"
 
-    primary_exec "alter user 'repl'@'%' identified with 'mysql_native_password' by 'repl';"
-    primary_exec "grant replication slave on *.* to 'repl'@'%'; flush privileges;"
-    primary_exec "show master status;" | read logfile logpos
-    replica_exec "change replication source to source_host='mysql-primary', source_port=3307, source_user='repl', source_password='repl', source_log_file='$logfile', source_log_pos=$logpos;"
-    replica_exec "start replica;"
+    export PATH="$PATH:$root_dir/script"
+
+    gh-ost-test-mysql-master -e "alter user 'repl'@'%' identified with 'mysql_native_password' by 'repl';"
+    gh-ost-test-mysql-master -e "grant replication slave on *.* to 'repl'@'%'; flush privileges;"
+    gh-ost-test-mysql-master -e "create user if not exists 'gh-ost'@'%' identified by 'gh-ost'"
+    gh-ost-test-mysql-master -e "grant all on *.* to 'gh-ost'@'%'"
+
+    gh-ost-test-mysql-replica -e "flush privileges;"
+    gh-ost-test-mysql-replica -e "change replication source to source_host='mysql-primary', source_port=3307, source_user='repl', source_password='repl', source_auto_position=1;"
+    gh-ost-test-mysql-replica -e "start replica;"
 }
 
-#setup
+setup