From 76ef39e8a86f0f331e327ca68b27d299852e4d52 Mon Sep 17 00:00:00 2001 From: Tian Xia Date: Fri, 19 Feb 2016 15:38:02 -0800 Subject: [PATCH] Fix test failures in innodb_hugestress_blob_* Summary: Squash with cf208d3 Fix test failures in innodb_hugestress_docstore_* (Applying the same test fix of cf208d3 to innodb_hugestress_blob_* as well) Test Plan: Ran `./mtr --suite=innodb_stress --force --big-test --testcase-timeout=5000 --suite-timeout=500` innodb_stress.innodb_hugestress_blob [ pass ] 1683714 innodb_stress.innodb_hugestress_blob_nocompress [ pass ] 1695799 innodb_stress.innodb_hugestress_crash_blob [ pass ] 1270480 innodb_stress.innodb_hugestress_crash_blob_nocompress [ pass ] 1277275 Reviewers: santoshb, jtolmer Reviewed By: jtolmer Subscribers: webscalesql-eng Differential Revision: https://reviews.facebook.net/D54519 --- mysql-test/suite/innodb_stress/include/innodb_stress.inc | 4 ++-- .../suite/innodb_stress/t/innodb_hugestress_blob-master.opt | 1 + .../suite/innodb_stress/t/innodb_hugestress_blob-slave.opt | 1 + .../t/innodb_hugestress_blob_nocompress-master.opt | 1 + .../t/innodb_hugestress_blob_nocompress-slave.opt | 1 + .../innodb_stress/t/innodb_hugestress_crash_blob-master.opt | 1 + .../innodb_stress/t/innodb_hugestress_crash_blob-slave.opt | 1 + .../t/innodb_hugestress_crash_blob_nocompress-master.opt | 1 + .../t/innodb_hugestress_crash_blob_nocompress-slave.opt | 1 + 9 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mysql-test/suite/innodb_stress/include/innodb_stress.inc b/mysql-test/suite/innodb_stress/include/innodb_stress.inc index 38da98c603ed..f33064e51293 100755 --- a/mysql-test/suite/innodb_stress/include/innodb_stress.inc +++ b/mysql-test/suite/innodb_stress/include/innodb_stress.inc @@ -16,7 +16,7 @@ --let $histogram_step_size_binlog_fsync_save_slave = `SELECT @@histogram_step_size_binlog_fsync` --disable_query_log -# DocStore hugestress tests create large transaction (redo) logs. Suppress +# DocStore/blob hugestress tests create large transaction (redo) logs. Suppress # warnings of resizing redo logs call mtr.add_suppression("InnoDB: Resizing redo log"); call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files"); @@ -38,7 +38,7 @@ call mtr.add_suppression("Warning: database page corruption or a failed"); # Defragmentation might still hold a table open so drop table will be executed asynchronously, generating warning. call mtr.add_suppression("InnoDB: Warning: MySQL is trying to drop table "); -# DocStore hugestress tests create large transaction (redo) logs. Suppress +# DocStore/blob hugestress tests create large transaction (redo) logs. Suppress # warnings of resizing redo logs call mtr.add_suppression("InnoDB: Resizing redo log"); call mtr.add_suppression("InnoDB: Starting to delete and rewrite log files"); diff --git a/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob-master.opt b/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob-master.opt index a46d8a05a89a..f3749f557c2f 100755 --- a/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob-master.opt +++ b/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob-master.opt @@ -4,3 +4,4 @@ --innodb_flush_log_at_trx_commit=2 --force-restart --innodb_buffer_pool_size=512M +--innodb_log_file_size=128M diff --git a/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob-slave.opt b/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob-slave.opt index 5c2c72612de2..c0e7ae929190 100755 --- a/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob-slave.opt +++ b/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob-slave.opt @@ -1,3 +1,4 @@ --innodb_flush_log_at_trx_commit=2 --innodb_buffer_pool_size=512M --log_slave_updates=0 +--innodb_log_file_size=128M diff --git a/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress-master.opt b/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress-master.opt index a46d8a05a89a..f3749f557c2f 100755 --- a/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress-master.opt +++ b/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress-master.opt @@ -4,3 +4,4 @@ --innodb_flush_log_at_trx_commit=2 --force-restart --innodb_buffer_pool_size=512M +--innodb_log_file_size=128M diff --git a/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress-slave.opt b/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress-slave.opt index 5c2c72612de2..c0e7ae929190 100755 --- a/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress-slave.opt +++ b/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress-slave.opt @@ -1,3 +1,4 @@ --innodb_flush_log_at_trx_commit=2 --innodb_buffer_pool_size=512M --log_slave_updates=0 +--innodb_log_file_size=128M diff --git a/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob-master.opt b/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob-master.opt index a46d8a05a89a..f3749f557c2f 100755 --- a/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob-master.opt +++ b/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob-master.opt @@ -4,3 +4,4 @@ --innodb_flush_log_at_trx_commit=2 --force-restart --innodb_buffer_pool_size=512M +--innodb_log_file_size=128M diff --git a/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob-slave.opt b/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob-slave.opt index 5c2c72612de2..c0e7ae929190 100755 --- a/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob-slave.opt +++ b/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob-slave.opt @@ -1,3 +1,4 @@ --innodb_flush_log_at_trx_commit=2 --innodb_buffer_pool_size=512M --log_slave_updates=0 +--innodb_log_file_size=128M diff --git a/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress-master.opt b/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress-master.opt index a46d8a05a89a..f3749f557c2f 100755 --- a/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress-master.opt +++ b/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress-master.opt @@ -4,3 +4,4 @@ --innodb_flush_log_at_trx_commit=2 --force-restart --innodb_buffer_pool_size=512M +--innodb_log_file_size=128M diff --git a/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress-slave.opt b/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress-slave.opt index 5c2c72612de2..c0e7ae929190 100755 --- a/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress-slave.opt +++ b/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress-slave.opt @@ -1,3 +1,4 @@ --innodb_flush_log_at_trx_commit=2 --innodb_buffer_pool_size=512M --log_slave_updates=0 +--innodb_log_file_size=128M