Merge lp:~akopytov/percona-xtrabackup/bug1183793-2.2 into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

Manual merge from 2.1.

http://jenkins.percona.com/view/PXB%202.2/job/percona-xtrabackup-2.2-param/128/

[Sergei Glushchenko (sergei.glushchenko)]

same question as for 2.1

review: Needs Information (g2)

[Sergei Glushchenko (sergei.glushchenko)]

Approve

review: Approve (g2)

=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
--- storage/innobase/xtrabackup/src/xtrabackup.cc	2014-02-24 20:23:36 +0000
+++ storage/innobase/xtrabackup/src/xtrabackup.cc	2014-04-28 14:48:12 +0000
@@ -54,6 +54,8 @@
 # include <sys/prctl.h>
 #endif
 
+#include <sys/resource.h>
+
 #include <btr0sea.h>
 #include <dict0priv.h>
 #include <dict0stats.h>
@@ -283,6 +285,8 @@
 /* The maximum LSN of found archived log files */
 lsn_t xtrabackup_arch_last_file_lsn = 0ULL;
 
+ulong xb_open_files_limit= 0;
+
 /* Datasinks */
 ds_ctxt_t       *ds_data     = NULL;
 ds_ctxt_t       *ds_meta     = NULL;
@@ -459,7 +463,8 @@
   OPT_UNDO_TABLESPACES,
   OPT_INNODB_LOG_CHECKSUM_ALGORITHM,
   OPT_XTRA_INCREMENTAL_FORCE_SCAN,
-  OPT_DEFAULTS_GROUP
+  OPT_DEFAULTS_GROUP,
+  OPT_OPEN_FILES_LIMIT
 };
 
 static struct my_option xb_long_options[] =
@@ -813,6 +818,12 @@
   {"defaults_group", OPT_DEFAULTS_GROUP, "defaults group in config file (default \"mysqld\").",
    (G_PTR*) &defaults_group, (G_PTR*) &defaults_group,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+
+  {"open_files_limit", OPT_OPEN_FILES_LIMIT, "the maximum number of file "
+   "descriptors to reserve with setrlimit().",
+   (G_PTR*) &xb_open_files_limit, (G_PTR*) &xb_open_files_limit, 0, GET_ULONG,
+   REQUIRED_ARG, 0, 0, UINT_MAX, 0, 1, 0},
+
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
@@ -2873,6 +2884,63 @@
 	srv_lock_table_size = 5 * (srv_buf_pool_size / UNIV_PAGE_SIZE);
 }
 
+/***********************************************************************
+Set the open files limit. Based on set_max_open_files().
+
+@return the resulting open files limit. May be less or more than the requested
+value.  */
+static uint
+xb_set_max_open_files(
+/*==================*/
+	uint max_file_limit)	/*!<in: open files limit */
+{
+#if defined(RLIMIT_NOFILE)
+	struct rlimit rlimit;
+	uint old_cur;
+
+	if (getrlimit(RLIMIT_NOFILE, &rlimit)) {
+
+		goto end;
+	}
+
+	old_cur = (uint) rlimit.rlim_cur;
+
+	if (rlimit.rlim_cur == RLIM_INFINITY) {
+
+		rlimit.rlim_cur = max_file_limit;
+	}
+
+	if (rlimit.rlim_cur >= max_file_limit) {
+
+		max_file_limit = rlimit.rlim_cur;
+		goto end;
+	}
+
+	rlimit.rlim_cur = rlimit.rlim_max = max_file_limit;
+
+	if (setrlimit(RLIMIT_NOFILE, &rlimit)) {
+
+		max_file_limit = old_cur;	/* Use original value */
+	} else {
+
+		rlimit.rlim_cur = 0;	/* Safety if next call fails */
+
+		(void) getrlimit(RLIMIT_NOFILE, &rlimit);
+
+		if (rlimit.rlim_cur) {
+
+			/* If call didn't fail */
+			max_file_limit = (uint) rlimit.rlim_cur;
+		}
+	}
+
+end:
+	return(max_file_limit);
+#else
+	return(0);
+#endif
+}
+
 static void
 xtrabackup_backup_func(void)
 {
@@ -2896,6 +2964,10 @@
 	}
 	msg("xtrabackup: cd to %s\n", mysql_real_data_home);
 
+	msg("xtrabackup: open files limit requested %u, set to %u\n",
+	    (uint) xb_open_files_limit,
+	    xb_set_max_open_files(xb_open_files_limit));
+
 	mysql_data_home= mysql_data_home_buff;
 	mysql_data_home[0]=FN_CURLIB;		// all paths are relative from here
 	mysql_data_home[1]=0;

=== added file 'storage/innobase/xtrabackup/test/t/bug1183793.sh'
--- storage/innobase/xtrabackup/test/t/bug1183793.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1183793.sh	2014-04-28 14:48:12 +0000
@@ -0,0 +1,14 @@
+########################################################################
+# Bug #1183793: XtraBackup should raise the open files limit if possible
+########################################################################
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+open_files_limit=1234
+"
+
+start_server
+
+innobackupex --no-timestamp $topdir/backup
+
+grep -q 'open files limit requested 1234' $OUTFILE \
+    || die "Could not set the open files limit"