Merge lp:~igor-tverdovskiy/percona-xtrabackup/ssh_opt into lp:percona-xtrabackup/2.0

[Igor Tverdovskiy]

1)
Added new option --sshopt.

Allows you to specify options which directly transfer to ssh.

For example:
sudo innobackupex --no-timestamp --sshopt="-i /home/porta-one/.ssh/id_dsa" --remote-host="user@192.168.193.112" /var/tmp/backup --tmpdir=/var/tmp/backup --scpopt="-i /home/porta-one/.ssh/id_dsa"

Thus innobackupex won't ask you the password to remote host.

2)Fixed typo. --remost-host => --remote-host

[Alexey Kopytov (akopytov)]

Igor,

Thank you for the contribution. The change itself looks good, but we now have XtraBackup docs stored in the source tree, so it would be great to have them updated along with introducing a new option. Take a look at the .rst files in doc/source/innobackupex.

review: Needs Fixing

[Igor Tverdovskiy (igor-tverdovskiy)]

Hi Alexey,

ok, I'll check this.

[Igor Tverdovskiy (igor-tverdovskiy)]

Dear Alexey,

As I can see my modifications have been already added.
http://bazaar.launchpad.net/~percona-core/percona-xtrabackup/release-1.6/revision/317

So I'm changing status to merged.

=== modified file 'innobackupex'
--- innobackupex	2011-10-21 17:47:31 +0000
+++ innobackupex	2011-11-14 04:42:23 +0000
@@ -99,6 +99,7 @@
 my $option_tar4ibd = '';
 my $option_force_tar = '';
 my $option_scp_opt = '-Cp -c arcfour';
+my $option_ssh_opt = '';
 
 my $option_parallel = '';
 
@@ -268,7 +269,7 @@
     $ibbackup_exit_code = backup();
     if ($option_remote_host) {
       open(XTRABACKUP_BINARY,
-	   "| ssh $option_remote_host 'cat > $backup_dir/$xtrabackup_binary_file'")
+	   "| 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) {
       open XTRABACKUP_BINARY, "> $option_tmpdir/$xtrabackup_binary_file"
@@ -821,10 +822,10 @@
                 my @list;
 
                 if($option_remote_host) {
-                    if (system("ssh $option_remote_host test -e $backup_dir/ib_logfile0")
+                    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_remote_host rm $backup_dir/ib_logfile\*")
+                        system("ssh $option_ssh_opt $option_remote_host rm $backup_dir/ib_logfile\*")
                             and Die "Failed to rm file '$backup_dir/ib_logfile*': $!";
                     }
                 }
@@ -911,9 +912,9 @@
                             print STDERR "$prefix Backing up file '$file'\n";
                         }
                         if($option_remote_host) {
-                            if (system("ssh $option_remote_host test -e $backup_dir/$subdir")
+                            if (system("ssh $option_ssh_opt $option_remote_host test -e $backup_dir/$subdir")
                                     != 0) {
-                                system("ssh $option_remote_host mkdir $backup_dir/$subdir");
+                                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': $!";
@@ -1129,7 +1130,7 @@
         open(FILE, ">$binlog_info") || 
             Die "Failed to open file '$binlog_info': $!";
     } else {
-        open(FILE, "| ssh $option_remote_host 'cat > $binlog_info'") ||
+        open(FILE, "| ssh $option_ssh_opt $option_remote_host 'cat > $binlog_info'") ||
             Die "Failed to open file '$option_remote_host:$binlog_info': $!";
     }
     print FILE  "$info_lines[1]\n";
@@ -1182,7 +1183,7 @@
         open(FILE, ">$slave_info") || 
             Die "Failed to open file '$slave_info': $!";
     } else {
-        open(FILE, "| ssh $option_remote_host 'cat > $slave_info'") ||
+        open(FILE, "| ssh $option_ssh_opt $option_remote_host 'cat > $slave_info'") ||
             Die "Failed to open file '$option_remote_host:$slave_info': $!";
     }
     print FILE  "CHANGE MASTER TO MASTER_LOG_FILE='$filename', MASTER_LOG_POS=$position\n";
@@ -1519,8 +1520,8 @@
         $root = $backup_dir;
         open(FILE, "> $filename") || Die "Failed to open file '$filename': $!";
     } else {
-        $root = `ssh $option_remote_host 'cd $backup_dir; pwd'`;
-        open(FILE, "| ssh $option_remote_host 'cat > $filename'")
+        $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': $!";
     }
 
@@ -1608,6 +1609,7 @@
                         '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,
@@ -1727,7 +1729,7 @@
     if (!$option_remote_host) {
         mkdir($dir, 0777) || Die "Failed to create backup directory $dir: $!";
     } else {
-        system("ssh $option_remote_host mkdir $dir");
+        system("ssh $option_ssh_opt $option_remote_host mkdir $dir");
     }
 
     # create subdirectories for ibdata files if needed
@@ -1770,8 +1772,8 @@
                 mkdir($path, 0777) || Die "Failed to create backup directory: $!";
             }
         } else {
-            if (system("ssh $option_remote_host test -d $path") != 0) {
-                system("ssh $option_remote_host mkdir $path");
+            if (system("ssh $option_ssh_opt $option_remote_host test -d $path") != 0) {
+                system("ssh $option_ssh_opt $option_remote_host mkdir $path");
             }
         }
     }
@@ -1834,9 +1836,9 @@
                     || Die "Couldn't create directory '$backup_dir/$database': $!";
             }
         } elsif ($option_remote_host) {
-            if (system("ssh $option_remote_host test -e $backup_dir/$database")
+            if (system("ssh $option_ssh_opt $option_remote_host test -e $backup_dir/$database")
                     != 0) {
-                system("ssh $option_remote_host mkdir $backup_dir/$database");
+                system("ssh $option_ssh_opt $option_remote_host mkdir $backup_dir/$database");
             }
         }
 
@@ -2527,7 +2529,11 @@
 
 =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".
+This option specifies the command line options to pass to scp when the option --remote-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 (e.g. "-i $path_to_id_dsa_key" in order to avoid password request).  The option accepts a string argument. There are no options specified by default.
 
 =item --slave-info