Disable concurrency ticket when ACL CACHE lock is acquired in exclusive mode

Summary:
**Summary**
When workload is overloaded with operations that require innodb concurrency ticket(like lot of inserts), critical operations like create user, drop user gets stuck waiting for concurrency ticket. In addition to innodb concurrency ticket, operations like create user, drop user, etc also holds the ACL CACHE lock in MDL_EXCLUSIVE mode which further slows down workload.

Added a change to skip waiting for concurrency ticket if the we are already holding ACL CACHE lock in MDL_EXCLUSIVE mode.

Reviewed By: hermanlee

Differential Revision: D30683406

Author: Pushapgl

mysql-test/suite/innodb/r/skip_concurrency_ticket.result

@@ -0,0 +1,14 @@
+CREATE TABLE tbl1 (
+col1_1 INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+col1_2 INT NOT NULL,
+col1_3 INT NOT NULL,
+col1_4 INT NOT NULL);
+INSERT INTO tbl1 (col1_2, col1_3, col1_4) VALUES (2, 3, 4);
+INSERT INTO tbl1 (col1_2, col1_3, col1_4) VALUES (3, 4, 5);
+INSERT INTO tbl1 (col1_2, col1_3, col1_4) VALUES (4, 5, 6);
+include/assert.inc [Increase in Innodb_concurrency_ticket_skip_count should be 0]
+CREATE USER user1;
+include/assert.inc [Increase in Innodb_concurrency_ticket_skip_count should be > 0]
+DROP USER user1;
+include/assert.inc [Increase in Innodb_concurrency_ticket_skip_count should be > 0]
+DROP TABLE tbl1;

mysql-test/suite/innodb/t/skip_concurrency_ticket.test

@@ -0,0 +1,36 @@
+# Check concurrency ticket is not skipped with regular inserts
+
+let $old_concurrency_ticket_skip_count= query_get_value(show status like "Innodb_concurrency_ticket_skip_count", Value, 1);
+CREATE TABLE tbl1 (
+  col1_1 INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+  col1_2 INT NOT NULL,
+  col1_3 INT NOT NULL,
+  col1_4 INT NOT NULL);
+
+INSERT INTO tbl1 (col1_2, col1_3, col1_4) VALUES (2, 3, 4);
+INSERT INTO tbl1 (col1_2, col1_3, col1_4) VALUES (3, 4, 5);
+INSERT INTO tbl1 (col1_2, col1_3, col1_4) VALUES (4, 5, 6);
+let $new_concurrency_ticket_skip_count= query_get_value(show status like "Innodb_concurrency_ticket_skip_count", Value, 1);
+--let $assert_cond= $new_concurrency_ticket_skip_count - $old_concurrency_ticket_skip_count = 0
+--let $assert_text= Increase in Innodb_concurrency_ticket_skip_count should be 0
+--source include/assert.inc
+
+
+# Check concurrency ticket is skipped with commands 
+# which acquire ACL_CACHE_LOCK with EXCLUSIVE MODE
+
+let $old_concurrency_ticket_skip_count= query_get_value(show status like "Innodb_concurrency_ticket_skip_count", Value, 1);
+CREATE USER user1;
+let $new_concurrency_ticket_skip_count= query_get_value(show status like "Innodb_concurrency_ticket_skip_count", Value, 1);
+--let $assert_cond= $new_concurrency_ticket_skip_count - $old_concurrency_ticket_skip_count > 0
+--let $assert_text= Increase in Innodb_concurrency_ticket_skip_count should be > 0
+--source include/assert.inc
+
+let $old_concurrency_ticket_skip_count= query_get_value(show status like "Innodb_concurrency_ticket_skip_count", Value, 1);
+DROP USER user1;
+let $new_concurrency_ticket_skip_count= query_get_value(show status like "Innodb_concurrency_ticket_skip_count", Value, 1);
+--let $assert_cond= $new_concurrency_ticket_skip_count - $old_concurrency_ticket_skip_count > 0
+--let $assert_text= Increase in Innodb_concurrency_ticket_skip_count should be > 0
+--source include/assert.inc
+
+DROP TABLE tbl1;

sql/auth/auth_common.h

@@ -716,6 +716,10 @@ void acl_log_connect(const char *user, const char *host, const char *auth_as,
 int acl_authenticate(THD *thd, enum_server_command command);
 bool acl_check_host(THD *thd, const char *host, const char *ip);
 
+/* sql_auth_cache */
+bool assert_acl_cache_read_lock(THD *thd);
+bool assert_acl_cache_write_lock(THD *thd);
+
 /*
   User Attributes are the once which are defined during CREATE/ALTER/GRANT
   statement. These attributes are divided into following categories.

sql/auth/auth_internal.h

@@ -117,8 +117,6 @@ const ACL_internal_table_access *get_cached_table_access(
 
 /* sql_auth_cache */
 ulong get_sort(uint count, ...);
-bool assert_acl_cache_read_lock(THD *thd);
-bool assert_acl_cache_write_lock(THD *thd);
 
 /*sql_authentication */
 bool sha256_rsa_auth_status();

storage/innobase/handler/ha_innodb.cc

@@ -1231,6 +1231,9 @@ static SHOW_VAR innodb_status_variables[] = {
     {"buffer_pool_write_requests",
      (char *)&export_vars.innodb_buffer_pool_write_requests, SHOW_LONG,
      SHOW_SCOPE_GLOBAL},
+    {"concurrency_ticket_skip_count",
+     (char *)&export_vars.innodb_concurrency_ticket_skip_count, SHOW_LONG,
+     SHOW_SCOPE_GLOBAL},
     {"data_fsyncs", (char *)&export_vars.innodb_data_fsyncs, SHOW_LONG,
      SHOW_SCOPE_GLOBAL},
     {"data_pending_fsyncs", (char *)&export_vars.innodb_data_pending_fsyncs,

storage/innobase/include/srv0srv.h

@@ -777,6 +777,9 @@ constexpr uint32_t SRV_MAX_N_IO_THREADS = 130;
 /** Number of deadlocks */
 extern ulint srv_lock_deadlocks;
 
+/** Number of times concurrency ticket is skipped */
+extern ulint srv_concurrency_ticket_skip_count;
+
 /** Number of lock wait timeouts */
 extern ulint srv_lock_wait_timeouts;
 
@@ -1198,6 +1201,9 @@ struct export_var_t {
   ulint innodb_dblwr_pages_written;            /*!< srv_dblwr_pages_written */
   ulint innodb_dblwr_writes;                   /*!< srv_dblwr_writes */
   ulint innodb_ft_optimize_queue_count;        /*!< ft_optimize_queue_count */
+  ulint innodb_concurrency_ticket_skip_count;  /*!<
+                                              srv_concurrency_ticket_skip_count
+                                                */
   char innodb_redo_log_resize_status[512];     /*!< Redo log resize status */
   bool innodb_redo_log_read_only;              /*!< Is redo log read-only ? */
   ulonglong innodb_redo_log_uuid;              /*!< Redo log UUID */

storage/innobase/row/row0mysql.cc

@@ -34,6 +34,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <debug_sync.h>
 #include <gstream.h>
 #include <spatial.h>
+#include <sql_acl.h>
 #include <sql_class.h>
 #include <sql_const.h>
 #include <sys/types.h>
@@ -4804,6 +4805,13 @@ bool row_prebuilt_t::skip_concurrency_ticket() const {
       return true;
     }
   }
+  /** Skip concurrency ticket if a thread is already holding
+  ACL CACHE lock in MDL_EXCLUSIVE mode.
+  */
+  if (thd != nullptr && assert_acl_cache_write_lock(thd)) {
+    srv_concurrency_ticket_skip_count++;
+    return true;
+  }
   return false;
 }
 

storage/innobase/srv/srv0srv.cc

@@ -550,6 +550,9 @@ ulong srv_force_recovery_crash;
 /** Number of deadlocks */
 ulint srv_lock_deadlocks = 0;
 
+/** Number of times concurrency ticket is skipped */
+ulint srv_concurrency_ticket_skip_count = 0;
+
 /** Number of row lock wait timeouts */
 ulint srv_lock_wait_timeouts = 0;
 
@@ -1717,6 +1720,9 @@ void srv_export_innodb_status(void) {
 
   export_vars.innodb_lock_deadlocks = srv_lock_deadlocks;
 
+  export_vars.innodb_concurrency_ticket_skip_count =
+      srv_concurrency_ticket_skip_count;
+
   export_vars.innodb_lock_wait_timeouts = srv_lock_wait_timeouts;
 
   export_vars.innodb_log_waits = srv_stats.log_waits;