From 629c60973d0ddfd89ae33c0d46a6d2adf756bf3d Mon Sep 17 00:00:00 2001 From: Sachin Setiya Date: Thu, 29 Jun 2017 18:30:39 +0530 Subject: [PATCH] MDEV-12758 wrep.pool_of_threads failed in buildbot with WSREP ... Problem:- While running tests from wsrep suite , we include file have_wsrep.inc or have_wsrep_enabled.inc , these file test wsrep plugin is ACTIVE or 'wsrep_on' is ON. These select does not ensure that whether 'wsrep_ready' is ON , So that we can process SQL queries. So sometimes we will get error like this mysqltest: At line 81: query 'call mtr.check_testcase()' failed: 1047: WSREP has not yet prepared node for application use not ok Solution:- In file have_wsrep.inc and have_wsrep_enabled.inc we will include wait_until_ready.inc , which will wait untill 'wsrep_on' is on --- mysql-test/include/have_wsrep.inc | 1 + mysql-test/include/have_wsrep_enabled.inc | 1 + mysql-test/suite/wsrep/t/wsrep_rpl.test | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/include/have_wsrep.inc b/mysql-test/include/have_wsrep.inc index 52220edf481..2a04485cec5 100644 --- a/mysql-test/include/have_wsrep.inc +++ b/mysql-test/include/have_wsrep.inc @@ -5,4 +5,5 @@ if (`SELECT COUNT(*)=0 FROM INFORMATION_SCHEMA.PLUGINS WHERE PLUGIN_NAME = 'wsre { --skip Test requires wsrep plugin. } +--source include/wait_until_ready.inc diff --git a/mysql-test/include/have_wsrep_enabled.inc b/mysql-test/include/have_wsrep_enabled.inc index 94eccadec3b..9287369c87c 100644 --- a/mysql-test/include/have_wsrep_enabled.inc +++ b/mysql-test/include/have_wsrep_enabled.inc @@ -8,4 +8,5 @@ if (`SELECT COUNT(*)=0 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_N { --skip Test requires wsrep_on=ON } +--source include/wait_until_ready.inc diff --git a/mysql-test/suite/wsrep/t/wsrep_rpl.test b/mysql-test/suite/wsrep/t/wsrep_rpl.test index 4f34aadc365..453a16e81ff 100644 --- a/mysql-test/suite/wsrep/t/wsrep_rpl.test +++ b/mysql-test/suite/wsrep/t/wsrep_rpl.test @@ -1,4 +1,3 @@ ---source include/have_wsrep.inc --source include/have_innodb.inc --source include/master-slave.inc