BUG#24638038 - XPLUGIN PROCESS ID REALTED STATS NOT SHOWN IN PERFORMANCE SCHEMA.THREADS TABLE

Post push fix, toggling performance_schema_threads.test, performance_schema_unixsocket.test

RB: 14267
Reviewed-by: Andrzej Religa <[email protected]>

Author: lkotula

rapid/plugin/x/mysqlxtest_src/mysqlxtest.cc

@@ -2107,12 +2107,9 @@ class Command
     return Continue;
   }
 
-  static void compare_variable_to(bool &match, std::string expected_value, std::string value)
+  static void put_variable_to(std::string &result, const std::string &value)
   {
-    if (expected_value == value)
-    {
-      match = true;
-    }
+    result = value;
   }
 
   static void try_result(Result result)
@@ -2147,28 +2144,36 @@ class Command
     const int countdown_start_value = 30;
     int  countdown_retries = countdown_start_value;
 
+    std::string args_variables_replaced = args;
     std::vector<std::string> vargs;
 
-    boost::split(vargs, args, boost::is_any_of("\t"), boost::token_compress_on);
+    replace_variables(args_variables_replaced);
+    boost::split(vargs, args_variables_replaced, boost::is_any_of("\t"), boost::token_compress_on);
 
     if (2 != vargs.size())
     {
       std::cerr << "Specified invalid number of arguments for command wait_for:" << vargs.size() << " expecting 2\n";
       return Stop_with_failure;
     }
 
+    const std::string &expected_value = vargs[0];
+    std::string value;
+
     try
     {
-      while(!match && countdown_retries--)
+      do
       {
         Backup_and_restore<bool>        backup_and_restore_fatal_errors(OPT_fatal_errors, true);
         Backup_and_restore<bool>        backup_and_restore_query(OPT_query, false);
         Backup_and_restore<std::string> backup_and_restore_command_name(context.m_command_name, "sql");
 
         try_result(cmd_stmtsql(context, vargs[1]));
-        try_result(cmd_recvresult(context, "", ngs::bind(&Command::compare_variable_to, ngs::ref(match), vargs[0], ngs::placeholders::_1)));
+        try_result(cmd_recvresult(context, "", ngs::bind(&Command::put_variable_to, ngs::ref(value), ngs::placeholders::_1)));
         try_result(cmd_sleep(context,"1"));
+
+        match = (value == expected_value);
       }
+      while(!match && --countdown_retries);
     }
     catch(const Result result)
     {
@@ -2178,7 +2183,8 @@ class Command
 
     if (!match)
     {
-      std::cerr << "Query didn't return expected value, tried " << countdown_start_value << " retries\n";
+      std::cerr << "Query didn't return expected value, tried " << countdown_start_value << " times\n";
+      std::cerr << "Expected '" << expected_value << "', received '" << value << "'\n";
       return Stop_with_failure;
     }
 

rapid/plugin/x/tests/mtr/include/performance_schema_assert_empty_worker_threads.inc

@@ -11,8 +11,12 @@
 --echo #
 --echo # Get actual number of worker threads
 --echo #
-let $thread_entries=`SELECT COUNT(*) FROM performance_schema.threads
-                       WHERE name LIKE "thread/mysqlx/worker"`;
+
+let $wait_condition= SELECT COUNT(*)>=@@mysqlx_min_worker_threads FROM performance_schema.threads
+                       WHERE name LIKE "thread/mysqlx/worker";
+source include/wait_condition_or_abort.inc;
+
+let $thread_entries=`SELECT @@mysqlx_min_worker_threads`;
 
 let $assert_text= X Plugin must have idle worker threads;
 let $assert_cond= [SELECT $thread_entries as `Result`, Result, 1] > 0;

rapid/plugin/x/tests/mtr/t/performance_schema_unixsockets.test

@@ -11,9 +11,7 @@
 --write_file $MYSQL_TMP_DIR/performance_schema_socket_num.tmp
 -->macro check_xconnection_count %EXPECTED_NUM_OF_CONNECTIONS%
 -->echo Verify [Checking if X Plugin reports %EXPECTED_NUM_OF_CONNECTIONS% connections]
--->stmtsql SELECT count(*) as Num FROM performance_schema.socket_instances WHERE EVENT_NAME LIKE 'wait/io/socket/mysqlx/client_connection'
--->recvtovar %NUM%
--->assert_eq %EXPECTED_NUM_OF_CONNECTIONS%	%NUM%
+-->wait_for %EXPECTED_NUM_OF_CONNECTIONS%	SELECT count(*) as Num FROM performance_schema.socket_instances WHERE EVENT_NAME LIKE 'wait/io/socket/mysqlx/client_connection'
 -->echo  success
 -->endmacro