Bug#27067956: TEST GR_APPLIER_SLAVE_COMMANDS FAILS SPORADICALY ON PB2

STOP START STOP GR Applier is causing additional warnings being logged in error
file because of previous pending operations.
Test case has been changed to use wait when required.

Author: Jaideep Karande

rapid/plugin/group_replication/tests/mtr/r/gr_applier_slave_commands.result

@@ -38,18 +38,22 @@ SHOW SLAVE STATUS FOR CHANNEL 'group_replication_applier';
 ERROR HY000: SHOW SLAVE STATUS cannot be performed on channel 'group_replication_applier'.
 
 # START SLAVE SQL_THREAD command will work for group_replication_applier
-START SLAVE SQL_THREAD FOR CHANNEL 'group_replication_applier';
+include/gr_start_applier_sql_thread.inc
+START SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
 Warnings:
 Note	3083	Replication thread(s) for channel 'group_replication_applier' are already runnning.
 
 # STOP SLAVE SQL_THREAD command will work for group_replication_applier
-STOP SLAVE SQL_THREAD FOR CHANNEL 'group_replication_applier';
+include/gr_stop_applier_sql_thread.inc
+STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
 # START SLAVE SQL_THREAD with UNTIL option will work for group_replication_applier
 START SLAVE SQL_THREAD UNTIL SQL_BEFORE_GTIDS='11111111-1111-1111-1111-111111111111:1-23' FOR CHANNEL 'group_replication_applier';
-STOP SLAVE SQL_THREAD FOR CHANNEL 'group_replication_applier';
+include/gr_stop_applier_sql_thread.inc
+STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
 # START SLAVE SQL_THREAD with UNTIL option will work for group_replication_applier
 START SLAVE SQL_THREAD UNTIL RELAY_LOG_FILE = 'server-relay-log-group_replication_applier.000002', RELAY_LOG_POS = 10000 FOR CHANNEL 'group_replication_applier';
-STOP SLAVE SQL_THREAD FOR CHANNEL 'group_replication_applier';
+include/gr_stop_applier_sql_thread.inc
+STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
 
 # SHOW RELAYLOG EVENTS for channel will work for all channels
 include/assert.inc [Relay log name should not be empty as the command successfully executed.]
@@ -85,10 +89,12 @@ SHOW SLAVE STATUS FOR CHANNEL 'group_replication_applier';
 ERROR HY000: SHOW SLAVE STATUS cannot be performed on channel 'group_replication_applier'.
 
 # START SLAVE SQL_THREAD command will work for group_replication_applier
-START SLAVE SQL_THREAD FOR CHANNEL 'group_replication_applier';
+include/gr_start_applier_sql_thread.inc
+START SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
 
 # STOP SLAVE SQL_THREAD command will work for group_replication_applier
-STOP SLAVE SQL_THREAD FOR CHANNEL 'group_replication_applier';
+include/gr_stop_applier_sql_thread.inc
+STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
 
 # SHOW RELAYLOG EVENTS for channel will work for all channels
 include/assert.inc [Relay log name should not be empty as the command successfully executed.]
@@ -111,7 +117,8 @@ include/start_group_replication.inc
 include/stop_group_replication.inc
 RESET SLAVE ALL FOR CHANNEL "group_replication_applier";
 include/start_group_replication.inc
-STOP SLAVE SQL_THREAD FOR CHANNEL 'group_replication_applier';
+include/gr_stop_applier_sql_thread.inc
+STOP SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
 # RESET SLAVE should not be allowed when GR is ONLINE.
 # So this command will fail.
 RESET SLAVE FOR CHANNEL "group_replication_applier";
@@ -120,7 +127,8 @@ ERROR HY000: RESET SLAVE [ALL] FOR CHANNEL cannot be performed on channel 'group
 # So this command will fail.
 RESET SLAVE ALL FOR CHANNEL "group_replication_applier";
 ERROR HY000: RESET SLAVE [ALL] FOR CHANNEL cannot be performed on channel 'group_replication_applier'.
-START SLAVE SQL_THREAD FOR CHANNEL 'group_replication_applier';
+include/gr_start_applier_sql_thread.inc
+START SLAVE SQL_THREAD FOR CHANNEL "group_replication_applier";
 # stop the channel and try reset slave for channel again. It should work.
 include/stop_group_replication.inc
 RESET SLAVE ALL FOR CHANNEL "group_replication_applier";

rapid/plugin/group_replication/tests/mtr/t/gr_applier_slave_commands.test

@@ -114,28 +114,32 @@ SHOW SLAVE STATUS FOR CHANNEL 'group_replication_applier';
 
 --echo
 --echo # START SLAVE SQL_THREAD command will work for group_replication_applier
-START SLAVE SQL_THREAD FOR CHANNEL 'group_replication_applier';
+--source ../inc/gr_start_applier_sql_thread.inc
 
 --echo
 --echo # STOP SLAVE SQL_THREAD command will work for group_replication_applier
-STOP SLAVE SQL_THREAD FOR CHANNEL 'group_replication_applier';
+--source ../inc/gr_stop_applier_sql_thread.inc
 
 --echo # START SLAVE SQL_THREAD with UNTIL option will work for group_replication_applier
 --disable_warnings
 START SLAVE SQL_THREAD UNTIL SQL_BEFORE_GTIDS='11111111-1111-1111-1111-111111111111:1-23' FOR CHANNEL 'group_replication_applier';
+--let $wait_condition= SELECT service_state="ON" FROM performance_schema.replication_applier_status WHERE channel_name="group_replication_applier"
+--source include/wait_condition.inc
 --enable_warnings
 
 --disable_warnings
-STOP SLAVE SQL_THREAD FOR CHANNEL 'group_replication_applier';
+--source ../inc/gr_stop_applier_sql_thread.inc
 --enable_warnings
 
 --echo # START SLAVE SQL_THREAD with UNTIL option will work for group_replication_applier
 --disable_warnings
 START SLAVE SQL_THREAD UNTIL RELAY_LOG_FILE = 'server-relay-log-group_replication_applier.000002', RELAY_LOG_POS = 10000 FOR CHANNEL 'group_replication_applier';
+--let $wait_condition= SELECT service_state="ON" FROM performance_schema.replication_applier_status WHERE channel_name="group_replication_applier"
+--source include/wait_condition.inc
 --enable_warnings
 
 --disable_warnings
-STOP SLAVE SQL_THREAD FOR CHANNEL 'group_replication_applier';
+--source ../inc/gr_stop_applier_sql_thread.inc
 --enable_warnings
 
 --echo
@@ -188,11 +192,11 @@ SHOW SLAVE STATUS FOR CHANNEL 'group_replication_applier';
 
 --echo
 --echo # START SLAVE SQL_THREAD command will work for group_replication_applier
-START SLAVE SQL_THREAD FOR CHANNEL 'group_replication_applier';
+--source ../inc/gr_start_applier_sql_thread.inc
 
 --echo
 --echo # STOP SLAVE SQL_THREAD command will work for group_replication_applier
-STOP SLAVE SQL_THREAD FOR CHANNEL 'group_replication_applier';
+--source ../inc/gr_stop_applier_sql_thread.inc
 
 --echo
 --echo # SHOW RELAYLOG EVENTS for channel will work for all channels
@@ -232,7 +236,7 @@ RESET SLAVE ALL FOR CHANNEL "group_replication_applier";
 
 # RESET SLAVE should not be allowed when Group_replication is running.
 --source include/start_group_replication.inc
-STOP SLAVE SQL_THREAD FOR CHANNEL 'group_replication_applier';
+--source ../inc/gr_stop_applier_sql_thread.inc
 --echo # RESET SLAVE should not be allowed when GR is ONLINE.
 --echo # So this command will fail.
 --error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
@@ -242,7 +246,7 @@ RESET SLAVE FOR CHANNEL "group_replication_applier";
 --echo # So this command will fail.
 --error ER_SLAVE_CHANNEL_OPERATION_NOT_ALLOWED
 RESET SLAVE ALL FOR CHANNEL "group_replication_applier";
-START SLAVE SQL_THREAD FOR CHANNEL 'group_replication_applier';
+--source ../inc/gr_start_applier_sql_thread.inc
 
 --echo # stop the channel and try reset slave for channel again. It should work.
 --source include/stop_group_replication.inc