Merge lp:~akopytov/percona-xtrabackup/read-server-options-with-show-variables into lp:percona-xtrabackup/2.2

[Alexey Kopytov]

Implementation of
https://blueprints.launchpad.net/percona-xtrabackup/+spec/read-server-options-with-show-variables

On the backup stage, read options from the server via SHOW VARIABLES
rather than my.cnf. For the ‘datadir’ option, make sure we get the same
value as we would get from my.cnf (if the option is defined there),
because the xtrabackup binary does not have a server connection and uses
my.cnf instead.

[Alexey Kopytov (akopytov)]

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

[Sergei Glushchenko (sergei.glushchenko)]

Hi Alexey,

The patch itself looks good, but

I am concerned of "Bug #1343722: Too easy to backup wrong datadir with
multiple instances". Not only datadir but every other important option
can be different if we read options from my.cnf which doesn't belong
to MySQL instance.

This patch makes following change:

innobackupex reads options from running MySQL.
xtrabackup reads options from my.cnf.

Now instead of single source we have two sources which can be out of
sync. We making sure that xtrabackup and innobackupex agree about
"datadir" but we don't take proper care of other options. Wouldn't it
be better to make both innobackupex and xtrabackup to use runtime
options (innobackupex could simply pass all sensitive options to
xtrabackup or even dump them into tmp-my.cnf).

review: Needs Information

[Alexey Kopytov (akopytov)]

Hi Sergei,

On Tue, Oct 07 2014 13:05:13 +0400, Sergei Glushchenko wrote:

> Hi Alexey,
>
> The patch itself looks good, but
>
> I am concerned of "Bug #1343722: Too easy to backup wrong datadir with
> multiple instances". Not only datadir but every other important option
> can be different if we read options from my.cnf which doesn't belong
> to MySQL instance.
>
> This patch makes following change:
>
> innobackupex reads options from running MySQL.
> xtrabackup reads options from my.cnf.
>
> Now instead of single source we have two sources which can be out of
> sync. We making sure that xtrabackup and innobackupex agree about
> "datadir" but we don't take proper care of other options. Wouldn't it
> be better to make both innobackupex and xtrabackup to use runtime
> options (innobackupex could simply pass all sensitive options to
> xtrabackup or even dump them into tmp-my.cnf).

Well, the patch went through multiple iterations. In one of them, it did
exactly that: it verified all options rather than just datadir. A few
problems had been revealed in testing:

- boolean values like innodb_fast_checksum can only be to 0/1 (or not
  have a value) in the defaults file. That’s how ‘xtrabackup
  --print-param’ prints them. But their values in SHOW VARIABLES are
  ON/OFF. So this must be taken into account when validating all
  options.

- path options like innodb_data_home_dir, innodb_log_group_home_dir,
  etc. They can be specified in an unnormalized way (with multiple
  slashes, “.”, “..”, etc.) in configuration file, but for some of them
  the server normalizes the paths as shown in SHOW VARIABLES, and for
  some of them no normalization is done. This could be solved with
  realpath() as we currently do with datadir. But on top of that, those
  paths can be relative to datadir, and that would require even more
  complex validation logic than just using realpath()

- sometimes we deliberately want to override some options for xtrabackup
  in the [xtrabackup] section of my.cnf, so that the values would be
  deliberately different between SHOW VARIABLES and the ones printed by
  ‘xtrabackup --print-param’.

After some considerations, I decided to only validate datadir, as
everything else would be a bit too risky for a point release. The patch
is rather invasive for a point release even without those changes.

As to passing all sensitive options from innobackupex to xtrabackup,
that’s what we do now for some of them (namely, datadir,
innodb_log_file_size and innodb_data_file_path), because those variables
have different defaults across major server versions, so using runtime
values is crucial.

Passing other value would work, and would eliminate possibility (which
is rather low in practice) of cases when ‘datadir’ is the same in SHOW
VARIABLES and my.cnf, but other (sensitive for XtraBackup) options are
different. But it comes with its own bunch of drawbacks and further
complications and corner cases in the code.

I decided to keep the patch minimal to solve current issues
for a point release, and scheduled
https://blueprints.launchpad.net/percona-xtrabackup/+spec/rewrite-innobackupex-in-c
for the next major release. Seriously, we should do it ASAP...

[Sergei Glushchenko (sergei.glushchenko)]

Hi Alexey,

The patch looks good to me. I agree that getting rid of innobackupex will solve many issues and I believe we should include https://blueprints.launchpad.net/percona-xtrabackup/+spec/rewrite-innobackupex-in-c in the roadmap if it is not there yet.

Approved.

review: Approve

=== modified file 'storage/innobase/xtrabackup/innobackupex.pl'
--- storage/innobase/xtrabackup/innobackupex.pl	2014-10-05 12:02:02 +0000
+++ storage/innobase/xtrabackup/innobackupex.pl	2014-10-06 12:20:08 +0000
@@ -23,6 +23,7 @@
 use English qw(-no_match_vars);
 use Time::HiRes qw(usleep);
 use Carp qw(longmess);
+use Cwd qw(realpath);
 
 # version of this script
 my $innobackup_version = '1.5.1-xtrabackup';
@@ -1896,10 +1897,10 @@
 # process.
 #
 sub backup {
-    my $orig_datadir = get_option(\%config, $option_defaults_group, 'datadir');
+    my $orig_datadir = get_option('datadir');
     my $suspend_file;
-    my $buffer_pool_filename = get_option(\%config, $option_defaults_group,
-                                          'innodb_buffer_pool_filename');
+    my $buffer_pool_filename = get_option_safe('innodb_buffer_pool_filename',
+                                               '');
 
     detect_mysql_capabilities_for_backup(\%mysql);
 
@@ -2038,7 +2039,8 @@
     # copy ib_lru_dump
     # Copy buffer poll dump and/or LRU dump
     foreach my $dump_name ($buffer_pool_filename, 'ib_lru_dump') {
-      if (!$option_rsync && -e "$orig_datadir/$dump_name") {
+        if (!$option_rsync && $dump_name ne '' &&
+            -e "$orig_datadir/$dump_name") {
         backup_file("$orig_datadir", "$dump_name", "$backup_dir/$dump_name")
       }
     }
@@ -2401,14 +2403,6 @@
 #
 sub copy_back {
     my $move_flag = shift;
-    my $orig_datadir = get_option(\%config, $option_defaults_group, 'datadir');
-    my $orig_ibdata_dir = 
-        get_option(\%config, $option_defaults_group, 'innodb_data_home_dir');
-    my $orig_innodb_data_file_path = 
-        get_option(\%config, $option_defaults_group, 'innodb_data_file_path');
-    my $orig_iblog_dir =
-        get_option(\%config, $option_defaults_group, 'innodb_log_group_home_dir');
-    my $orig_undo_dir = $orig_ibdata_dir;
     my $iblog_files = 'ib_logfile.*';
     my $ibundo_files = 'undo[0-9]{3}';
     my $excluded_files = 
@@ -2418,21 +2412,24 @@
         '.*\.pmap|.*\.tmp|' .
         $iblog_files . '|'.
         $ibundo_files;
-    my $compressed_data_file = '.*\.ibz$';
     my $file;
-    my $backup_innodb_data_file_path;
-
-    if (has_option(\%config, $option_defaults_group, 'innodb_doublewrite_file')) {
+
+    my $orig_datadir = get_option('datadir');
+    my $orig_ibdata_dir = get_option_safe('innodb_data_home_dir',
+                                         $orig_datadir);
+    my $orig_innodb_data_file_path = get_option_safe('innodb_data_file_path',
+                                                     '');
+    my $orig_iblog_dir = get_option_safe('innodb_log_group_home_dir',
+                                        $orig_datadir);
+    my $orig_undo_dir = get_option_safe('innodb_undo_directory',
+                                       $orig_datadir);
+
+    if (has_option('innodb_doublewrite_file')) {
         my $doublewrite_file =
-                get_option(\%config, $option_defaults_group,
-                            'innodb_doublewrite_file');
+                get_option('innodb_doublewrite_file');
         $excluded_files = $excluded_files . '|' . $doublewrite_file;
     }
 
-    if (has_option(\%config, $option_defaults_group, 'innodb_undo_directory')) {
-        $orig_undo_dir = get_option(\%config, $option_defaults_group,
-                                    'innodb_undo_directory');
-    }
     # check whether files should be copied or moved to dest directory
     my $move_or_copy_file = $move_flag ? \&move_file : \&copy_file;
     my $move_or_copy_dir = $move_flag ?
@@ -2568,11 +2565,7 @@
     my $cmdline_copy = '';
     my $options = '';
 
-    if ($option_defaults_file) {
-        $options = $options . " --defaults-file=\"$option_defaults_file\" ";
-    } else {
-        $options = $options . " --defaults-file=\"${backup_dir}/backup-my.cnf\" ";
-    }
+    $options = $options . " --defaults-file=\"${backup_dir}/backup-my.cnf\" ";
 
     if ($option_defaults_extra_file) {
         $options = $options . " --defaults-extra-file=\"$option_defaults_extra_file\" ";
@@ -2603,7 +2596,7 @@
     }
 
     my $innodb_data_file_path = 
-        get_option(\%config, $option_defaults_group, 'innodb_data_file_path');
+        get_option('innodb_data_file_path');
 
     # run ibbackup as a child process
     $cmdline = "$option_ibbackup_binary $options";
@@ -2786,6 +2779,21 @@
         $options = $options . " --target-dir=$backup_dir";
     }
 
+    my $datadir = get_option('datadir');
+    if (!has_option_in_config('datadir')) {
+        $options .= " --datadir=\"$datadir\"";
+    }
+
+    my $innodb_log_file_size = get_option('innodb_log_file_size');
+    if (!has_option_in_config('innodb_log_file_size')) {
+        $options .= " --innodb_log_file_size=\"$innodb_log_file_size\"";
+    }
+
+    my $innodb_data_file_path = get_option('innodb_data_file_path');
+    if (!has_option_in_config('innodb_data_file_path')) {
+        $options .= " --innodb_data_file_path=\"$innodb_data_file_path\"";
+    }
+
     if ($option_tmpdir) {
         $options .= " --tmpdir=$option_tmpdir";
     }
@@ -3579,44 +3587,44 @@
     print STDERR "           At the end of a successful $run run $innobackup_script\n";
     print STDERR "           prints \"completed OK!\".\n\n";
 
-    if (!$option_copy_back && !$option_move_back
-        && !$option_decrypt && !$option_decompress) {
-        # we are making a backup or applying log to backup
-        if (!$option_apply_log) {
-            # we are making a backup, we need mysql server
-            get_mysql_vars(\%mysql);
-            $mysql_server_version = $mysql{vars}->{version}->{Value};
-            print STDERR "$prefix Using mysql server version $mysql_server_version\n";
+    if ($option_apply_log || $option_copy_back || $option_move_back) {
+        # read server configuration file
+        read_config_file(\%config);
+    } elsif ($option_backup) {
+        # we are making a backup, read server configuration from SHOW VARIABLES
+        get_mysql_vars(\%mysql);
+
+        # and make sure datadir value is the same in configuration file
+        read_config_file(\%config);
+
+        my $server_val = $mysql{vars}->{datadir}->{Value};
+
+        if (has_option_in_config('datadir')) {
+            my $config_val = $config{$option_defaults_group}{datadir};
+
+            if ($server_val ne $config_val &&
+                # Try to canonicalize paths
+                realpath($server_val) ne realpath($config_val)) {
+
+                die "option 'datadir' has different values:\n" .
+                    "  '$config_val' in defaults file\n" .
+                    "  '$server_val' in SHOW VARIABLES\n"
+                }
         }
+
+        $mysql_server_version = $mysql{vars}->{version}->{Value};
+        print STDERR "$prefix  Using server version $mysql_server_version\n";
         print STDERR "\n";
-        
-        if ($option_include 
-            && $ibbackup_version 
-            && $ibbackup_version le "2.0") {
-            # --include option was given, but ibbackup is too
-            # old to support it
-            die "--include option was given, but ibbackup is too old"
-                . " to support it. You must upgrade to InnoDB Hot Backup"
-                . " v2.0 in order to use --include option.\n";
-        }
-    }
-
-    if (!$option_decrypt && !$option_decompress) {
-      # read MySQL options file
-      #read_config_file($config_file, \%config);
-      read_config_file(\%config);
-
-      if(!$option_tmpdir) {
-          $option_tmpdir = get_option(\%config, $option_defaults_group, 'tmpdir');
-      }
-    }
-
-    # get innodb log home directory from options file
-    #$innodb_log_group_home_dir = 
-    #    get_option(\%config, 'mysqld', 'innodb_log_group_home_dir');
-
-    if (!$option_apply_log && !$option_copy_back && !$option_move_back
-        && !$option_decrypt && !$option_decompress) {
+    }
+
+    if (!$option_tmpdir && ($option_backup || $option_apply_log) &&
+        has_option('tmpdir')) {
+        $option_tmpdir = get_option('tmpdir');
+        # tmpdir can be a colon-separated list of multiple directories
+        $option_tmpdir = (split(/:/, $option_tmpdir))[0];
+    }
+
+    if ($option_backup) {
         # we are making a backup, create a new backup directory
         $backup_dir = File::Spec->rel2abs(make_backup_dir());
         print STDERR "$prefix Created backup directory $backup_dir\n";
@@ -3656,10 +3664,6 @@
                 die "Failed to delete " .
                     "'$option_tmpdir/$xtrabackup_pid_file': $!";
         }
-
-    } elsif ($option_copy_back || $option_move_back) {
-        #$backup_config_file = $backup_dir . '/backup-my.cnf';
-        #read_config_file($backup_config_file, \%backup_config);
     }
 }
 
@@ -3693,16 +3697,18 @@
 
     my $option_name;
     foreach $option_name (@option_names) {
-        if (has_option(\%config, $option_defaults_group, $option_name)) {
-            my $option_value = get_option(\%config, $option_defaults_group, $option_name);
+        if (has_option($option_name)) {
+            my $option_value = get_option($option_name);
             $options_dump .= "$option_name=$option_value\n";
         }
     }
-    if (has_option(\%config,
-        $option_defaults_group, "innodb_doublewrite_file")) {
-        $options_dump .= "innodb_doublewrite_file=" . (split(/\/+/,
-                get_option(\%config, $option_defaults_group,
-                            'innodb_doublewrite_file')))[-1] . "\n";
+    if (has_option('innodb_doublewrite_file')) {
+        my $option_value = (split(/\/+/,
+                                  get_option('innodb_doublewrite_file')))[-1];
+
+        if (defined($option_value)) {
+            $options_dump .= "innodb_doublewrite_file=" . $option_value . "\n";
+        }
     }
 
     write_to_backup_file("$filename", "$options_dump");
@@ -3940,8 +3946,6 @@
 #
 sub make_backup_dir {
     my $dir;
-    my $innodb_data_file_path = 
-        get_option(\%config, $option_defaults_group, 'innodb_data_file_path');
 
     # create backup directory
     $dir = $backup_root;
@@ -3953,19 +3957,6 @@
        unless $option_no_timestamp;
     mkdir($dir, 0777) || die "Failed to create backup directory $dir: $!";
 
-    # create subdirectories for ibdata files if needed
-#    foreach my $a (split(/;/, $innodb_data_file_path)) {
-#        my $path = (split(/:/,$a))[0];
-#        my @relative_path = split(/\/+/, $path);
-#        pop @relative_path;
-#        if (@relative_path) {
-#            # there is a non-trivial path from the backup directory
-#            # to the directory of this backup ibdata file, check
-#            # that all the directories in the path exist.
-#            create_path_if_needed($dir, \@relative_path);
-#        }
-#    }
-
     return $dir;
 }
 
@@ -4023,9 +4014,9 @@
 #
 sub backup_files {
     my $prep_mode = shift;
-    my $source_dir = get_option(\%config, $option_defaults_group, 'datadir');
-    my $buffer_pool_filename = get_option(\%config, $option_defaults_group,
-                                          'innodb_buffer_pool_filename');
+    my $source_dir = get_option('datadir');
+    my $buffer_pool_filename = get_option_safe('innodb_buffer_pool_filename',
+                                              '');
     my @list;
     my $file;
     my $database;
@@ -4145,7 +4136,7 @@
 
     if ($option_rsync) {
         foreach my $dump_name ($buffer_pool_filename, 'ib_lru_dump') {
-            if (-e "$source_dir/$dump_name") {
+            if ($dump_name ne '' && -e "$source_dir/$dump_name") {
                 print RSYNC "$dump_name\n";
                 if (!$prep_mode) {
                     $rsync_files_hash{"$dump_name"} = 1;
@@ -4289,10 +4280,11 @@
     my $options = '';
 
 
-    if ($option_defaults_file) {
+    if ($option_apply_log) {
+        $options = $options .
+            " --defaults-file=\"${backup_dir}/backup-my.cnf\" ";
+    } elsif ($option_defaults_file) {
         $options = $options . " --defaults-file=\"$option_defaults_file\" ";
-    } elsif ($option_apply_log) {
-        $options = $options . " --defaults-file=\"${backup_dir}/backup-my.cnf\" ";
     }
 
     if ($option_defaults_extra_file) {
@@ -4367,60 +4359,114 @@
       }
    }
 }
-    
-
-# has_option return whether the config has an option with the given name
-#    Parameters:
-#       config_ref   a reference to a config data
-#       group        option group name
+
+
+# has_option_in_config return true if the configuration file defines an option
+# with the given name.
+#
+#    Parameters:
+#       option_name  name of the option
+#    Return value:
+#       true if option exists, otherwise false
+#
+sub has_option_in_config {
+   my $option_name = shift;
+   my $group_hash_ref;
+
+   if (!exists $config{$option_defaults_group}) {
+       return 0;
+    }
+
+    $group_hash_ref = $config{$option_defaults_group};
+
+    return exists ${$group_hash_ref}{$option_name};
+}
+
+
+# has_option returns 1 if an option with the given name exists in either
+# defaults file file as reported by 'xtrabackup --print-param' or (in backup
+# mode) SHOW VARIABLES. Otherwise returns 0.
+#
+#    Parameters:
 #       option_name  name of the option
 #    Return value:
 #       true if option exists, otherwise false
 #
 sub has_option {
-    my $config_ref = shift;
-    my $group = shift;
     my $option_name = shift;
-    my $group_hash_ref;
-
-    if (!exists ${$config_ref}{$group}) {
-        # no group
-        die "no '$group' group in MySQL options";
-    }
-
-    $group_hash_ref = ${$config_ref}{$group};
-    
-    return exists ${$group_hash_ref}{$option_name};
+
+    if (has_option_in_config($option_name)) {
+        return 1;
+    }
+
+    if ($option_backup) {
+        if (!defined($mysql{vars})) {
+            get_mysql_vars(\%mysql);
+        }
+
+        return defined($mysql{vars}->{$option_name});
+    }
+
+    return 0;
 }
-    
-
-# get_option subroutine returns the value of given option in the config
-# structure. If option is missing, this subroutine calls exit.
-#    Parameters:
-#       config_ref   a reference to a config data
-#       group        option group name
+
+
+# get_option returns the value of an option with the given name as defined
+# either in defaults file as reported by 'xtrabackup --print-param' or (in
+# backup mode) SHOW VARIABLES.
+#
+# This subroutine aborts with an error if the option is not defined.
+#
+#  Parameters:
 #       option_name  name of the option
 #    Return value:
 #       option value as a string
 #
 sub get_option {
-    my $config_ref = shift;
-    my $group = shift;
     my $option_name = shift;
     my $group_hash_ref;
 
-    if (!exists $config{$group}) {
-        # no group
-        die "no '$group' group in MySQL options";
-    }
-    
-    $group_hash_ref = ${$config_ref}{$group};
-    if (!exists ${$group_hash_ref}{$option_name}) {
-        # no option
-        die "no '$option_name' option in group '$group' in MySQL options";
-    }
-
-    return ${$group_hash_ref}{$option_name};
+    if (!$option_backup) {
+        if (!exists $config{$option_defaults_group}) {
+            # no group
+            die "no '$option_defaults_group' group in server configuration " .
+                "file '$option_defaults_file'";
+        }
+
+        $group_hash_ref = $config{$option_defaults_group};
+        if (!exists ${$group_hash_ref}{$option_name}) {
+            # no option
+            die "no '$option_name' option in group '$option_defaults_group' " .
+                "in server configuration file '$option_defaults_file'";
+        }
+
+        return ${$group_hash_ref}{$option_name};
+    }
+
+    if (!defined($mysql{vars})) {
+        get_mysql_vars(\%mysql);
+    }
+
+    if (!defined($mysql{vars}->{$option_name})) {
+        die "no '$option_name' option in SHOW VARIABLES";
+    }
+
+    return $mysql{vars}->{$option_name}->{Value};
+}
+
+#
+# Identical to get_option, except that the second argument is returned on error,
+# i.e. if the option is not defined.
+#
+sub get_option_safe {
+    my $option_name = shift;
+    my $fallback_value = shift;
+
+    if (has_option($option_name)) {
+        return get_option($option_name);
+    }
+
+    return $fallback_value;
 }
 
 # get_table_name subroutine returns table name of specified file.
 
=== modified file 'storage/innobase/xtrabackup/src/xtrabackup.cc'
--- storage/innobase/xtrabackup/src/xtrabackup.cc	2014-09-25 07:02:53 +0000
+++ storage/innobase/xtrabackup/src/xtrabackup.cc	2014-10-06 12:20:08 +0000
@@ -66,6 +66,8 @@
 #include <row0quiesce.h>
 #include <srv0start.h>
 
+#include <sstream>
+
 #define G_PTR uchar*
 
 #include "common.h"
@@ -309,6 +311,10 @@
 ds_ctxt_t       *ds_data     = NULL;
 ds_ctxt_t       *ds_meta     = NULL;
 
+/* String buffer used by --print-param to accumulate server options as they are
+parsed from the defaults file */
+static std::ostringstream print_param_str;
+
 extern "C" sig_handler handle_fatal_signal(int sig);
 
 /* Simple datasink creation tracking...add datasinks in the reverse order you
@@ -483,7 +489,7 @@
   OPT_XTRA_REBUILD_THREADS,
   OPT_INNODB_CHECKSUM_ALGORITHM,
   OPT_INNODB_UNDO_DIRECTORY,
-  OPT_UNDO_TABLESPACES,
+  OPT_INNODB_UNDO_TABLESPACES,
   OPT_INNODB_LOG_CHECKSUM_ALGORITHM,
   OPT_XTRA_INCREMENTAL_FORCE_SCAN,
   OPT_DEFAULTS_GROUP,
@@ -839,7 +845,7 @@
    (G_PTR*) &srv_undo_dir, (G_PTR*) &srv_undo_dir,
    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 
-  {"innodb_undo_tablespaces", OPT_UNDO_TABLESPACES,
+  {"innodb_undo_tablespaces", OPT_INNODB_UNDO_TABLESPACES,
    "Number of undo tablespaces to use.",
    (G_PTR*)&srv_undo_tablespaces, (G_PTR*)&srv_undo_tablespaces,
    0, GET_ULONG, REQUIRED_ARG, 0, 0, 126, 0, 1, 0},
@@ -959,6 +965,9 @@
   my_print_variables(xb_long_options);
 }
 
+#define ADD_PRINT_PARAM_OPT(value)              \
+  print_param_str << opt->name << "=" << value << "\n";
+
 static my_bool
 get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
 	       char *argument)
@@ -967,7 +976,94 @@
   case 'h':
     strmake(mysql_real_data_home,argument, FN_REFLEN - 1);
     mysql_data_home= mysql_real_data_home;
-    break;
+
+    ADD_PRINT_PARAM_OPT(mysql_real_data_home);
+    break;
+
+  case 't':
+
+    ADD_PRINT_PARAM_OPT(opt_mysql_tmpdir);
+    break;
+
+  case OPT_INNODB_DATA_HOME_DIR:
+
+    ADD_PRINT_PARAM_OPT(innobase_data_home_dir);
+    break;
+
+  case OPT_INNODB_DATA_FILE_PATH:
+
+    ADD_PRINT_PARAM_OPT(innobase_data_file_path);
+    break;
+
+  case OPT_INNODB_LOG_GROUP_HOME_DIR:
+
+    ADD_PRINT_PARAM_OPT(srv_log_group_home_dir);
+    break;
+
+  case OPT_INNODB_LOG_FILES_IN_GROUP:
+
+    ADD_PRINT_PARAM_OPT(innobase_log_files_in_group);
+    break;
+
+  case OPT_INNODB_LOG_FILE_SIZE:
+
+    ADD_PRINT_PARAM_OPT(innobase_log_file_size);
+    break;
+
+  case OPT_INNODB_FLUSH_METHOD:
+
+    ADD_PRINT_PARAM_OPT(innobase_unix_file_flush_method);
+    break;
+
+  case OPT_INNODB_PAGE_SIZE:
+
+    ADD_PRINT_PARAM_OPT(innobase_page_size);
+    break;
+
+  case OPT_INNODB_FAST_CHECKSUM:
+
+    ADD_PRINT_PARAM_OPT(!!innobase_fast_checksum);
+    break;
+
+  case OPT_INNODB_LOG_BLOCK_SIZE:
+
+    ADD_PRINT_PARAM_OPT(innobase_log_block_size);
+    break;
+
+  case OPT_INNODB_DOUBLEWRITE_FILE:
+
+    ADD_PRINT_PARAM_OPT(innobase_doublewrite_file);
+    break;
+
+  case OPT_INNODB_UNDO_DIRECTORY:
+
+    ADD_PRINT_PARAM_OPT(srv_undo_dir);
+    break;
+
+  case OPT_INNODB_UNDO_TABLESPACES:
+
+    ADD_PRINT_PARAM_OPT(srv_undo_tablespaces);
+    break;
+
+  case OPT_INNODB_CHECKSUM_ALGORITHM:
+
+    ut_a(srv_checksum_algorithm <= SRV_CHECKSUM_ALGORITHM_STRICT_NONE);
+
+    ADD_PRINT_PARAM_OPT(innodb_checksum_algorithm_names[srv_checksum_algorithm]);
+    break;
+
+  case OPT_INNODB_LOG_CHECKSUM_ALGORITHM:
+
+    ut_a(srv_log_checksum_algorithm <= SRV_CHECKSUM_ALGORITHM_STRICT_NONE);
+
+    ADD_PRINT_PARAM_OPT(innodb_checksum_algorithm_names[srv_log_checksum_algorithm]);
+    break;
+
+  case OPT_INNODB_BUFFER_POOL_FILENAME:
+
+    ADD_PRINT_PARAM_OPT(innobase_buffer_pool_filename);
+    break;
+
   case OPT_XTRA_TARGET_DIR:
     strmake(xtrabackup_real_target_dir,argument, sizeof(xtrabackup_real_target_dir)-1);
     xtrabackup_target_dir= xtrabackup_real_target_dir;
@@ -6045,6 +6141,10 @@
 	}
 	load_defaults("my", xb_load_default_groups, &argc, &argv);
 
+	print_param_str <<
+		"# This MySQL options file was generated by XtraBackup.\n"
+		"[" << defaults_group << "]\n";
+
 	/* ignore unsupported options */
 	{
 	int i,j,argc_new,find;
@@ -6166,51 +6266,9 @@
 
 	/* --print-param */
 	if (xtrabackup_print_param) {
-		/* === some variables from mysqld === */
-		memset((G_PTR) &mysql_tmpdir_list, 0,
-		       sizeof(mysql_tmpdir_list));
-
-		if (init_tmpdir(&mysql_tmpdir_list, opt_mysql_tmpdir))
-			exit(EXIT_FAILURE);
-
-		printf("# This MySQL options file was generated by XtraBackup.\n");
-		printf("[%s]\n", defaults_group);
-		printf("datadir = \"%s\"\n", mysql_data_home);
-		printf("tmpdir = \"%s\"\n", mysql_tmpdir_list.list[0]);
-		printf("innodb_data_home_dir = \"%s\"\n",
-			innobase_data_home_dir ? innobase_data_home_dir : mysql_data_home);
-		printf("innodb_data_file_path = \"%s\"\n",
-			innobase_data_file_path ? innobase_data_file_path : "ibdata1:10M:autoextend");
-		printf("innodb_log_group_home_dir = \"%s\"\n",
-		       srv_log_group_home_dir ?
-		       srv_log_group_home_dir : mysql_data_home);
-		printf("innodb_log_files_in_group = %ld\n", innobase_log_files_in_group);
-		printf("innodb_log_file_size = %lld\n", innobase_log_file_size);
-		printf("innodb_flush_method = \"%s\"\n",
-		       (innobase_unix_file_flush_method != NULL) ?
-		       innobase_unix_file_flush_method : "");
-		printf("innodb_page_size = %lld\n", innobase_page_size);
-		printf("innodb_fast_checksum = %d\n", innobase_fast_checksum);
-		printf("innodb_log_block_size = %lu\n", innobase_log_block_size);
-		if (innobase_doublewrite_file != NULL) {
-			printf("innodb_doublewrite_file = %s\n", innobase_doublewrite_file);
-		}
-		if (srv_undo_dir) {
-
-			printf("innodb_undo_directory = \"%s\"\n",
-			       srv_undo_dir);
-		}
-		printf("innodb_undo_tablespaces = %lu\n", srv_undo_tablespaces);
-		printf("innodb_checksum_algorithm = %s\n",
-		       innodb_checksum_algorithm_names[srv_checksum_algorithm]
-		       );
-		printf("innodb_log_checksum_algorithm = %s\n",
-		       innodb_checksum_algorithm_names[srv_log_checksum_algorithm]
-		       );
-		printf("innodb_buffer_pool_filename = \"%s\"\n",
-			innobase_buffer_pool_filename ?
-				innobase_buffer_pool_filename :
-				"ib_buffer_pool");
+
+		printf("%s", print_param_str.str().c_str());
+
 		exit(EXIT_SUCCESS);
 	}
 
 
=== modified file 'storage/innobase/xtrabackup/test/run.sh'
--- storage/innobase/xtrabackup/test/run.sh	2014-09-10 12:10:01 +0000
+++ storage/innobase/xtrabackup/test/run.sh	2014-10-06 12:20:08 +0000
@@ -373,9 +373,6 @@
        fi
     fi
 
-    # Version-specific defaults
-    DEFAULT_IBDATA_SIZE="10M"
-
     # Determine MySQL flavor
     if [[ "$MYSQL_VERSION" =~ "MariaDB" ]]
     then
@@ -410,8 +407,7 @@
             ;;
         5.5 )
             ;;
-        5.6 | 10.0 )
-            DEFAULT_IBDATA_SIZE="12M"
+        5.6 | 10.0 | 10.1)
             ;;
         *)
             vlog "Unknown MySQL/InnoDB version: $MYSQL_VERSION/$INNODB_VERSION"
@@ -440,7 +436,7 @@
     export MYSQL_VERSION MYSQL_VERSION_COMMENT MYSQL_FLAVOR \
 	INNODB_VERSION XTRADB_VERSION INNODB_FLAVOR \
 	XB_BIN IB_BIN IB_ARGS XB_ARGS MYSQLD_EXTRA_ARGS \
-        DEFAULT_IBDATA_SIZE WSREP_READY LIBGALERA_PATH
+        WSREP_READY LIBGALERA_PATH
 }
 
 ###########################################################################
 
=== modified file 'storage/innobase/xtrabackup/test/t/bug1062684.sh'
--- storage/innobase/xtrabackup/test/t/bug1062684.sh	2013-04-27 18:46:54 +0000
+++ storage/innobase/xtrabackup/test/t/bug1062684.sh	2014-10-06 12:20:08 +0000
@@ -7,7 +7,7 @@
 . inc/common.sh
 
 MYSQLD_EXTRA_MY_CNF_OPTS="
-innodb-data-file-path=ibdata1:${DEFAULT_IBDATA_SIZE};ibdata2:5M:autoextend
+innodb-data-file-path=ibdata1:10M;ibdata2:5M:autoextend
 "
 
 start_server
@@ -22,8 +22,8 @@
 mkdir -p $topdir/backup
 
 vlog "Starting backup"
-innobackupex  $topdir/backup
-full_backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{print $2}'`
+full_backup_dir=$topdir/backup/full
+innobackupex --no-timestamp $full_backup_dir
 vlog "Full backup done to directory $full_backup_dir"
 
 # Changing data
@@ -47,9 +47,9 @@
 vlog "###############"
 
 # Incremental backup
+inc_backup_dir=$topdir/backup/inc
 innobackupex --incremental --incremental-basedir=$full_backup_dir \
-    $topdir/backup
-inc_backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | tail -n 1 | awk -F\' '{print $2}'`
+    --no-timestamp $inc_backup_dir
 vlog "Incremental backup done to directory $inc_backup_dir"
 
 vlog "Preparing backup"
@@ -84,7 +84,7 @@
 innobackupex --copy-back $full_backup_dir
 vlog "Data restored"
 
-start_server --innodb-data-file-path="ibdata1:${DEFAULT_IBDATA_SIZE};ibdata2:5M:autoextend"
+start_server
 
 vlog "Checking checksums"
 checksum_test_b=`checksum_table incremental_sample test`
 
=== added file 'storage/innobase/xtrabackup/test/t/bug1334062.sh'
--- storage/innobase/xtrabackup/test/t/bug1334062.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1334062.sh	2014-10-06 12:20:08 +0000
@@ -0,0 +1,24 @@
+#############################################################################
+# Bug #1334062: Xtrabackup 2.2.3 fails to perform a full backup on PS 5.5 if
+#               innodb_log_file_size on the [mysqld] section of my.cnf is not
+#               set
+#############################################################################
+
+start_server
+
+sed -i -e 's/innodb_log_file_size=.*//' $MYSQLD_VARDIR/my.cnf
+
+grep innodb_log_file_size $MYSQLD_VARDIR/my.cnf &&
+  die "innodb_log_file_size is present in my.cnf"
+
+innobackupex --no-timestamp $topdir/backup
+
+innobackupex --apply-log $topdir/backup
+
+stop_server
+
+rm -rf $MYSQLD_DATADIR/*
+
+innobackupex --copy-back $topdir/backup
+
+start_server
 
=== added file 'storage/innobase/xtrabackup/test/t/bug1343722.sh'
--- storage/innobase/xtrabackup/test/t/bug1343722.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/bug1343722.sh	2014-10-06 12:20:08 +0000
@@ -0,0 +1,18 @@
+########################################################################
+# Bug #1343722: Too easy to backup wrong datadir with multiple instances
+########################################################################
+
+start_server_with_id 1
+
+socket=$MYSQLD_SOCKET
+
+start_server_with_id 2
+
+# Try to backup server 2, but use server 1's connection socket
+$IB_BIN $IB_ARGS --socket=$socket --no-timestamp $topdir/backup 2>&1 |
+    grep 'has different values'
+
+if [[ ${PIPESTATUS[0]} == 0 ]]
+then
+    die "innobackupex did not fail as expected"
+fi
 
=== modified file 'storage/innobase/xtrabackup/test/t/bug766305.sh'
--- storage/innobase/xtrabackup/test/t/bug766305.sh	2014-09-20 17:05:56 +0000
+++ storage/innobase/xtrabackup/test/t/bug766305.sh	2014-10-06 12:20:08 +0000
@@ -4,7 +4,7 @@
 
 start_server --innodb_file_per_table
 
-if [ ${ASAN_OPTIONS:-undefined} = "undefined" ]
+if [ ${ASAN_OPTIONS:-undefined} != "undefined" ]
 then
     skip_test "Incompatible with AddressSanitizer"
 fi
 
=== added file 'storage/innobase/xtrabackup/test/t/xb_print_param.sh'
--- storage/innobase/xtrabackup/test/t/xb_print_param.sh	1970-01-01 00:00:00 +0000
+++ storage/innobase/xtrabackup/test/t/xb_print_param.sh	2014-10-06 12:20:08 +0000
@@ -0,0 +1,46 @@
+########################################################################
+# Tests for xtrabackup --print-param
+########################################################################
+
+my_cnf="[mysqld]
+datadir=/some/data/dir
+tmpdir=/some/tmp/dir1:/some/tmp/dir2
+innodb_data_home_dir=/some/innodb/dir
+innodb_data_file_path=ibdata1:10M;ibdata2:5M:autoextend
+innodb_log_group_home_dir=/some/log/dir
+innodb_log_files_in_group=3
+innodb_log_file_size=5M
+innodb_flush_method=O_DIRECT
+innodb_page_size=4K
+innodb_fast_checksum=1
+innodb_log_block_size=4K
+innodb_doublewrite_file=/some/doublewrite/file
+innodb_undo_directory=/some/undo/directory
+innodb_undo_tablespaces=8
+innodb_checksum_algorithm=strict_crc32
+innodb_log_checksum_algorithm=none
+innodb_buffer_pool_filename=/some/buffer/pool/file"
+
+echo "$my_cnf" >$topdir/my.cnf
+
+diff -u <($XB_BIN --defaults-file=$topdir/my.cnf --print-param) - <<EOF
+# This MySQL options file was generated by XtraBackup.
+[mysqld]
+datadir=/some/data/dir
+tmpdir=/some/tmp/dir1:/some/tmp/dir2
+innodb_data_home_dir=/some/innodb/dir
+innodb_data_file_path=ibdata1:10M;ibdata2:5M:autoextend
+innodb_log_group_home_dir=/some/log/dir
+innodb_log_files_in_group=3
+innodb_log_file_size=5242880
+innodb_flush_method=O_DIRECT
+innodb_page_size=4096
+innodb_fast_checksum=1
+innodb_log_block_size=4096
+innodb_doublewrite_file=/some/doublewrite/file
+innodb_undo_directory=/some/undo/directory
+innodb_undo_tablespaces=8
+innodb_checksum_algorithm=strict_crc32
+innodb_log_checksum_algorithm=none
+innodb_buffer_pool_filename=/some/buffer/pool/file
+EOF