Merge lp:~stewart/percona-xtrabackup/drop-remote-host into lp:percona-xtrabackup/2.0

[Stewart Smith]

drop remote host support in XB2.0

[Vadim Tkachenko (vadim-tk)]

Stewart,

I would think we need to drop it totally on XB2.1
and in 2.0 only to mark it as DEPRECATED.
We should leave enough time for users to accommodate this change.

[Stewart Smith (stewart)]

http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-param/163/

[Stewart Smith (stewart)]

> Stewart,
>
> I would think we need to drop it totally on XB2.1
> and in 2.0 only to mark it as DEPRECATED.
> We should leave enough time for users to accommodate this change.

we are marking deprecated in 1.6...

[Stewart Smith (stewart)]

We will hold off this merge until XB 2.1

review: Disapprove

Unmerged revisions

403. By Stewart Smith on 2012-03-09

remove the (now unused) --sshopt and --scpopt options to innobackupex. This goes along with the --remote-host removal, all in favor of streaming backups

402. By Stewart Smith on 2012-03-09

remove the --remote-host option from innobackupex - it is removed in favor of streaming backups

401. By Stewart Smith on 2012-03-09

null merge from 1.6

400. By Stewart Smith on 2012-03-09

merge fix for bug#938594: assert on --prepare --apply-log-only

=== modified file 'doc/source/innobackupex/how_innobackupex_works.rst'
--- doc/source/innobackupex/how_innobackupex_works.rst	2012-02-14 08:31:46 +0000
+++ doc/source/innobackupex/how_innobackupex_works.rst	2012-03-19 07:15:24 +0000
@@ -53,8 +53,6 @@
 :file:`mysql-stdout`
   containing the ``STDOUT`` of the server.
 
-If the :option:`--remote-host` was set, |innobackupex| will test the connection to the host via :command:`ssh` and create the backup directories. Then the same process will be applied but the log will be written to a temporary file and will be copied via :command:`scp` with the options set by :option:`--scpopt` (``-Cp -c arcfour`` by default).
-
 After each copy the files will be deleted. The same rationale is for the :option:`--stream` mode.
 
 Finally, the binary log position will be printed to ``STDERR`` and |innobackupex| will exit returning 0 if all went OK.

=== modified file 'doc/source/innobackupex/innobackupex_option_reference.rst'
--- doc/source/innobackupex/innobackupex_option_reference.rst	2012-02-14 08:31:46 +0000
+++ doc/source/innobackupex/innobackupex_option_reference.rst	2012-03-19 07:15:24 +0000
@@ -115,17 +115,13 @@
 
    This option accepts a string argument that specifies the directory in which to save an extra copy of the :file:`xtrabackup_checkpoints` file. It is passed directly to |xtrabackup|'s :option:`--extra-lsndir` option. See the :program:`xtrabackup` documentation for details.
 
-.. option:: --remote-host
-
-   This option accepts a string argument that specifies the remote host on which the backup files will be created, by using an ssh connection.
-
 .. option:: --stream
 
    This option accepts a string argument that specifies the format in which to do the streamed backup. The backup will be done to ``STDOUT`` in the specified format. Currently, the only supported format is :command:`tar`. Uses :doc:`tar4ibd <../tar4ibd/tar4ibd_binary>`, which is available in *XtraBackup* distributions. If you specify a path after this option, it will be interpreted as the value of :option:`tmpdir`.  If both :option:`--stream` and :option:`--incremental` are passed to innobackupex, the incremental parameters are ignored and a full backup is created.
 
 .. option:: --tmpdir
 
-   This option accepts a string argument that specifies the location where a temporary file will be stored. It should be used when :option:`--remote-host` or :option:`--stream` is specified. For these options, the transaction log will first be stored to a temporary file, before streaming or copying to a remote host. This option specifies the location where that temporary file will be stored. If the option is not specifed, the default is to use the value of ``tmpdir`` read from the server configuration.
+   This option accepts a string argument that specifies the location where a temporary file will be stored. It should be used when :option:`--stream` is specified. For these options, the transaction log will first be stored to a temporary file, before streaming or copying to a remote host. This option specifies the location where that temporary file will be stored. If the option is not specifed, the default is to use the value of ``tmpdir`` read from the server configuration.
 
 .. option:: --tar4ibd
 
@@ -135,14 +131,6 @@
 
    This option forces the use of :command:`tar` when creating a streamed backup, rather than :program:`tar4ibd`, which is the default.
 
-.. option:: --scpopt = '-Cp -c arcfour'
-
-   This option accepts a string argument that specifies the command line options to pass to :command:`scp` when the option :option:`--remost-host` is specified. If the option is not specified, the default options are ``-Cp -c arcfour``.
-
-.. option:: --sshopt
-
-   This option accepts a string argument that specifies the command line options to pass to :command:`ssh` when the option :option:`--remost-host` is specified.
-
 .. option:: --parallel
 
    This option accepts an integer argument that specifies the number of threads the :program:`xtrabackup` child process should use to back up files concurrently.  Note that this option works on file level, that is, if you have several .ibd files, they will be copied in parallel. If you have just single big .ibd file, it will have no effect. It is passed directly to xtrabackup's :option:`xtrabackup --parallel` option. See the :program:`xtrabackup` documentation for details.
@@ -162,5 +150,4 @@
    uses :program:`rsync` to copy all non-InnoDB files instead of
    spawning a separate :program:`cp` for each file, which can be much
    faster for servers with a large number of databases or tables.  This
-   option cannot be used together with :option:`--remote-host` or
-   :option:`--stream`.
+   option cannot be used together with :option:`--stream`.

=== modified file 'doc/source/innobackupex/remote_backups_ibk.rst'
--- doc/source/innobackupex/remote_backups_ibk.rst	2012-02-02 20:24:24 +0000
+++ doc/source/innobackupex/remote_backups_ibk.rst	2012-03-19 07:15:24 +0000
@@ -2,17 +2,4 @@
  Sending Backups to Remote Hosts with |innobackupex|
 =====================================================
 
-Besides of using the :option:`--stream` for sending the backup to another host via piping (see :doc:`streaming_backups_innobackupex`), |innobackupex| can do it directly with the :option:`--remote-host` ::
-
-  $ innobackupex --remote-host=REMOTEUSER@REMOTEHOST /path/IN/REMOTE/HOST/to/backup/
-
-|innobackupex| will test the connection to ``REMOTEHOST`` via :command:`ssh` and create the backup directories needed as the ``REMOTEUSER`` you specified. The options for :command:`ssh` can be specified with :option:`--sshopt`
-
-.. warning:: The path you provide for storing the backup will be created at ``REMOTEHOST``, not at the local host.
-
-Then all the log files will be written to a temporary file (you can choose where to store this file with the :option:`--tmpdir` option) and will be copied via :command:`scp`. The options for :command:`scp` can be specified with :option:`--options-scp` (``-Cp -c arcfour`` by default), for example::
-
-  $ innobackupex --remote-host=REMOTEUSER@REMOTEHOST /path/IN/REMOTE/HOST/to/backup/ \
-     --tmpdir=/tmp --options-scp="-Cp -c arcfour"
-
-
+As of Percona XtraBackup 2.0, you should use the :option:`--stream` optino for sending a backup to another host via piping (see :doc:`streaming_backups_innobackupex`).

=== modified file 'innobackupex'
--- innobackupex	2012-02-14 04:00:10 +0000
+++ innobackupex	2012-03-19 07:15:24 +0000
@@ -96,7 +96,6 @@
 my $option_incremental_dir = '';
 my $option_incremental_lsn = '';
 my $option_extra_lsndir = '';
-my $option_remote_host = '';
 my $option_rsync = '';
 my $option_stream = '';
 my $stream_cmd = '';
@@ -104,8 +103,6 @@
 
 my $option_tar4ibd = '';
 my $option_force_tar = '';
-my $option_scp_opt = '-Cp -c arcfour';
-my $option_ssh_opt = '';
 
 my $option_parallel = '';
 
@@ -283,11 +280,7 @@
 } else {
     # make a backup of InnoDB and MyISAM tables, indexes and .frm files.
     $ibbackup_exit_code = backup();
-    if ($option_remote_host) {
-      open(XTRABACKUP_BINARY,
-	   "| ssh $option_ssh_opt $option_remote_host 'cat > $backup_dir/$xtrabackup_binary_file'")
-	|| die "Failed to open file '$option_remote_host:$backup_dir/$xtrabackup_binary_file': $!";
-    } elsif ($option_stream) {
+    if ($option_stream) {
       open XTRABACKUP_BINARY, "> $option_tmpdir/$xtrabackup_binary_file"
     	|| die "Cannot open file $option_tmpdir/$xtrabackup_binary_file: $!\n";
     } else {
@@ -389,9 +382,7 @@
     start_ibbackup();
 
     # wait for ibbackup to suspend itself
-    if (!$option_remote_host) {
-        wait_for_ibbackup_suspend();
-    }
+    wait_for_ibbackup_suspend();
 
     # connect to database
     mysql_open();
@@ -434,11 +425,7 @@
 
     # copy ib_lru_dump
     if (-e "$orig_datadir/ib_lru_dump") {
-        if ($option_remote_host) {
-            print STDERR "$prefix Backing up file 'ib_lru_dump'\n";
-            system("scp $option_scp_opt '$orig_datadir/ib_lru_dump' '$option_remote_host:$backup_dir/ib_lru_dump'")
-                and Die "Failed to scp file 'ib_lru_dump': $!";
-        } elsif ($option_stream) {
+	if ($option_stream) {
             print STDERR "$prefix Backing up as tar stream 'ib_lru_dump'\n";
             system("cd $orig_datadir; tar chf - ib_lru_dump")
                 and Die "Failed to stream 'ib_lru_dump': $!";
@@ -450,16 +437,6 @@
         }
     }
 
-    if ($option_remote_host) {
-        system("scp $option_scp_opt '$tmp_logfile' '$option_remote_host:$backup_dir/xtrabackup_logfile'")
-            and Die "Failed to scp file '$option_remote_host:$backup_dir/xtrabackup_logfile': $!";
-        unlink $tmp_logfile || Die "Failed to delete '$tmp_logfile': $!";
-
-        system("scp $option_scp_opt '$option_tmpdir/xtrabackup_checkpoints' '$option_remote_host:$backup_dir/xtrabackup_checkpoints'")
-            and Die "Failed to scp file '$option_remote_host:$backup_dir/xtrabackup_checkpoints': $!";
-        unlink "$option_tmpdir/xtrabackup_checkpoints" || Die "Failed to delete '$option_tmpdir/xtrabackup_checkpoints': $!";
-    }
-
     print STDERR "\n$prefix Backup created in directory '$backup_dir'\n";
     if ($mysql_binlog_position) {
         print STDERR "$prefix MySQL binlog position: $mysql_binlog_position\n";
@@ -864,14 +841,11 @@
 
     $options = $options . "--backup --suspend-at-end";
 
-    if (!$option_remote_host && !$option_stream) {
+    if (!$option_stream) {
         $options = $options . " --target-dir=$backup_dir";
     } else {
         #(datadir) for 'xtrabackup_suspended' and 'xtrabackup_checkpoints'
         $options = $options . " --target-dir=" . $option_tmpdir;
-	if ($option_remote_host) {
-	  $options = $options . " --log-stream";
-	}
     }
 
     # prepare command line for running ibbackup
@@ -921,97 +895,7 @@
         if ($pid) {
             # parent process
             $ibbackup_pid = $pid;
-
-            if($option_remote_host) {
-                #direct copy to remote
-                my $orig_datadir = get_option(\%config, 'mysqld', 'datadir');
-                my $orig_ibdata_dir =
-                    get_option(\%config, 'mysqld', 'innodb_data_home_dir');
-                my $orig_innodb_data_file_path =
-                    get_option(\%config, 'mysqld', 'innodb_data_file_path');
-                my $innodb_flush_method = 
-                    get_option(\%config, 'mysqld', 'innodb_flush_method');
-                my $innodb_use_odirect;
-                $innodb_use_odirect = 1 if $innodb_flush_method =~ m/^(ALL_)?O_DIRECT$/i;
-
-                my $subdir;
-                my @list;
-
-                if (system("ssh $option_ssh_opt $option_remote_host test -e $backup_dir/ib_logfile0")
-                    == 0) {
-                    print STDERR "$prefix Remove $option_remote_host:$backup_dir/ib_logfile*\n";
-                    system("ssh $option_ssh_opt $option_remote_host rm $backup_dir/ib_logfile\*")
-                        and Die "Failed to rm file '$backup_dir/ib_logfile*': $!";
-                }
-
-                wait_for_ibbackup_suspend();
-
-                #InnoDB data files from original InnoDB data directory
-                print STDERR "\n$prefix Starting to backup InnoDB tables and indexes\n";
-                print STDERR "$prefix to '$backup_dir'\n";
-                print STDERR "$prefix from original InnoDB data directory '$orig_ibdata_dir'\n";
-                foreach my $a (split(/;/, $orig_innodb_data_file_path)) {
-                    my $path = (split(/:/,$a))[0];
-                    $path=~s/([\$\\\" ])/\\$1/g;
-                    print STDERR "$prefix Backing up file '$orig_ibdata_dir/$path'\n";
-                    system("scp $option_scp_opt '$orig_ibdata_dir/$path' '$option_remote_host:$backup_dir/$path'")
-                      and Die "Failed to scp file '$path': $!";
-                }
-
-                #copy *.ibd files
-                opendir(DIR, $orig_datadir)
-                    || Die "Can't open directory '$orig_datadir': $!\n";
-                while (defined($subdir = readdir(DIR))) {
-                    my $print_each_file = 0;
-                    my $file_c;
-                    my $file;
-                    if ($subdir eq '.' || $subdir eq '..') { next; }
-                    next unless -d "$orig_datadir/$subdir";
-                    next unless check_if_required($subdir);
-
-                    @list = glob("$orig_datadir/$subdir/" . '*.ibd');
-
-                    $file_c = @list;
-                    if ($file_c <= $backup_file_print_limit) {
-                        $print_each_file = 1;
-                    } else {
-                        print STDERR "$prefix Backing up files " .
-                            "'$orig_datadir/$subdir/*.ibd' ($file_c files)\n";
-                    }
-                    foreach $file (@list) {
-			next unless check_if_required($subdir, $file);
-                        if($option_include) {
-                            my $table_name;
-
-                            $table_name = substr($file, rindex($file, '/'));
-                            $table_name = substr($table_name, 1, rindex($table_name, '.') - 1);
-                            $table_name = $subdir . "." . $table_name;
-
-                            if (!($table_name =~ /$option_include/)) {
-                                print STDERR "'$file' is skipped.\n";
-                                next;
-                            }
-                        }
-
-                        if ($print_each_file) {
-                            print STDERR "$prefix Backing up file '$file'\n";
-                        }
-                        if (system("ssh $option_ssh_opt $option_remote_host test -e $backup_dir/$subdir")
-                            != 0) {
-                          system("ssh $option_ssh_opt $option_remote_host mkdir $backup_dir/$subdir");
-                        }
-                        system("scp $option_scp_opt '$file' '$option_remote_host:$backup_dir/$subdir/'")
-                          and Die "Failed to scp file '$file': $!";
-		      }
-                }
-                closedir(DIR);
-            }
         } else {
-            if($option_remote_host) {
-                open(STDOUT, "> $tmp_logfile")
-                || Die "Failed to open file '$tmp_logfile': $!"
-            }
-
             # child process
             exec($cmdline) || Die "Failed to exec ibbackup: $!";
         }
@@ -1215,13 +1099,10 @@
     if (!defined $info_lines[1]) {
         $info_lines[1] = "";
     }
-    if (!$option_remote_host) {
-        open(FILE, ">$binlog_info") || 
-            Die "Failed to open file '$binlog_info': $!";
-    } else {
-        open(FILE, "| ssh $option_ssh_opt $option_remote_host 'cat > $binlog_info'") ||
-            Die "Failed to open file '$option_remote_host:$binlog_info': $!";
-    }
+
+    open(FILE, ">$binlog_info") ||
+	Die "Failed to open file '$binlog_info': $!";
+
     print FILE  "$info_lines[1]\n";
     close(FILE);
 
@@ -1312,13 +1193,9 @@
     }
 
     # print slave status to a file
-    if (!$option_remote_host) {
-        open(FILE, ">$slave_info") || 
-            Die "Failed to open file '$slave_info': $!";
-    } else {
-        open(FILE, "| ssh $option_ssh_opt $option_remote_host 'cat > $slave_info'") ||
-            Die "Failed to open file '$option_remote_host:$slave_info': $!";
-    }
+    open(FILE, ">$slave_info") ||
+	Die "Failed to open file '$slave_info': $!";
+
     print FILE  "CHANGE MASTER TO MASTER_LOG_FILE='$filename', MASTER_LOG_POS=$position\n";
     close(FILE);
 
@@ -1590,13 +1467,10 @@
 
     if (!$option_apply_log && !$option_copy_back) {
         # we are making a backup, create a new backup directory
-        if (!$option_remote_host) {
-            $backup_dir = File::Spec->rel2abs(make_backup_dir());
-        } else {
-            $backup_dir = make_backup_dir();
-        }
+	$backup_dir = File::Spec->rel2abs(make_backup_dir());
+
         print STDERR "$prefix Created backup directory $backup_dir\n";
-        if (!$option_remote_host && !$option_stream) {
+        if (!$option_stream) {
         $backup_config_file = $backup_dir . '/backup-my.cnf';
         $suspend_file = $backup_dir . '/xtrabackup_suspended';
         $binlog_info = $backup_dir . '/xtrabackup_binlog_info';
@@ -1645,14 +1519,8 @@
     }
     $innodb_data_file_path = join(";", @array);
 
-    if (!$option_remote_host) {
-        $root = $backup_dir;
-        open(FILE, "> $filename") || Die "Failed to open file '$filename': $!";
-    } else {
-        $root = `ssh $option_ssh_opt $option_remote_host 'cd $backup_dir; pwd'`;
-        open(FILE, "| ssh $option_ssh_opt $option_remote_host 'cat > $filename'")
-            || Die "Failed to open file '$option_remote_host:$filename': $!";
-    }
+    $root = $backup_dir;
+    open(FILE, "> $filename") || Die "Failed to open file '$filename': $!";
 
     my @option_names = (
         "innodb_log_files_in_group",
@@ -1747,14 +1615,11 @@
                         'incremental-lsn=s' => \$option_incremental_lsn,
                         'incremental-dir=s' => \$option_incremental_dir,
                         'extra-lsndir=s' => \$option_extra_lsndir,
-                        'remote-host=s' => \$option_remote_host,
                         'stream=s' => \$option_stream,
 			'rsync' => \$option_rsync,
                         'tmpdir=s' => \$option_tmpdir,
                         'no-lock' => \$option_no_lock,
                         'ibbackup=s' => \$option_ibbackup_binary,
-                        'scpopt=s' => \$option_scp_opt,
-                        'sshopt=s' => \$option_ssh_opt,
                         'force-tar', => \$option_force_tar,
                         'parallel=i' => \$option_parallel,
                         'safe-slave-backup' => \$option_safe_slave_backup,
@@ -1829,8 +1694,8 @@
 	}
     }
 
-    if ($option_rsync && ($option_remote_host || $option_stream)) {
-        print STDERR "--rsync doesn't work with --remote-host or --stream\n";
+    if ($option_rsync && ($option_stream)) {
+        print STDERR "--rsync doesn't work with --stream\n";
 	exit(1);
     }
 
@@ -1858,11 +1723,8 @@
 
     $dir .= '/' . strftime("%Y-%m-%d_%H-%M-%S", localtime())
        unless $option_no_timestamp;
-    if (!$option_remote_host) {
-        mkdir($dir, 0777) || Die "Failed to create backup directory $dir: $!";
-    } else {
-        system("ssh $option_ssh_opt $option_remote_host mkdir $dir");
-    }
+
+    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)) {
@@ -1898,16 +1760,10 @@
     $path = $root;
     foreach $a (@{$relative_path}) {
         $path = $path . "/" . $a;
-        if (!$option_remote_host) {
-            if (! -d $path) {
-                # this directory does not exist, create it !
-                mkdir($path, 0777) || Die "Failed to create backup directory: $!";
-            }
-        } else {
-            if (system("ssh $option_ssh_opt $option_remote_host test -d $path") != 0) {
-                system("ssh $option_ssh_opt $option_remote_host mkdir $path");
-            }
-        }
+	if (! -d $path) {
+	    # this directory does not exist, create it !
+	    mkdir($path, 0777) || Die "Failed to create backup directory: $!";
+	}
     }
 }
 
@@ -1982,23 +1838,17 @@
     while (defined($database = readdir(DIR))) {
         my $print_each_file = 0;
         my $file_c;
-        my @scp_files;
         # skip files that are not database directories
         if ($database eq '.' || $database eq '..') { next; }
         next unless -d "$source_dir/$database";
 	     next unless check_if_required($database);
         
-        if (!$option_remote_host && !$option_stream) {
+        if (!$option_stream) {
             if (! -e "$backup_dir/$database") {
                 # create database directory for the backup
                 mkdir("$backup_dir/$database", 0777)
                     || Die "Couldn't create directory '$backup_dir/$database': $!";
             }
-        } elsif ($option_remote_host) {
-            if (system("ssh $option_ssh_opt $option_remote_host test -e $backup_dir/$database")
-                    != 0) {
-                system("ssh $option_ssh_opt $option_remote_host mkdir $backup_dir/$database");
-            }
         }
 
         # copy files of this database
@@ -2032,15 +1882,12 @@
 		if (!$prep_mode) {
 		    $rsync_files_hash{"$database/$file"} = 1;
 		}
-            } elsif (!$option_remote_host && !$option_stream) {
+            } elsif (!$option_stream) {
                 $src_name = escape_path("$source_dir/$database/$file");
                 $dst_name = escape_path("$backup_dir/$database");
                 # Copy the file - If we get an error and the file actually exists, die with error msg
                 copy_if_exists("$src_name", "$dst_name")
                   or Die "Failed to copy file '$file': $!";
-            } elsif ($option_remote_host) {
-                # Queue up files for one single scp per database.
-                push(@scp_files, "'$file'");
             } elsif($option_stream) {
                 my $ret = 0;
                 my $file_name = substr($file, rindex($file, '/') + 1);
@@ -2061,11 +1908,6 @@
                 }
             }
         }
-        if ($option_remote_host and @scp_files) {
-          my $scp_file_list = join(" ", map { "$source_dir/$database/$_" } @scp_files);
-          system("scp $option_scp_opt $scp_file_list '$option_remote_host:$backup_dir/$database/'")
-              and Die "Failed to execute \"scp $option_scp_opt $scp_file_list '$option_remote_host:$backup_dir/$database/'\": $!";
-        }
     }
     closedir(DIR);
 
@@ -2622,9 +2464,8 @@
              [--password=WORD] [--port=PORT] [--socket=SOCKET]
              [--no-timestamp] [--ibbackup=IBBACKUP-BINARY]
              [--slave-info] [--stream=tar|xbstream] [--force-tar]
-             [--scpopt=OPTIONS-FOR-SCP]  [--sshopt=OPTIONS-FOR-SSH]
              [--defaults-file=MY.CNF]
-             [--databases=LIST] [--remote-host=HOSTNAME] [--no-lock] 
+             [--databases=LIST] [--no-lock]
              [--tmpdir=DIRECTORY] [--tables-file=FILE]
              [--incremental] [--incremental-basedir]
              [--incremental-dir] [--incremental-lsn]
@@ -2770,10 +2611,6 @@
 
 This option is passed directly to xtrabackup's --apply-log-only option. This forces xtrabackup to skip the "rollback" phase and do a "redo" only. This is necessary if the backup will have incremental changes applied to it later. See the xtrabackup documentation for details. 
 
-=item --remote-host=HOSTNAME 
-
-This option specifies the remote host on which the backup files will be created, by using an ssh connection.  The option accepts a string argument.
-
 =item --safe-slave-backup
 
 Stop slave SQL thread and wait to start backup until Slave_open_temp_tables in "SHOW STATUS" is zero. If there are no open temporary tables, the backup will take place, otherwise the SQL thread will be started and stopped until there are no open temporary tables. The backup will fail if Slave_open_temp_tables does not become zero after --safe-slave-backup-timeout seconds. The slave SQL thread will be restarted when the backup finishes.
@@ -2782,14 +2619,6 @@
 
 How many seconds --safe-slave-backup should wait for Slave_open_temp_tables to become zero. (default 300)
 
-=item --scpopt=SCP-OPTIONS
-
-This option specifies the command line options to pass to scp when the option --remost-host is specified.  The option accepts a string argument. If the option is not specified, the default options are "-Cp -c arcfour".
-
-=item --sshopt=SSH-OPTIONS
-
-This option specifies the command line options to pass to ssh when the option --remost-host is specified.  The option accepts a string argument.
-
 =item --slave-info
 
 This option is useful when backing up a replication slave server. It prints the binary log position and name of the master server. It also writes this information to the "xtrabackup_slave_info" file as a "CHANGE MASTER" command. A new slave for this master can be set up by starting a slave server on this backup and issuing a "CHANGE MASTER" command with the binary log position saved in the "xtrabackup_slave_info" file.
@@ -2812,7 +2641,7 @@
 
 =item --tmpdir=DIRECTORY
 
-This option specifies the location where a temporary file will be stored.  The option accepts a string argument. It should be used when --remote-host or --stream is specified. For these options, the transaction log will first be stored to a temporary file, before streaming or copying to a remote host. This option specifies the location where that temporary file will be stored. If the option is not specifed, the default is to use the value of tmpdir read from the server configuration.
+This option specifies the location where a temporary file will be stored.  The option accepts a string argument. It should be used when  --stream is specified. For these options, the transaction log will first be stored to a temporary file, before streaming or copying to a remote host. This option specifies the location where that temporary file will be stored. If the option is not specifed, the default is to use the value of tmpdir read from the server configuration.
 
 =item --use-memory=B