Skip to content

Commit 71e10ba

Browse files
committed
Make innodb.innodb-table-online more stable
Occasionally, the test would fail with a result difference for ddl_log_file_alter_table (0 instead of 1) due to some nondeterminism in the test. Let us remove that nondeterminism.
1 parent 3cfbfa5 commit 71e10ba

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

mysql-test/suite/innodb/r/innodb-table-online.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,10 +202,10 @@ SET lock_wait_timeout = 10;
202202
ALTER TABLE t1 ROW_FORMAT=COMPACT
203203
PAGE_COMPRESSED = YES PAGE_COMPRESSION_LEVEL = 1, ALGORITHM = INPLACE;
204204
connection default;
205+
SET DEBUG_SYNC = 'now WAIT_FOR rebuilt2';
205206
INSERT INTO t1 SELECT 80 + c1, c2, c3 FROM t1;
206207
INSERT INTO t1 SELECT 160 + c1, c2, c3 FROM t1;
207208
UPDATE t1 SET c2 = c2 + 1;
208-
SET DEBUG_SYNC = 'now WAIT_FOR rebuilt2';
209209
SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl';
210210
name count
211211
ddl_background_drop_indexes 0

mysql-test/suite/innodb/t/innodb-table-online.test

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,12 @@ ALTER TABLE t1 ROW_FORMAT=COMPACT
195195
PAGE_COMPRESSED = YES PAGE_COMPRESSION_LEVEL = 1, ALGORITHM = INPLACE;
196196

197197
# Generate some log (delete-mark, delete-unmark, insert etc.)
198-
# while the index creation is blocked. Some of this may run
199-
# in parallel with the clustered index scan.
198+
# while the index creation is blocked.
200199
connection default;
200+
SET DEBUG_SYNC = 'now WAIT_FOR rebuilt2';
201201
INSERT INTO t1 SELECT 80 + c1, c2, c3 FROM t1;
202202
INSERT INTO t1 SELECT 160 + c1, c2, c3 FROM t1;
203203
UPDATE t1 SET c2 = c2 + 1;
204-
SET DEBUG_SYNC = 'now WAIT_FOR rebuilt2';
205204
# At this point, the clustered index scan must have completed,
206205
# but the modification log keeps accumulating due to the DEBUG_SYNC.
207206
eval $innodb_metrics_select;

0 commit comments

Comments
 (0)