Merge lp:~sergei.glushchenko/percona-xtrabackup/2.1-xb-bug1222062 into lp:percona-xtrabackup/2.1

[Sergei Glushchenko]

Bug 1222062: Add an option to disable opening all tablespaces on backup start

Introduce xtrabackup option --close-file-handlers to close file
handlers when they aren't needed anymore. Introduce new option -x
for run.sh to force xtrabackup options for all tests by putting them
into [xtrabackup] section of my.cnf.

Two jenkins runs with and without --close-file-handlers, ddl.sh fails as expected

http://jenkins.percona.com/view/PXB%202.1/job/percona-xtrabackup-2.1-param-new/7/
http://jenkins.percona.com/view/PXB%202.1/job/percona-xtrabackup-2.1-param-new/9/

[Alexey Kopytov (akopytov)]

Sergei,

- I would call the option just ‘--close-files’, because ‘handlers’ looks
  confusing (and should be ‘handles’ for that matter).
- users are generally not supposed to call xtrabackup directly, but use
  innobackupex instead. Why is there no corresponding innobackupex
  option?
- please add the warning to the built-in help for xtrabackup option
- please also update the docs (with the “use at your own risk” warning )
- the ‘-i’ option to run.sh has been added to usage text, but is not
  actually handled
- XB_EXTRA_ARGS in run.sh is unused
- srv_close_file_handlers should be initialized to FALSE for consistency

review: Needs Fixing

[Alexey Kopytov (akopytov)]

In the warning text, I would also explain the consequences briefly, rather than refer users to a bug with a long discussion.

[Sergei Glushchenko (sergei.glushchenko)]

Hi Alexey,

All comments are reasonable. I just want to explain why I haven't implement option for innobackupex. We don't recommend to use this option and normally user will not use it. However, if he need it badly, then he actually nows what he is doing. So there is an option for him to add it into my.cnf. Isn't it enough?

[Alexey Kopytov (akopytov)]

Sure, but what if a user hits the open files limit, but still wants to create full backups with mysql.* and other MyISAM tables, buffer pool dumps, etc.?

[Sergei Glushchenko (sergei.glushchenko)]

He can put the option into [xtrabackup] of my.cnf, it will work file. Anyways I already added the corresponding innobackupex option.

[Alexey Kopytov (akopytov)]

I'd be very cautious to put such an option to my.cnf. It's too easy to forget and replicate it to another server, for example. Anyway, now the users are free to choose how they want to use it. Thanks.

review: Approve

=== modified file 'doc/source/innobackupex/innobackupex_option_reference.rst'
--- doc/source/innobackupex/innobackupex_option_reference.rst	2014-05-18 08:23:31 +0000
+++ doc/source/innobackupex/innobackupex_option_reference.rst	2014-09-10 11:23:06 +0000
@@ -14,6 +14,10 @@
 
    Prepare a backup in ``BACKUP-DIR`` by applying the transaction log file named :file:`xtrabackup_logfile` located in the same directory. Also, create new transaction logs. The InnoDB configuration is read from the file :file:`backup-my.cnf` created by |innobackupex| when the backup was made. innobackupex --apply-log uses InnoDB configuration from ``backup-my.cnf`` by default, or from --defaults-file, if specified. InnoDB configuration in this context means server variables that affect data format, i.e. :option:`innodb_page_size`, :option:`innodb_log_block_size`, etc. Location-related variables, like :option:`innodb_log_group_home_dir` or :option:`innodb_data_file_path` are always ignored by --apply-log, so preparing a backup always works with data files from the backup directory, rather than any external ones.
 
+.. option:: --close-files
+
+   Do not keep files opened. This option is passed directly to xtrabackup. When xtrabackup opens tablespace it normally doesn't close its file handle in order to handle the DDL operations correctly. However, if the number of tablespaces is really huge and can not fit into any limit, there is an option to close file handles once they are no longer accessed. Xtrabackup can produce inconsistent backups with this option enabled. Use at your own risk.
+
 .. option:: --compact
 
    Create a compact backup with all secondary index pages omitted. This option is passed directly to xtrabackup.  See the :program:`xtrabackup` :doc:`documentation <../xtrabackup_bin/xtrabackup_binary>` for details.
 
=== modified file 'doc/source/xtrabackup_bin/xbk_option_reference.rst'
--- doc/source/xtrabackup_bin/xbk_option_reference.rst	2014-05-18 08:23:31 +0000
+++ doc/source/xtrabackup_bin/xbk_option_reference.rst	2014-09-10 11:23:06 +0000
@@ -17,6 +17,10 @@
 
    Make a backup and place it in :option:`--target-dir`. See :doc:`Creating a backup <creating_a_backup>`.
 
+.. option:: --close-files
+
+   Do not keep files opened. When xtrabackup opens tablespace it normally doesn't close its file handle in order to handle the DDL operations correctly. However, if the number of tablespaces is really huge and can not fit into any limit, there is an option to close file handles once they are no longer accessed. Xtrabackup can produce inconsistent backups with this option enabled. Use at your own risk.
+
 .. option::  --compact     
 
    Create a compact backup by skipping secondary index pages.
 
=== modified file 'innobackupex.pl'
--- innobackupex.pl	2014-09-02 14:54:11 +0000
+++ innobackupex.pl	2014-09-10 11:23:06 +0000
@@ -135,6 +135,7 @@
 my $option_safe_slave_backup = '';
 my $option_safe_slave_backup_timeout = 300;
 
+my $option_close_files = '';
 my $option_compact = '';
 my $option_rebuild_indexes = '';
 my $option_rebuild_threads = 0;
@@ -2802,6 +2803,10 @@
         $options = $options . " --stream=$option_stream";
     }
 
+    if ($option_close_files) {
+        $options = $options . " --close-files";
+    }
+
     if ($option_compact) {
 	$options = $options . " --compact";
     }
@@ -3664,6 +3669,7 @@
                         'parallel=i' => \$option_parallel,
                         'safe-slave-backup' => \$option_safe_slave_backup,
                         'safe-slave-backup-timeout=i' => \$option_safe_slave_backup_timeout,
+                        'close-files' => \$option_close_files,
                         'compact' => \$option_compact,
                         'rebuild-indexes' => \$option_rebuild_indexes,
                         'rebuild-threads=i' => \$option_rebuild_threads,
@@ -4802,7 +4808,7 @@
              [--tmpdir=DIRECTORY] [--tables-file=FILE]
              [--incremental] [--incremental-basedir]
              [--incremental-dir] [--incremental-force-scan] [--incremental-lsn]
-             [--compact]     
+             [--close-files] [--compact]     
              BACKUP-ROOT-DIR
 
 innobackupex --apply-log [--use-memory=B]
@@ -4874,6 +4880,10 @@
 
 Prepare a backup in BACKUP-DIR by applying the transaction log file named "xtrabackup_logfile" located in the same directory. Also, create new transaction logs. The InnoDB configuration is read from the file "backup-my.cnf".
 
+=item --close-files
+
+Do not keep files opened. This option is passed directly to xtrabackup. Use at your own risk.
+
 =item --compact
 
 Create a compact backup with all secondary index pages omitted. This option is passed directly to xtrabackup. See xtrabackup documentation for details.
 
=== modified file 'patches/innodb51.patch'
--- patches/innodb51.patch	2014-02-23 01:28:49 +0000
+++ patches/innodb51.patch	2014-09-10 11:23:06 +0000
@@ -288,7 +288,7 @@
  		}
  
  		fil_system->max_assigned_id = id;
-@@ -1438,7 +1488,12 @@
+@@ -1438,7 +1448,12 @@
  		the file yet; the following calls will open it and update the
  		size fields */
  
@@ -487,7 +487,7 @@
 +	inconsistencies between the file name and the actual tablespace contents
 +	if a DDL occurs between a fil_load_single_table_tablespaces() call and
 +	the actual copy operation. */
-+	if (srv_backup_mode) {
++	if (srv_backup_mode && !srv_close_files) {
 +
 +		fil_node_t*	node;
 +		fil_space_t*	space;
@@ -723,7 +723,7 @@
  	      || ibuf_page(space_id, zip_size, block_offset, NULL));
  # endif /* UNIV_LOG_DEBUG */
  	if (sync) {
-@@ -4361,6 +4697,16 @@
+@@ -4361,6 +4597,16 @@
  
  	ut_ad((mode != OS_AIO_IBUF) || (space->purpose == FIL_TABLESPACE));
  
@@ -817,7 +817,7 @@
  
 --- a/storage/innodb_plugin/include/srv0srv.h
 +++ b/storage/innodb_plugin/include/srv0srv.h
-@@ -202,6 +202,11 @@
+@@ -202,6 +202,12 @@
  extern ulong	srv_max_purge_lag;
  
  extern ulong	srv_replication_delay;
@@ -826,6 +826,7 @@
 +extern ibool	srv_fake_write;
 +extern ibool	srv_apply_log_only;
 +extern ibool	srv_backup_mode;
++extern ibool	srv_close_files;
  /*-------------------------------------------*/
  
  extern ulint	srv_n_rows_inserted;
@@ -1217,7 +1218,7 @@
  
 --- a/storage/innodb_plugin/srv/srv0srv.c
 +++ b/storage/innodb_plugin/srv/srv0srv.c
-@@ -383,6 +383,10 @@
+@@ -383,6 +383,11 @@
  
  UNIV_INTERN ulong	srv_replication_delay		= 0;
  
@@ -1225,10 +1226,11 @@
 +UNIV_INTERN ibool	srv_fake_write  = FALSE;
 +UNIV_INTERN ibool	srv_apply_log_only = FALSE;
 +UNIV_INTERN ibool	srv_backup_mode = FALSE;
++UNIV_INTERN ibool	srv_close_files = FALSE;
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-@@ -1011,7 +1015,7 @@
+@@ -1011,7 +1016,7 @@
  	}
  
  	/* Initialize some INFORMATION SCHEMA internal structures */
@@ -1237,7 +1239,7 @@
  }
  
  /*********************************************************************//**
-@@ -1022,6 +1026,7 @@
+@@ -1022,6 +1027,7 @@
  /*==========*/
  {
  	os_fast_mutex_free(&srv_conc_mutex);
@@ -1245,7 +1247,7 @@
  	mem_free(srv_conc_slots);
  	srv_conc_slots = NULL;
  
-@@ -1035,6 +1040,7 @@
+@@ -1035,6 +1041,7 @@
  	srv_mysql_table = NULL;
  
  	trx_i_s_cache_free(trx_i_s_cache);
 
=== modified file 'patches/innodb55.patch'
--- patches/innodb55.patch	2014-02-23 01:28:49 +0000
+++ patches/innodb55.patch	2014-09-10 11:23:06 +0000
@@ -487,7 +487,7 @@
 +	inconsistencies between the file name and the actual tablespace contents
 +	if a DDL occurs between a fil_load_single_table_tablespaces() call and
 +	the actual copy operation. */
-+	if (srv_backup_mode) {
++	if (srv_backup_mode && !srv_close_files) {
 +
 +		fil_node_t*	node;
 +		fil_space_t*	space;
@@ -784,7 +784,7 @@
  Returns TRUE if a single-table tablespace does not exist in the memory cache,
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -218,6 +218,11 @@
+@@ -218,6 +218,12 @@
  extern ulong	srv_max_purge_lag;
  
  extern ulong	srv_replication_delay;
@@ -793,6 +793,7 @@
 +extern ibool	srv_fake_write;
 +extern ibool	srv_apply_log_only;
 +extern ibool	srv_backup_mode;
++extern ibool	srv_close_files;
  /*-------------------------------------------*/
  
  extern ulint	srv_n_rows_inserted;
@@ -1139,7 +1140,7 @@
  }
 --- a/storage/innobase/srv/srv0srv.c
 +++ b/storage/innobase/srv/srv0srv.c
-@@ -405,6 +405,10 @@
+@@ -405,6 +405,11 @@
  
  UNIV_INTERN ulong	srv_replication_delay		= 0;
  
@@ -1147,10 +1148,11 @@
 +UNIV_INTERN ibool	srv_fake_write  = FALSE;
 +UNIV_INTERN ibool	srv_apply_log_only = FALSE;
 +UNIV_INTERN ibool	srv_backup_mode = FALSE;
++UNIV_INTERN ibool	srv_close_files = FALSE;
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-@@ -1084,7 +1088,7 @@
+@@ -1084,7 +1089,7 @@
  	}
  
  	/* Initialize some INFORMATION SCHEMA internal structures */
@@ -1159,7 +1161,7 @@
  }
  
  /*********************************************************************//**
-@@ -1095,6 +1099,7 @@
+@@ -1095,6 +1100,7 @@
  /*==========*/
  {
  	os_fast_mutex_free(&srv_conc_mutex);
@@ -1167,7 +1169,7 @@
  	mem_free(srv_conc_slots);
  	srv_conc_slots = NULL;
  
-@@ -1108,6 +1113,7 @@
+@@ -1108,6 +1114,7 @@
  	srv_mysql_table = NULL;
  
  	trx_i_s_cache_free(trx_i_s_cache);
@@ -1175,7 +1177,7 @@
  }
  
  /*********************************************************************//**
-@@ -1728,7 +1734,7 @@
+@@ -1728,7 +1735,7 @@
  		}
  
  		/* Record the lock wait time for this thread */
 
=== modified file 'patches/innodb56.patch'
--- patches/innodb56.patch	2014-08-17 09:44:20 +0000
+++ patches/innodb56.patch	2014-09-10 11:23:06 +0000
@@ -567,7 +567,7 @@
 +	inconsistencies between the file name and the actual tablespace contents
 +	if a DDL occurs between a fil_load_single_table_tablespaces() call and
 +	the actual copy operation. */
-+	if (srv_backup_mode) {
++	if (srv_backup_mode && !srv_close_files) {
 +
 +		fil_node_t*	node;
 +		fil_space_t*	space;
@@ -1261,7 +1261,7 @@
  extern mysql_pfs_key_t	innodb_file_data_key;
 --- a/storage/innobase/include/srv0srv.h
 +++ b/storage/innobase/include/srv0srv.h
-@@ -353,6 +353,13 @@
+@@ -353,6 +353,14 @@
  extern ulong	srv_max_purge_lag_delay;
  
  extern ulong	srv_replication_delay;
@@ -1271,11 +1271,12 @@
 +extern ibool	srv_apply_log_only;
 +
 +extern ibool	srv_backup_mode;
++extern ibool	srv_close_files;
 +
  /*-------------------------------------------*/
  
  extern my_bool	srv_print_innodb_monitor;
-@@ -496,13 +503,17 @@
+@@ -496,13 +504,17 @@
  				the reason for which is that some FS
  				do not flush meta-data when
  				unbuffered IO happens */
@@ -2259,13 +2260,14 @@
  /* User settable value of the number of pages that must be present
  in the buffer cache and accessed sequentially for InnoDB to trigger a
  readahead request. */
-@@ -349,6 +353,13 @@
+@@ -349,6 +353,14 @@
  
  UNIV_INTERN ulong	srv_replication_delay		= 0;
  
 +UNIV_INTERN ibool	srv_apply_log_only	= FALSE;
 +
 +UNIV_INTERN ibool	srv_backup_mode	= FALSE;
++UNIV_INTERN ibool	srv_close_files = TRUE;
 +
 +UNIV_INTERN ulint	srv_log_checksum_algorithm =
 +	SRV_CHECKSUM_ALGORITHM_INNODB;
@@ -2273,7 +2275,7 @@
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_spin_wait_delay	= 6;
-@@ -1818,7 +1829,8 @@
+@@ -1818,7 +1830,8 @@
  	if (ret == SRV_NONE
  	    && srv_shutdown_state != SRV_SHUTDOWN_NONE
  	    && trx_purge_state() != PURGE_STATE_DISABLED
 
=== modified file 'patches/xtradb51.patch'
--- patches/xtradb51.patch	2014-02-23 01:28:49 +0000
+++ patches/xtradb51.patch	2014-09-10 11:23:06 +0000
@@ -380,7 +380,7 @@
 +	inconsistencies between the file name and the actual tablespace contents
 +	if a DDL occurs between a fil_load_single_table_tablespaces() call and
 +	the actual copy operation. */
-+	if (srv_backup_mode) {
++	if (srv_backup_mode && !srv_close_files) {
 +
 +		fil_node_t*	node;
 +		fil_space_t*	space;
@@ -763,7 +763,7 @@
  	return(buf);
 --- a/storage/innodb_plugin/include/srv0srv.h
 +++ b/storage/innodb_plugin/include/srv0srv.h
-@@ -243,6 +243,11 @@
+@@ -243,6 +243,12 @@
  
  extern ulong	srv_replication_delay;
  
@@ -771,6 +771,7 @@
 +extern ibool	srv_fake_write;
 +extern ibool	srv_apply_log_only;
 +extern ibool	srv_backup_mode;
++extern ibool	srv_close_files;
 +
  extern long long	srv_ibuf_max_size;
  extern ulint	srv_ibuf_active_contract;
@@ -1140,7 +1141,7 @@
  /* prototypes for new functions added to ha_innodb.cc */
  ibool	innobase_get_slow_log();
  
-@@ -438,6 +433,11 @@
+@@ -438,6 +433,12 @@
  
  UNIV_INTERN ulong	srv_replication_delay		= 0;
  
@@ -1148,11 +1149,12 @@
 +UNIV_INTERN ibool	srv_fake_write	= FALSE;
 +UNIV_INTERN ibool	srv_apply_log_only = FALSE;
 +UNIV_INTERN ibool	srv_backup_mode = FALSE;
++UNIV_INTERN ibool	srv_close_files = FALSE;
 +
  UNIV_INTERN long long	srv_ibuf_max_size = 0;
  UNIV_INTERN ulint	srv_ibuf_active_contract = 0; /* 0:disable 1:enable */
  UNIV_INTERN ulint	srv_ibuf_accel_rate = 100;
-@@ -1095,7 +1095,7 @@
+@@ -1095,7 +1096,7 @@
  	}
  
  	/* Initialize some INFORMATION SCHEMA internal structures */
@@ -1161,7 +1163,7 @@
  }
  
  /*********************************************************************//**
-@@ -1106,6 +1106,7 @@
+@@ -1106,6 +1107,7 @@
  /*==========*/
  {
  	os_fast_mutex_free(&srv_conc_mutex);
@@ -1169,7 +1171,7 @@
  	mem_free(srv_conc_slots);
  	srv_conc_slots = NULL;
  
-@@ -1119,6 +1120,7 @@
+@@ -1119,6 +1121,7 @@
  	srv_mysql_table = NULL;
  
  	trx_i_s_cache_free(trx_i_s_cache);
@@ -1177,7 +1179,7 @@
  }
  
  /*********************************************************************//**
-@@ -2634,36 +2636,6 @@
+@@ -2634,36 +2637,6 @@
  		old_sema = sema;
  	}
  
 
=== modified file 'patches/xtradb55.patch'
--- patches/xtradb55.patch	2014-02-23 01:28:49 +0000
+++ patches/xtradb55.patch	2014-09-10 11:23:06 +0000
@@ -382,7 +382,7 @@
 +	inconsistencies between the file name and the actual tablespace contents
 +	if a DDL occurs between a fil_load_single_table_tablespaces() call and
 +	the actual copy operation. */
-+	if (srv_backup_mode) {
++	if (srv_backup_mode && !srv_close_files) {
 +
 +		fil_node_t*	node;
 +		fil_space_t*	space;
@@ -791,7 +791,7 @@
  extern char	srv_adaptive_flushing;
  
  /* If this flag is TRUE, then we will load the indexes' (and tables') metadata
-@@ -271,6 +270,11 @@
+@@ -271,6 +270,12 @@
  extern ulint	srv_expand_import;
  extern ulint	srv_pass_corrupt_table;
  
@@ -799,6 +799,7 @@
 +extern ibool	srv_fake_write;
 +extern ibool	srv_apply_log_only;
 +extern ibool	srv_backup_mode;
++extern ibool	srv_close_files;
 +
  /* Helper macro to support srv_pass_corrupt_table checks. If 'cond' is FALSE,
  execute 'code' if srv_pass_corrupt_table is non-zero, or trigger a fatal error
@@ -1193,7 +1194,7 @@
  
  /* Try to flush dirty pages so as to avoid IO bursts at
  the checkpoints. */
-@@ -435,6 +428,11 @@
+@@ -435,6 +428,12 @@
  UNIV_INTERN ulint	srv_pass_corrupt_table = 0; /* 0:disable 1:enable */
  
  UNIV_INTERN ulint	srv_dict_size_limit = 0;
@@ -1202,10 +1203,11 @@
 +UNIV_INTERN ibool	srv_fake_write  = FALSE;
 +UNIV_INTERN ibool	srv_apply_log_only = FALSE;
 +UNIV_INTERN ibool	srv_backup_mode = FALSE;
++UNIV_INTERN ibool	srv_close_files = FALSE;
  /*-------------------------------------------*/
  UNIV_INTERN ulong	srv_n_spin_wait_rounds	= 30;
  UNIV_INTERN ulong	srv_n_free_tickets_to_enter = 500;
-@@ -1185,7 +1183,7 @@
+@@ -1185,7 +1184,7 @@
  	}
  
  	/* Initialize some INFORMATION SCHEMA internal structures */
@@ -1214,7 +1216,7 @@
  }
  
  /*********************************************************************//**
-@@ -1196,6 +1194,7 @@
+@@ -1196,6 +1195,7 @@
  /*==========*/
  {
  	os_fast_mutex_free(&srv_conc_mutex);
@@ -1222,7 +1224,7 @@
  	mem_free(srv_conc_slots);
  	srv_conc_slots = NULL;
  
-@@ -1209,6 +1208,7 @@
+@@ -1209,6 +1209,7 @@
  	srv_mysql_table = NULL;
  
  	trx_i_s_cache_free(trx_i_s_cache);
@@ -1230,7 +1232,7 @@
  }
  
  /*********************************************************************//**
-@@ -1952,7 +1952,7 @@
+@@ -1952,7 +1953,7 @@
  		}
  
  		/* Record the lock wait time for this thread */
@@ -1239,7 +1241,7 @@
  	}
  
  	if (trx->was_chosen_as_deadlock_victim) {
-@@ -2975,36 +2975,6 @@
+@@ -2975,36 +2976,6 @@
  		old_sema = sema;
  	}
  
 
=== modified file 'src/fil_cur.cc'
--- src/fil_cur.cc	2014-03-01 13:30:44 +0000
+++ src/fil_cur.cc	2014-09-10 11:23:06 +0000
@@ -162,7 +162,7 @@
 	/* In the backup mode we should already have a tablespace handle created
 	by fil_load_single_table_tablespace() unless it is a system
 	tablespace. Otherwise we open the file here. */
-	if (cursor->is_system || !srv_backup_mode) {
+	if (cursor->is_system || !srv_backup_mode || srv_close_files) {
 		node->handle =
 			xb_file_create_no_error_handling(node->name,
 						 OS_FILE_OPEN,
 
=== modified file 'src/xtrabackup.cc'
--- src/xtrabackup.cc	2014-09-09 17:22:21 +0000
+++ src/xtrabackup.cc	2014-09-10 11:23:06 +0000
@@ -298,6 +298,7 @@
 lsn_t xtrabackup_arch_last_file_lsn = 0ULL;
 
 ulong xb_open_files_limit= 0;
+my_bool xb_close_files= FALSE;
 
 /* Datasinks */
 ds_ctxt_t       *ds_data     = NULL;
@@ -487,7 +488,8 @@
 #endif
   OPT_XTRA_INCREMENTAL_FORCE_SCAN,
   OPT_DEFAULTS_GROUP,
-  OPT_OPEN_FILES_LIMIT
+  OPT_OPEN_FILES_LIMIT,
+  OPT_CLOSE_FILES
 };
 
 #if MYSQL_VERSION_ID >= 50600
@@ -915,6 +917,10 @@
    (G_PTR*) &xb_open_files_limit, (G_PTR*) &xb_open_files_limit, 0, GET_ULONG,
    REQUIRED_ARG, 0, 0, UINT_MAX, 0, 1, 0},
 
+  {"close_files", OPT_CLOSE_FILES, "do not keep files opened. Use at your own "
+   "risk.", (G_PTR*) &xb_close_files, (G_PTR*) &xb_close_files, 0, GET_BOOL,
+   NO_ARG, 0, 0, 0, 0, 0, 0},
+
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
@@ -3059,6 +3065,13 @@
 	xb_set_innodb_read_only();
 
 	srv_backup_mode = TRUE;
+	srv_close_files = xb_close_files;
+
+	if (srv_close_files)
+		msg("xtrabackup: warning: close-files specified. Use it "
+		    "at your own risk. If there are DDL operations like table DROP TABLE "
+		    "or RENAME TABLE during the backup, inconsistent backup will be "
+		    "produced.\n");
 
 	/* initialize components */
         if(innodb_init_param())
 
=== modified file 'test/inc/common.sh'
--- test/inc/common.sh	2014-09-10 07:36:39 +0000
+++ test/inc/common.sh	2014-09-10 11:23:06 +0000
@@ -240,7 +240,7 @@
     fi
 
     IB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf --ibbackup=$XB_BIN \
---no-version-check"
+--no-version-check ${IB_EXTRA_OPTS:-}"
     XB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf"
 
     # Some aliases for compatibility, as tests use the following names
@@ -303,6 +303,9 @@
 [client]
 socket=${MYSQLD_SOCKET}
 user=root
+
+[xtrabackup]
+${XB_EXTRA_MY_CNF_OPTS:-}
 EOF
 
         # Create datadir and call mysql_install_db if it doesn't exist
 
=== modified file 'test/run.sh'
--- test/run.sh	2014-05-12 08:40:00 +0000
+++ test/run.sh	2014-09-10 11:23:06 +0000
@@ -51,6 +51,8 @@
             on the MySQL version.
 -j N        Run tests in N parallel processes.
 -T seconds  Test timeout (default is $TEST_TIMEOUT seconds).
+-x options  Extra options to pass to xtrabackup
+-i options  Extra options to pass to innobackupex
 EOF
 }
 
@@ -263,6 +265,9 @@
     if gnutar --version > /dev/null 2>&1
     then
 	TAR=gnutar
+    elif gtar --version > /dev/null 2>&1
+    then
+	TAR=gtar
     else
 	TAR=tar
     fi
@@ -324,7 +329,7 @@
     MYSQLD_EXTRA_ARGS=
 
     XB_BIN=""
-    IB_ARGS="--user=root --ibbackup=$XB_BIN"
+    IB_ARGS="--user=root --ibbackup=$XB_BIN ${IB_EXTRA_OPTS:-}"
     XB_ARGS="--no-defaults"
 
     if [ "$XB_BUILD" != "autodetect" ]
@@ -794,7 +799,7 @@
 NWORKERS=
 DEBUG_WORKER=""
 
-while getopts "fgh?:t:s:d:c:j:T:" options; do
+while getopts "fgh?:t:s:d:c:j:T:x:i:" options; do
         case $options in
             f ) force="yes";;
             t )
@@ -831,6 +836,14 @@
                 TEST_TIMEOUT="$OPTARG"
                 ;;
 
+            x )
+                XB_EXTRA_MY_CNF_OPTS="$OPTARG"
+                ;;
+
+            i )
+                IB_EXTRA_OPTS="$OPTARG"
+                ;;
+
             ? ) echo "Use \`$0 -h' for the list of available options."
                     exit -1;;
         esac
 
=== added file 'test/t/bug1222062.sh'
--- test/t/bug1222062.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1222062.sh	2014-09-10 11:23:06 +0000
@@ -0,0 +1,11 @@
+########################################################################
+# Bug #1222062: add option --close-files
+########################################################################
+
+start_server
+
+mkdir $topdir/backup
+
+innobackupex --close-files $topdir/backup
+
+grep "xtrabackup: warning: close-files specified" $OUTFILE