Skip to content

Commit b944dfc

Browse files
committed
fix localtests
1 parent 82f5331 commit b944dfc

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

go/logic/applier.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1350,7 +1350,7 @@ func (this *Applier) AtomicCutOverMagicLock(sessionIdChan chan int64, tableLocke
13501350

13511351
this.migrationContext.Log.Infof("Session renameLockSessionId is %+v", *renameLockSessionId)
13521352
// Checking the lock is held by rename session
1353-
if *renameLockSessionId > 0 && this.migrationContext.IsOpenMetadataLockInstruments {
1353+
if *renameLockSessionId > 0 && this.migrationContext.IsOpenMetadataLockInstruments && !this.migrationContext.SkipMetadataLockCheck {
13541354
sleepDuration := time.Duration(10*this.migrationContext.CutOverLockTimeoutSeconds) * time.Millisecond
13551355
for i := 1; i <= 100; i++ {
13561356
err := this.ExpectMetadataLock(*renameLockSessionId)

localtests/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ services:
22
mysql-primary:
33
image: $TEST_MYSQL_IMAGE
44
container_name: mysql-primary
5-
command: --server-id=1 --log-bin=mysql-bin --binlog-format=row --gtid-mode=ON --enforce-gtid-consistency=ON --character-set-server=utf8mb4 $MYSQL_NATIVE_PASSWORD_FLAG --performance-shema=ON
5+
command: --server-id=1 --log-bin=mysql-bin --binlog-format=row --gtid-mode=ON --enforce-gtid-consistency=ON --character-set-server=utf8mb4 $MYSQL_NATIVE_PASSWORD_FLAG
66
environment:
77
MYSQL_ROOT_PASSWORD: opensesame
88
MYSQL_ROOT_HOST: '%'
@@ -16,7 +16,7 @@ services:
1616
mysql-replica:
1717
image: $TEST_MYSQL_IMAGE
1818
container_name: mysql-replica
19-
command: --server-id=2 --log-bin=mysql-bin --binlog-format=row --gtid-mode=ON --enforce-gtid-consistency=ON --log-slave-updates=ON --character-set-server=utf8mb4 $MYSQL_NATIVE_PASSWORD_FLAG --performance-schema=ON
19+
command: --server-id=2 --log-bin=mysql-bin --binlog-format=row --gtid-mode=ON --enforce-gtid-consistency=ON --log-slave-updates=ON --character-set-server=utf8mb4 $MYSQL_NATIVE_PASSWORD_FLAG
2020
environment:
2121
MYSQL_ROOT_PASSWORD: opensesame
2222
MYSQL_ROOT_HOST: '%'

localtests/test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ test_single() {
287287
--alter='engine=${storage_engine}' \
288288
--exact-rowcount \
289289
--assume-rbr \
290+
--skip-metadata-lock-check \
290291
--initially-drop-old-table \
291292
--initially-drop-ghost-table \
292293
--throttle-query='select timestampdiff(second, min(last_update), now()) < 5 from _${table_name}_ghc' \

0 commit comments

Comments
 (0)