BUG#27661171 INNODB: TRX->DECLARED_TO_BE_INSIDE_INNODB

Debarun Banerjee · dahlerlend · commit bd8eb01b550d · 2018-03-28T11:01:09.000+02:00
Problem :
--------
We enter innodb in partition row write to order Auto INC partition lock
after Innodb. In Innodb we would try re-enter independently. This works
fine as long as we have enough tickets left.

While performing bulk load we could consume all innodb tickets
[innodb_concurrency_tickets = 5000 by default] within same statement.
If the partition write happens to consume the last ticket, we face this
issue trying to enter once again in innobase write.

Solution :
----------
No need to enter innodb in partition write if there are tickets left.

1. We avoid consuming the last ticket as there could be another enter
   call from innobase.

2. If we enter innodb here, there is at least one more ticket left as
   the minimum value for "innodb_concurrency_tickets" is 1.

Reviewed-by: Jimmy Yang &lt;Jimmy.Yang@oracle.com&gt;

RB: 19092
diff --git a/mysql-test/suite/innodb/r/innodb_thread_concurrency_debug.result b/mysql-test/suite/innodb/r/innodb_thread_concurrency_debug.result
@@ -1,5 +1,6 @@
 # Setup connections
 SET @old_innodb_thread_concurrency := @@innodb_thread_concurrency;
+SET @old_innodb_concurrency_tickets := @@innodb_concurrency_tickets;
 SET @old_innodb_thread_sleep_delay := @@innodb_thread_sleep_delay;
 #
 # Bug #19386426	SHUTDOWN HANGS: CLIENT THREAD IN A LOOP
@@ -75,7 +76,24 @@ col1	col2
 2	20
 3	30
 DROP TABLE t1;
+#
+# bug#27661171 INNODB: TRX->DECLARED_TO_BE_INSIDE_INNODB
+#
+CREATE TABLE t1 (col1 INT AUTO_INCREMENT PRIMARY KEY, col2 int)
+PARTITION BY KEY(col1) PARTITIONS 2;
+# Insert 2 rows in same statement consuming the tickets
+SET GLOBAL innodb_concurrency_tickets = 2;
+SHOW VARIABLES LIKE 'innodb_concurrency_tickets';
+Variable_name	Value
+innodb_concurrency_tickets	2
+INSERT INTO t1(col2) VALUES (10), (20);
+SELECT * FROM t1 ORDER BY col1;
+col1	col2
+1	10
+2	20
+DROP TABLE t1;
 # Cleanup
 SET DEBUG_SYNC='reset';
 SET GLOBAL innodb_thread_concurrency = @old_innodb_thread_concurrency;
+SET GLOBAL innodb_concurrency_tickets = @old_innodb_concurrency_tickets;
 SET GLOBAL innodb_thread_sleep_delay = @old_innodb_thread_sleep_delay;
diff --git a/mysql-test/suite/innodb/t/innodb_thread_concurrency_debug.test b/mysql-test/suite/innodb/t/innodb_thread_concurrency_debug.test
@@ -4,6 +4,7 @@
 
 --echo # Setup connections
 SET @old_innodb_thread_concurrency := @@innodb_thread_concurrency;
+SET @old_innodb_concurrency_tickets := @@innodb_concurrency_tickets;
 SET @old_innodb_thread_sleep_delay := @@innodb_thread_sleep_delay;
 
 connect (con1, localhost, root);
@@ -115,12 +116,27 @@ connection con1;
 SELECT * FROM t1 ORDER BY col1;
 DROP TABLE t1;
 
+--echo #
+--echo # bug#27661171 INNODB: TRX->DECLARED_TO_BE_INSIDE_INNODB
+--echo #
+CREATE TABLE t1 (col1 INT AUTO_INCREMENT PRIMARY KEY, col2 int)
+PARTITION BY KEY(col1) PARTITIONS 2;
+
+--echo # Insert 2 rows in same statement consuming the tickets
+SET GLOBAL innodb_concurrency_tickets = 2;
+SHOW VARIABLES LIKE 'innodb_concurrency_tickets';
+INSERT INTO t1(col2) VALUES (10), (20);
+
+SELECT * FROM t1 ORDER BY col1;
+DROP TABLE t1;
+
 --echo # Cleanup
 disconnect con1;
 disconnect con2;
 
 SET DEBUG_SYNC='reset';
 SET GLOBAL innodb_thread_concurrency = @old_innodb_thread_concurrency;
+SET GLOBAL innodb_concurrency_tickets = @old_innodb_concurrency_tickets;
 SET GLOBAL innodb_thread_sleep_delay = @old_innodb_thread_sleep_delay;
 
 --source include/wait_until_count_sessions.inc
diff --git a/storage/innobase/handler/ha_innopart.h b/storage/innobase/handler/ha_innopart.h
@@ -958,9 +958,30 @@ class ha_innopart : public ha_innobase,
                              thr_lock_type lock_type);
 
   int write_row(uchar *record) {
-    srv_concurrency_enter();
+    bool entered = false;
+    auto trx = m_prebuilt->trx;
+
+    /* Enter innodb to order Auto INC partition lock after Innodb. No need to
+    enter if there are tickets left. Currently we cannot handle re-enter
+    without exit if no more tickets left.
+
+    1. We avoid consuming the last ticket as there could be another enter
+    call from innobase.
+
+    2. If we enter innodb here, there is at least one more ticket left as
+    the minimum value for "innodb_concurrency_tickets" is 1 */
+
+    if (!trx->declared_to_be_inside_innodb) {
+      srv_concurrency_enter();
+      entered = true;
+    }
+
     auto err = Partition_helper::ph_write_row(record);
-    srv_concurrency_exit();
+
+    if (entered) {
+      srv_concurrency_exit();
+    }
+
     return (err);
   }
 
