Bug#16657588: VARIABLE OPEN_FILES_LIMIT DOES NOT

SHOW MAXIMUM NUMBER OF OPEN FILES

The read-only system variable open_files_limit did not
show maximum number of open files the mysqld process
could have, but instead the number that was requested
after adjusting the start-up option open_files_limit.

Fixed by adding internal variable for propagating
the requested number of files, since that was used
for adjusting other start-up options. And set
the read-only system variable open_files_limit
to the real maximum value.

Author: Mattias Jonsson

libmysqld/lib_sql.cc

@@ -566,7 +566,8 @@ int init_embedded_server(int argc, char **argv, char **groups)
     return 1;
   }
 
-  adjust_related_options();
+  ulong requested_open_files_dummy;
+  adjust_related_options(&requested_open_files_dummy);
 
   if (init_common_variables())
   {

mysql-test/r/partition_open_files_limit.result

@@ -4,7 +4,7 @@ CREATE TABLE t1 (a INT PRIMARY KEY)
 ENGINE=MyISAM PARTITION BY KEY () PARTITIONS 1;
 INSERT INTO t1 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10), (11);
 # if the bug exists, then crash will happen here
-ALTER TABLE t1 ADD PARTITION PARTITIONS 5001;
+ALTER TABLE t1 ADD PARTITION PARTITIONS 600;
 ERROR HY000: Out of resources when opening file '<partition file>' (Errcode: 24 - Too many open files)
 SELECT * FROM t1;
 a

mysql-test/suite/perfschema/include/sizing_auto.inc

@@ -2,7 +2,8 @@
 show variables like "table_definition_cache";
 show variables like "table_open_cache";
 show variables like "max_connections";
-show variables like "open_files_limit";
+# open_files_limit depends on OS configuration (ulimit -n)
+#show variables like "open_files_limit";
 show variables like "%performance_schema%";
 show status like "%performance_schema%";
 

mysql-test/suite/perfschema/r/sizing_default.result

@@ -7,9 +7,6 @@ table_open_cache	2000
 show variables like "max_connections";
 Variable_name	Value
 max_connections	151
-show variables like "open_files_limit";
-Variable_name	Value
-open_files_limit	5000
 show variables like "%performance_schema%";
 Variable_name	Value
 performance_schema	ON

mysql-test/suite/perfschema/r/sizing_high.result

@@ -7,9 +7,6 @@ table_open_cache	400
 show variables like "max_connections";
 Variable_name	Value
 max_connections	200
-show variables like "open_files_limit";
-Variable_name	Value
-open_files_limit	1024
 show variables like "%performance_schema%";
 Variable_name	Value
 performance_schema	ON

mysql-test/suite/perfschema/r/sizing_low.result

@@ -7,9 +7,6 @@ table_open_cache	100
 show variables like "max_connections";
 Variable_name	Value
 max_connections	50
-show variables like "open_files_limit";
-Variable_name	Value
-open_files_limit	1024
 show variables like "%performance_schema%";
 Variable_name	Value
 performance_schema	ON

mysql-test/suite/perfschema/r/sizing_med.result

@@ -7,9 +7,6 @@ table_open_cache	401
 show variables like "max_connections";
 Variable_name	Value
 max_connections	152
-show variables like "open_files_limit";
-Variable_name	Value
-open_files_limit	1024
 show variables like "%performance_schema%";
 Variable_name	Value
 performance_schema	ON

mysql-test/suite/perfschema/t/sizing_default.cnf

@@ -11,7 +11,6 @@
 # table_open_cache = 2000
 # table_definition_cache = 400 + 2000/2 = 1400
 # max_connections = 151
-# open_files_limit = 5000
 
 # Automated sizing for everything
 

mysql-test/suite/perfschema/t/sizing_default.test

@@ -5,12 +5,26 @@
 --source include/not_valgrind.inc
 --source ../include/have_aligned_memory.inc
 
-# For this test to work,
-# open_files_limit should not be scaled down by OS limitations.
-let $max_open_files_limit= `SELECT @@open_files_limit != 5000`;
+# Skip test if not defaults is used.
+let $max_open_files_limit= `SELECT @@open_files_limit < 5000`;
 if ($max_open_files_limit)
 {
-  skip Need open_files_limit to be exactly 5000;
+  skip Need open_files_limit to be at least 5000;
+}
+let $max_table_open_cache= `SELECT @@table_open_cache != 2000`;
+if ($max_table_open_cache)
+{
+  skip Need table_open_cache to be exactly 2000;
+}
+let $max_table_definition_cache= `SELECT @@table_definition_cache != 1400`;
+if ($max_table_definition_cache)
+{
+  skip Need table_definition_cache to be exactly 1400;
+}
+let $max_connections= `SELECT @@max_connections != 151`;
+if ($max_connections)
+{
+  skip Need max_connections to be exactly 151;
 }
 
 --source ../include/sizing_auto.inc

mysql-test/t/disabled.def

@@ -18,4 +18,3 @@ ds_mrr-big @solaris      : Bug#14168107 2012-04-03 Hemant disabled new test adde
 partition_locking_4      : Bug#13924750 2012-04-04 lost connection.
 mysql_embedded_client_test	: Bug#13964673 2012-04-16 amitbha since most of the test cases are failing
 mysql_client_test_embedded : Bug#16084066 2013-01-08 Disabled since this test is failing
-partition_open_files_limit : Bug#16553132 2013-03-26 TEST FAILURE IN MAIN.PARTITION_OPEN_FILES_LIMIT

mysql-test/t/partition_open_files_limit.test

@@ -5,31 +5,30 @@ DROP TABLE IF EXISTS `t1`;
 --enable_warnings
 
 # On some platforms the lowest possible open_files_limit is too high...
-let $max_open_files_limit= `SELECT @@open_files_limit > 511`;
+let $max_open_files_limit= `SELECT @@open_files_limit > 1024`;
 if ($max_open_files_limit)
 {
-  skip Need open_files_limit to be lower than 512;
+  skip Need open_files_limit to be lower than 1025;
 }
 
 #
 --echo # Bug#46922: crash when adding partitions and open_files_limit is reached
 #
 # Note:
 # The test script ask for open_files_limit=5
-# The server silently increase that to 5000 before asking the OS
-# The OS may (or may not) reduce open_files_limit, typically to 1024
+# The server silently increase that to 5000 before asking the OS.
+# The OS may (or may not) reduce/increase open_files_limit, typically to 1024
+# (Linux, see 'ulimit -n')
 # So, for the ADD PARTITIONS to really reach the 'Too many open files'
-# error, the test script attempts 5001 partitions, will likely fail earlier
-# The statement may still pass without errors,
-# if the OS limit is much higher (unlikely, causing a test failure).
+# error, the test script attempts 600 partitions.
 #
 CREATE TABLE t1 (a INT PRIMARY KEY) 
 ENGINE=MyISAM PARTITION BY KEY () PARTITIONS 1;
 INSERT INTO t1 VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10), (11);
 --echo # if the bug exists, then crash will happen here
 --replace_regex /file '.*'/file '<partition file>'/
 --error 23
-ALTER TABLE t1 ADD PARTITION PARTITIONS 5001;
+ALTER TABLE t1 ADD PARTITION PARTITIONS 600;
 --sorted_result
 SELECT * FROM t1;
 DROP TABLE t1;

sql/mysqld.cc

@@ -5118,27 +5118,29 @@ int mysqld_main(int argc, char **argv)
 
   ho_error= handle_early_options();
 
-  adjust_related_options();
+  {
+    ulong requested_open_files;
+    adjust_related_options(&requested_open_files);
 
 #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
-  if (ho_error == 0)
-  {
-    if (pfs_param.m_enabled && !opt_help && !opt_bootstrap)
+    if (ho_error == 0)
     {
-      /* Add sizing hints from the server sizing parameters. */
-      pfs_param.m_hints.m_table_definition_cache= table_def_size;
-      pfs_param.m_hints.m_table_open_cache= table_cache_size;
-      pfs_param.m_hints.m_max_connections= max_connections;
-      pfs_param.m_hints.m_open_files_limit= open_files_limit;
-      PSI_hook= initialize_performance_schema(&pfs_param);
-      if (PSI_hook == NULL)
+      if (pfs_param.m_enabled && !opt_help && !opt_bootstrap)
       {
-        pfs_param.m_enabled= false;
-        buffered_logs.buffer(WARNING_LEVEL,
-                             "Performance schema disabled (reason: init failed).");
+        /* Add sizing hints from the server sizing parameters. */
+        pfs_param.m_hints.m_table_definition_cache= table_def_size;
+        pfs_param.m_hints.m_table_open_cache= table_cache_size;
+        pfs_param.m_hints.m_max_connections= max_connections;
+	pfs_param.m_hints.m_open_files_limit= requested_open_files;
+        PSI_hook= initialize_performance_schema(&pfs_param);
+        if (PSI_hook == NULL)
+        {
+          pfs_param.m_enabled= false;
+          buffered_logs.buffer(WARNING_LEVEL,
+                               "Performance schema disabled (reason: init failed).");
+        }
       }
     }
-  }
 #else
   /*
     Other provider of the instrumentation interface should
@@ -5150,6 +5152,7 @@ int mysqld_main(int argc, char **argv)
     these two defines are kept separate.
   */
 #endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */
+  }
 
 #ifdef HAVE_PSI_INTERFACE
   /*
@@ -6720,7 +6723,7 @@ int handle_early_options()
   - @c table_cache_size,
   - the platform max open file limit.
 */
-void adjust_open_files_limit()
+void adjust_open_files_limit(ulong *requested_open_files)
 {
   ulong limit_1;
   ulong limit_2;
@@ -6743,12 +6746,9 @@ void adjust_open_files_limit()
 
   request_open_files= max<ulong>(max<ulong>(limit_1, limit_2), limit_3);
 
+  /* Notice: my_set_max_open_files() may return more than requested. */
   effective_open_files= my_set_max_open_files(request_open_files);
 
-  /* Warning: my_set_max_open_files() may return more than requested. */
-  if (effective_open_files > request_open_files)
-    effective_open_files= request_open_files;
-
   if (effective_open_files < request_open_files)
   {
     char msg[1024];
@@ -6771,13 +6771,15 @@ void adjust_open_files_limit()
   }
 
   open_files_limit= effective_open_files;
+  if (requested_open_files)
+    *requested_open_files= min<ulong>(effective_open_files, request_open_files);
 }
 
-void adjust_max_connections()
+void adjust_max_connections(ulong requested_open_files)
 {
   ulong limit;
 
-  limit= open_files_limit - 10 - TABLE_OPEN_CACHE_MIN * 2;
+  limit= requested_open_files - 10 - TABLE_OPEN_CACHE_MIN * 2;
 
   if (limit < max_connections)
   {
@@ -6792,11 +6794,11 @@ void adjust_max_connections()
   }
 }
 
-void adjust_table_cache_size()
+void adjust_table_cache_size(ulong requested_open_files)
 {
   ulong limit;
 
-  limit= max<ulong>((open_files_limit - 10 - max_connections) / 2,
+  limit= max<ulong>((requested_open_files - 10 - max_connections) / 2,
                     TABLE_OPEN_CACHE_MIN);
 
   if (limit < table_cache_size)
@@ -6828,16 +6830,16 @@ void adjust_table_def_size()
     table_def_size= default_value;
 }
 
-void adjust_related_options()
+void adjust_related_options(ulong *requested_open_files)
 {
   /* In bootstrap, disable grant tables (we are about to create them) */
   if (opt_bootstrap)
     opt_noacl= 1;
 
   /* The order is critical here, because of dependencies. */
-  adjust_open_files_limit();
-  adjust_max_connections();
-  adjust_table_cache_size();
+  adjust_open_files_limit(requested_open_files);
+  adjust_max_connections(*requested_open_files);
+  adjust_table_cache_size(*requested_open_files);
   adjust_table_def_size();
 }
 

sql/mysqld.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -264,7 +264,7 @@ extern const char *load_default_groups[];
 extern struct my_option my_long_options[];
 extern struct my_option my_long_early_options[];
 int handle_early_options();
-void adjust_related_options();
+void adjust_related_options(ulong *requested_open_files);
 extern int mysqld_server_started;
 extern "C" MYSQL_PLUGIN_IMPORT int orig_argc;
 extern "C" MYSQL_PLUGIN_IMPORT char **orig_argv;