diff options
| author | Eugene Kosov <eugene.kosov@mariadb.com> | 2019-07-16 15:42:36 +0300 |
|---|---|---|
| committer | Eugene Kosov <eugene.kosov@mariadb.com> | 2019-07-16 18:39:21 +0300 |
| commit | 0f83c8878dc1389212c134f65d37a43d9d248250 (patch) | |
| tree | 6950ea9b6c449a6e5d8a0205b3d06ae275a6234c /mysql-test/suite/wsrep/t/variables.test | |
| parent | aa96e56c55c44d2c20c1cd70325ef88ad0af8f98 (diff) | |
| parent | d2f094d9e63e97293915b17b30a73b2552647a38 (diff) | |
| download | mariadb-git-0f83c8878dc1389212c134f65d37a43d9d248250.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/suite/wsrep/t/variables.test')
| -rw-r--r-- | mysql-test/suite/wsrep/t/variables.test | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/mysql-test/suite/wsrep/t/variables.test b/mysql-test/suite/wsrep/t/variables.test index c13a8c5f281..7c31156ce65 100644 --- a/mysql-test/suite/wsrep/t/variables.test +++ b/mysql-test/suite/wsrep/t/variables.test @@ -1,4 +1,5 @@ --source include/have_wsrep.inc +--source include/force_restart.inc SET @wsrep_provider_options_saved= @@global.wsrep_provider_options; SET @wsrep_cluster_address_saved= @@global.wsrep_cluster_address; @@ -98,10 +99,20 @@ SHOW STATUS LIKE 'wsrep_thread_count'; --echo # applier/rollbacker threads. SET GLOBAL wsrep_cluster_address= 'gcomm://'; +<<<<<<< HEAD --echo # Wait for applier threads to get created. --let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_thread_count'; +======= +--echo # Wait for applier thread to get created 1. +--let $wait_timeout=600 +--let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_applier_thread_count'; +>>>>>>> origin/10.2 --source include/wait_condition.inc +SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_applier_thread_count'; +SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_rollbacker_thread_count'; +SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_thread_count'; + --replace_regex /.*libgalera_smm.*/libgalera_smm.so/ SELECT @@global.wsrep_provider; SELECT @@global.wsrep_cluster_address; @@ -112,12 +123,20 @@ SHOW STATUS LIKE 'wsrep_thread_count'; SET @wsrep_slave_threads_saved= @@global.wsrep_slave_threads; SET GLOBAL wsrep_slave_threads= 10; +<<<<<<< HEAD --echo # Wait for applier threads to get created. --let $wait_condition = SELECT VARIABLE_VALUE = 11 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_thread_count'; +======= +--echo # Wait for 9 applier threads to get created. +--let $wait_condition = SELECT VARIABLE_VALUE = 10 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_applier_thread_count'; +>>>>>>> origin/10.2 --source include/wait_condition.inc +SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_applier_thread_count'; +SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_rollbacker_thread_count'; +SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_thread_count'; + SHOW STATUS LIKE 'threads_connected'; -SHOW STATUS LIKE 'wsrep_thread_count'; # # privileges for wsrep_on |