Merge lp:~gl-az/percona-xtrabackup/BT-32889-history-on-server into lp:percona-xtrabackup/2.1

[George Ormond Lorch III]

BT-32889

Implementation of xtrabackup http://blueprints.launchpad.net/percona-xtrabackup/+spec/history-on-the-server and test case.

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/451/

[Alexey Kopytov (akopytov)]

George, this should go to 2.2 only. I will update blueprints and branches.

Unmerged revisions

676. By George Ormond Lorch III on 2013-09-10

Implementation of xtrabackup http://blueprints.launchpad.net/percona-xtrabackup/+spec/history-on-the-server and test case.

=== modified file 'innobackupex'
--- innobackupex	2013-08-30 09:55:04 +0000
+++ innobackupex	2013-09-10 19:03:04 +0000
@@ -145,6 +145,10 @@
 my %mysql;
 my $option_backup = '';
 
+my $option_history;
+my $option_incremental_history_name = '';
+my $option_incremental_history_uuid = '';
+
 # name of the my.cnf configuration file
 #my $config_file = '';
 
@@ -193,6 +197,9 @@
 # name of the file where slave info is written
 my $slave_info;
 
+# name of the file where version and backup history is written 
+my $backup_history;
+
 # mysql binlog position as given by "SHOW MASTER STATUS" command
 my $mysql_binlog_position = '';
 
@@ -268,6 +275,11 @@
 my $copy_dir_overwrite;
 my $copy_dir_resolve_isl;
 
+# for history on server record
+my $history_start_time = current_time_mysql();
+my $history_lock_time = 0;
+my $history_delete_checkpoints = 0;
+
 ######################################################################
 # program execution begins here
 ######################################################################
@@ -404,6 +416,14 @@
 }
 
 #
+# return current local time as mysql friendly string in form
+# "2013-08-27 17:30:00"
+#
+sub current_time_mysql {
+    return strftime("%Y-%m-%d %H:%M:%S", localtime());
+}
+
+#
 # Global initialization:
 # 1. Override the 'die' builtin to customize the format of error messages
 #
@@ -651,6 +671,37 @@
         detect_mysql_capabilities_for_backup(\%mysql);
     }
 
+    #
+    # if one of the history incrementals is being used, try to grab the
+    # innodb_to_lsn from the history table and set the option_incremental_lsn
+    #
+    if ($option_incremental && !$option_incremental_lsn) {
+        if ($option_incremental_history_name) {
+            my $query = "SELECT innodb_to_lsn ".
+                        "FROM PERCONA_SCHEMA.xtrabackup_history ".
+                        "WHERE name = '$option_incremental_history_name' ".
+                        "AND innodb_to_lsn IS NOT NULL ".
+                        "ORDER BY innodb_to_lsn DESC LIMIT 1";
+
+            eval { 
+                $option_incremental_lsn = 
+                    $mysql{dbh}->selectrow_hashref($query)->{innodb_to_lsn};
+            } || die("Error while attempting to find history record for name ".
+                     "'$option_incremental_history_name'\n");
+        } elsif ($option_incremental_history_uuid) {
+            my $query = "SELECT innodb_to_lsn ".
+                        "FROM PERCONA_SCHEMA.xtrabackup_history ".
+                        "WHERE uuid = '$option_incremental_history_uuid' ".
+                        "AND innodb_to_lsn IS NOT NULL";
+
+            eval { 
+                $option_incremental_lsn = 
+                    $mysql{dbh}->selectrow_hashref($query)->{innodb_to_lsn};
+            } || die("Error while attempting to find history record for uuid ".
+                     "'$option_incremental_history_uuid'\n");
+        }
+    }
+
     # start ibbackup as a child process
     start_ibbackup();
 
@@ -675,6 +726,9 @@
       # make a prep copy before locking tables, if using rsync
       backup_files(1);
 
+      # start counting how long lock is held for history
+      $history_lock_time = time();
+
       # flush tables with read lock
       mysql_lockall(\%mysql);
 
@@ -708,6 +762,13 @@
     # release read locks on all tables
     mysql_unlockall(\%mysql) if !$option_no_lock;
 
+    # calculate how long lock was held for history
+    if ($option_no_lock) {
+      $history_lock_time = 0;
+    } else {
+      $history_lock_time = time() - $history_lock_time;
+    }
+
     my $ibbackup_exit_code = wait_for_ibbackup_finish();
 
     if ( $option_safe_slave_backup && $sql_thread_started) {
@@ -731,6 +792,8 @@
         print STDERR "$prefix MySQL slave binlog position: $mysql_slave_position\n";
     }
 
+    update_history(\%mysql);
+
     return $ibbackup_exit_code;
 }
 
@@ -2242,8 +2305,14 @@
         $binlog_info = $work_dir . '/xtrabackup_binlog_info';
         $galera_info = $work_dir . '/xtrabackup_galera_info';
         $slave_info = $work_dir . '/xtrabackup_slave_info';
+        $backup_history = $work_dir . '/xtrabackup_history';
         write_backup_config_file($backup_config_file);
 
+        if (!$option_extra_lsndir && defined($option_history)) {
+            $option_extra_lsndir = $option_tmpdir;
+            $history_delete_checkpoints = 1;
+        }
+
         foreach (@xb_suspend_files) {
             my $suspend_file = $work_dir . "$_";
             if ( -e "$suspend_file" ) {
@@ -2347,6 +2416,7 @@
                         'encrypt-threads=i' => \$option_encrypt_threads,
                         'encrypt-chunk-size=s' => \$option_encrypt_chunk_size,
                         'help' => \$option_help,
+                        'history:s' => \$option_history,
                         'version' => \$option_version,
                         'throttle=i' => \$option_throttle,
                         'log-copy-interval=i', \$option_log_copy_interval,
@@ -2374,6 +2444,8 @@
                         'incremental' => \$option_incremental,
                         'incremental-basedir=s' => \$option_incremental_basedir,
                         'incremental-force-scan' => \$option_incremental_force_scan,
+                        'incremental-history-name=s' => \$option_incremental_history_name,
+                        'incremental-history-uuid=s' => \$option_incremental_history_uuid,
                         'incremental-lsn=s' => \$option_incremental_lsn,
                         'incremental-dir=s' => \$option_incremental_dir,
                         'extra-lsndir=s' => \$option_extra_lsndir,
@@ -2481,7 +2553,9 @@
         # we are making a backup, get backup root directory
         $option_backup = "1";
         $backup_root = $ARGV[0];
-        if ($option_incremental && !$option_incremental_lsn) {
+        if ($option_incremental && !$option_incremental_lsn &&
+            !$option_incremental_history_name &&
+            !$option_incremental_history_uuid) {
             if ($option_incremental_basedir) {
                 $incremental_basedir = $option_incremental_basedir;
             } else {
@@ -3448,6 +3522,267 @@
                     'WHERE PLUGIN_NAME LIKE "INNODB_CHANGED_PAGES"')
 }
 
+#
+# scrubs (replaces with ...) the value for the specified option
+# Example:
+#   scrub_option("--user=fred --password=mypassword", "--password")
+#   returns "--user=fred --password=..."
+#
+sub scrub_option {
+  my $scrub = shift;
+  my $command = shift;
+  $scrub = "--$scrub=";
+
+  my $pos = index($command, $scrub, 0);
+  if ($pos >= 0) {
+    substr($command, $pos, index($command, " ", $pos) - $pos, "$scrub...");
+  }
+  return $command;
+}
+
+#
+# Creates PERCONA_SCHEMA.xtrabackup_history and Writes a new history 
+# record to the table containg all the history info particular to the
+# just completed backup.
+#
+sub update_history {
+  my $con = shift;
+  my $tmp;
+  my $uuid;
+  my $insert_vals = '';
+  my $insert_query = '';
+  my $file_content = '';
+
+  if (!defined($option_history)) {
+    return;
+  }
+
+  mysql_query($con, "CREATE DATABASE IF NOT EXISTS PERCONA_SCHEMA");
+  mysql_query($con, "CREATE TABLE IF NOT EXISTS PERCONA_SCHEMA.xtrabackup_history(".
+                    "uuid VARCHAR(40) NOT NULL PRIMARY KEY,".
+                    "name VARCHAR(255) DEFAULT NULL,".
+                    "tool_name VARCHAR(255) DEFAULT NULL,".
+                    "tool_command TEXT DEFAULT NULL,".
+                    "tool_version VARCHAR(255) DEFAULT NULL,".
+                    "ibbackup_version VARCHAR(255) DEFAULT NULL,".
+                    "mysql_version VARCHAR(255) DEFAULT NULL,".
+                    "start_time TIMESTAMP NULL DEFAULT NULL,".
+                    "end_time TIMESTAMP NULL DEFAULT NULL,".
+                    "lock_time BIGINT UNSIGNED DEFAULT NULL,".
+                    "binlog_pos VARCHAR(128) DEFAULT NULL,".
+                    "innodb_from_lsn BIGINT UNSIGNED DEFAULT NULL,".
+                    "innodb_to_lsn BIGINT UNSIGNED DEFAULT NULL,".
+                    "partial ENUM('Y', 'N') DEFAULT NULL,".
+                    "incremental ENUM('Y', 'N') DEFAULT NULL,".
+                    "format ENUM('file', 'tar', 'xbstream') DEFAULT NULL,".
+                    "compact ENUM('Y', 'N') DEFAULT NULL,".
+                    "compressed ENUM('Y', 'N') DEFAULT NULL,".
+                    "encrypted ENUM('Y', 'N') DEFAULT NULL".
+                    ") ENGINE=innodb");
+
+  # uuid
+  # we use the mysql UUID() function to avoid platform dependencies with uuidgen
+  # and Data::UUID. We select uuid here individually here so that it can be 
+  # reported to stderr after successful history record insertion
+  $tmp = "SELECT UUID() AS uuid";
+  eval {
+    $uuid = $mysql{dbh}->selectrow_hashref($tmp)->{uuid};
+  } || die("Error while attempting to create UUID for history record.\n");
+  $insert_vals = "'$uuid'";
+  $file_content = "uuid = $uuid";
+
+  # name
+  if ($option_history) {
+    $insert_vals .= ", '$option_history'";
+    $file_content .= "\nname = $option_history";
+  } else {
+    $insert_vals .= ", NULL";
+    $file_content .= "\nname = ";
+  }
+
+  # tool_name
+  $tmp = basename($0);
+  $insert_vals .= ", '$tmp'";
+  $file_content .= "\ntool_name = $tmp";
+
+  # tool_command
+  # there is probably a better way to do this but at this point ARGV has been
+  # consumed/shifted and I don't think that trying to recompose the command
+  # line from all of the $option_* variables is a great idea, besides, the
+  # purpose of this particular field is mainly for debugging so giving a very
+  # accurate/uninterpreted representation is highly desirable.
+  $tmp = sprintf("cat /proc/%d/cmdline", $$);
+  $tmp = qx($tmp);
+  system("cp /proc/$$/cmdline /tmp");
+  $tmp =~ s/\0/ /g; # transform embedded nulls between args to spaces
+
+  # scrub --password, --encrypt, --encrypt-key, and --encrypt-key-file 
+  # from tool_command
+  $tmp = scrub_option("password", $tmp);
+  $tmp = scrub_option("encrypt", $tmp);
+  $tmp = scrub_option("encrypt-key", $tmp);
+  $tmp = scrub_option("encrypt-key-file", $tmp);
+  $insert_vals .= ",'$tmp'";
+  $file_content .="\ntool_command = $tmp";
+
+  # tool_version
+  $insert_vals .= ", '$innobackup_version'";
+  $file_content .= "\ntool_version = $innobackup_version";
+
+  # ibbackup_version
+  $tmp = "$option_ibbackup_binary -v 2>&1";
+  $tmp = qx($tmp);
+  chomp($tmp);
+  $insert_vals .= ", '$tmp'";
+  $file_content .= "\nibbackup_version = $tmp";
+
+  # mysql_version
+  $tmp =
+    $con->{dbh}->selectrow_hashref("SELECT VERSION() as version")->{version};
+  $insert_vals .= ", '$tmp'";
+  $file_content .= "\nmysql_version = $tmp";
+
+  # start_time
+  $insert_vals .= ", '$history_start_time'";
+  $file_content .= "\nstart_time = $history_start_time"; 
+
+  # end_time
+  $tmp = current_time_mysql();
+  $insert_vals .= ", '$tmp'";
+  $file_content .= "\nend_time = $tmp";
+
+  # lock_time
+  $insert_vals .= ", $history_lock_time";
+  $file_content .= "\nlock_time = $history_lock_time";
+
+  # binlog_pos
+  if ($mysql_binlog_position) {
+    $tmp =$mysql_binlog_position;
+    $tmp =~ s/'/\\'/g; # escape single quotes
+    $insert_vals .= ", '$tmp'";
+    $file_content .= "\nbinlog_pos = $mysql_binlog_position";
+  } else {
+    $insert_vals .= ", NULL";
+    $file_content .= "\nbinlog_pos = ";
+  }
+
+  # innodb_from_lsn
+  # grab the from_lsn from the extra checkpoints file, parse and delete it
+  # if necessary. This could generate an error if the checkpoints file
+  # isn't 100% correct in the format.
+  $tmp = "cat $option_extra_lsndir/xtrabackup_checkpoints | grep from_lsn";
+  $tmp = qx($tmp);
+  chomp($tmp);
+  substr($tmp, 0, 11, ""); # strip "from_lsn = "
+  if (length $tmp) {
+    $insert_vals .= ", $tmp";
+    $file_content .= "\ninnodb_from_lsn = $tmp";
+  } else {
+    print STDERR "WARNING : Unable to obtain from_lsn from " .
+                 "$option_extra_lsndir/xtrabackup_checkpoints, " .
+                 "writing NULL to history record.\n";
+    $insert_vals .= ", NULL";
+    $file_content .= "\ninnodb_from_lsn = ";
+  }
+
+  # innodb_to_lsn
+  # grab the to_lsn from the extra checkpoints file, parse and delete it
+  # if necessary. This could generate an error if the checkpoints file
+  # isn't 100% correct in the format.
+  $tmp = "cat $option_extra_lsndir/xtrabackup_checkpoints | grep to_lsn";
+  $tmp = qx($tmp);
+  chomp($tmp);
+  substr($tmp, 0, 9, ""); # strip "to_lsn = "
+  if (length $tmp) {
+    $insert_vals .= ", $tmp";
+    $file_content .= "\ninnodb_to_lsn = $tmp";
+  } else {
+    print STDERR "WARNING : Unable to obtain to_lsn from " .
+                 "$option_extra_lsndir/xtrabackup_checkpoints, " .
+                 "writing NULL to history record.\n";
+    $insert_vals .= ", NULL";
+    $file_content .= "\ninnodb_to_lsn = ";
+  }
+
+  # we're finished with the checkpoints file, delete it if it was a temp
+  # only for the history
+  if ($history_delete_checkpoints > 0) {
+    system("rm -f $option_extra_lsndir/xtrabackup_checkpoints");
+  }
+
+  # partial (Y | N)
+  if ($option_include || $option_databases || $option_tables_file || $option_export) {
+    $insert_vals .= ", 'Y'";
+    $file_content .= "\npartial = Y";
+  } else {
+    $insert_vals .= ", 'N'";
+    $file_content .= "\npartial = N";
+  }
+
+  # incremental (Y | N)
+  if ($option_incremental) {
+    $insert_vals .= ", 'Y'";
+    $file_content .= "\nincremental = Y";
+  } else {
+    $insert_vals .= ", 'N'";
+    $file_content .= "\nincremental = N";
+  }
+
+  # format (file | tar | xbsream)
+  if ($option_stream eq 'tar') {
+    $insert_vals .= ", 'tar'";
+    $file_content .= "\nformat = tar";
+  } elsif ($option_stream eq 'xbstream') {
+    $insert_vals .= ", 'xbstream'";
+    $file_content .= "\nformat = xbstream";
+  } else {
+    $insert_vals .= ", 'file'";
+    $file_content .= "\nformat = file";
+  }
+
+  # compact (Y | N)
+  if ($option_compact) {
+    $insert_vals .= ", 'Y'";
+    $file_content .= "\ncompact = Y";
+  } else {
+    $insert_vals .= ", 'N'";
+    $file_content .= "\ncompact = N";
+  }
+
+  # compressed (Y | N)
+  if ($option_compress) {
+    $insert_vals .= ", 'Y'";
+    $file_content .= "\ncompressed = Y";
+  } else {
+    $insert_vals .= ", 'N'";
+    $file_content .= "\ncompressed = N";
+  }
+
+  # encrypted (Y | N)
+  if ($option_encrypt) {
+    $insert_vals .= ", 'Y'";
+    $file_content .= "\nencrypted = Y";
+  } else {
+    $insert_vals .= ", 'N'";
+    $file_content .= "\nencrypted = N";
+  }
+
+  # build and execute the query
+  $insert_query = "INSERT INTO PERCONA_SCHEMA.xtrabackup_history(".
+                  "uuid, name, tool_name, tool_command, tool_version, ".
+                  "ibbackup_version, mysql_version, start_time, end_time, ".
+                  "lock_time, binlog_pos, innodb_from_lsn, innodb_to_lsn, ".
+                  "partial, incremental, format, compact, compressed, ".
+                  "encrypted) VALUES($insert_vals)";
+  
+  mysql_query($con, $insert_query);
+
+  print STDERR "$prefix Backup history record uuid $uuid successfully written\n";
+
+  # create the backup history file
+  write_to_backup_file("$backup_history", "$file_content");
+}
+
 =pod
 
 =head1 NAME
@@ -3466,8 +3801,10 @@
              [--defaults-file=MY.CNF] [--defaults-group=GROUP-NAME]
              [--databases=LIST] [--no-lock] 
              [--tmpdir=DIRECTORY] [--tables-file=FILE]
+             [--no-history] [--history-name=NAME]
              [--incremental] [--incremental-basedir]
              [--incremental-dir] [--incremental-force-scan] [--incremental-lsn]
+             [--incremental-history-name=NAME] [--incremental-history-uuid=UUID]
              [--compact]     
              BACKUP-ROOT-DIR
 
@@ -3637,6 +3974,14 @@
 
 This option displays a help screen and exits.
 
+=item --history-name
+
+This option specifies a backup name that will be placed within the history record.
+
+=item --no-history
+
+This option disables the creation of a backup history record and file.
+
 =item --host=HOST
 
 This option specifies the host to use when connecting to the database server with TCP/IP.  The option accepts a string argument. It is passed to the mysql child process without alteration. See mysql --help for details.
@@ -3661,6 +4006,14 @@
 
 This option specifies the directory where the incremental backup will be combined with the full backup to make a new full backup.  The option accepts a string argument. It is used with the --incremental option.
 
+=item --incremental-history-name=NAME
+
+This option specifies the name of the backup series stored in the PERCONA_SCHEMA.xtrabackup_history history record to base an incremental backup on. Xtrabackup will search the history table looking for the most recent (highest innodb_to_lsn), successful backup in the series and take the to_lsn value to use as the starting lsn for the incremental backup. This will be mutually exclusive with --incremental-history-uuid, --incremental-basedir and --incremental-lsn. If no valid lsn can be found (no series by that name, no successful backups by that name) xtrabackup will return with an error. It is used with the --incremental option.
+
+=item --incremental-history-uuid=UUID
+
+This option specifies the UUID of the specific history record stored in the PERCONA_SCHEMA.xtrabackup_history to base an incremental backup on. --incremental-history-name, --incremental-basedir and --incremental-lsn. If no valid lsn can be found (no success record with that uuid) xtrabackup will return with an error. It is used with the --incremental option.
+
 =item --incremental-force-scan
 
 This options tells xtrabackup to perform full scan of data files for taking an incremental backup even if full changed page bitmap data is available to enable the backup without the full scan.

=== added file 'test/t/history_on_server.sh'
--- test/t/history_on_server.sh	1970-01-01 00:00:00 +0000
+++ test/t/history_on_server.sh	2013-09-10 19:03:04 +0000
@@ -0,0 +1,199 @@
+###############################################################################
+# Test history-on-server feature
+###############################################################################
+
+. inc/common.sh
+
+
+###############################################################################
+# Gets a single column value from the last history record added
+function get_one_value()
+{
+    local column=$1
+    shift
+    val=`${MYSQL} ${MYSQL_ARGS} -Ns -e "SELECT $column FROM PERCONA_SCHEMA.xtrabackup_history ORDER BY start_time DESC LIMIT 1"`
+}
+
+###############################################################################
+# Checks a single column from the last history record added for some value and
+# not NULL.
+function check_for_not_NULL()
+{
+    local column=$1
+    shift
+    get_one_value "$column"
+    if [ -z "$val" ] || [ "$val" = "NULL" ];
+    then
+        vlog "Error: $column in history record invalid, expected NULL"
+        exit 1
+    fi
+}
+
+
+###############################################################################
+# Checks a single column from the last history record added to see if is a
+# specific value.
+function check_for_value()
+{
+    local column=$1
+    shift
+    get_one_value "$column"
+    if [ -z "$val" ] || [ "$val" != "$@" ];
+    then
+        vlog "Error: $column in history record invalid, expected $@"
+        exit 1
+    fi
+}
+
+
+###############################################################################
+vlog "Prepping server"
+start_server
+load_dbase_schema incremental_sample
+multi_row_insert incremental_sample.test \({1..100},100\)
+backup_dir=$topdir/backups
+mkdir $backup_dir
+
+
+###############################################################################
+# This tests the to make sure that no xtrabackup_history unless --history is
+# specified
+vlog "Testing no --history"
+innobackupex --stream=tar $backup_dir > /dev/null
+
+run_cmd_expect_failure get_one_value "uuid"
+
+
+###############################################################################
+# This tests the basic creation of a history record and that fields are
+# populated with some data. It also tests specifically that
+# partial, incremental, compact, compressed, encrypted and format are exactly
+# the correct values after the backup.
+# Missing is a test that binlog_pos is NULL, that would require restarting the
+# server without the log-bin option in the .cnf file but that has been tested
+# manually and doesn't seem to be something that would be required to be
+# validated.
+vlog "Testing basic history record"
+innobackupex --history=test1 --stream=tar $backup_dir > /dev/null
+
+for column in uuid name tool_name tool_command tool_version ibbackup_version \
+mysql_version start_time end_time lock_time binlog_pos innodb_from_lsn \
+innodb_to_lsn
+do
+    check_for_not_NULL "$column"
+done
+
+for column in partial incremental compact compressed encrypted
+do
+    check_for_value "$column" "N"
+done
+
+check_for_value "format" "tar"
+
+# saving for later
+get_one_value "innodb_to_lsn"
+first_to_lsn=$val
+
+
+###############################################################################
+# This tests the taking of an incremental backup based on the last record
+# of a history series and validates that the lsns in the record are correct.
+# It also tests that format, incremental and compact are exactly the correct
+# values after the backup.
+vlog "Testing incremental based on history name"
+
+multi_row_insert incremental_sample.test \({101..200},100\)
+
+innobackupex --history=test1 --incremental \
+--incremental-history-name=test1 --compact $backup_dir > /dev/null
+
+# saving for later
+get_one_value "uuid"
+second_uuid=$val
+get_one_value "innodb_from_lsn"
+second_from_lsn=$val
+get_one_value "innodb_to_lsn"
+second_to_lsn=$val
+
+check_for_value "format" "file"
+check_for_value "incremental" "Y"
+check_for_value "compact" "Y"
+
+if [ -z "$second_from_lsn" ] || [ "$second_from_lsn" != "$first_to_lsn" ]
+then
+    vlog "Second backup was not properly based on the to_lsn of the first"
+    exit 1
+fi
+
+multi_row_insert incremental_sample.test \({201..300},100\)
+
+# This will be a backup based on the last incremental just done, so, its
+# innodb_from_lsn (third_from_lsn) should be the same as the value in 
+# second_to_lsn. This tests that we find the right record in the test1 series
+# out of the two records that should be present before the backup is done.
+innobackupex --history=test1 --incremental \
+--incremental-history-name=test1 $backup_dir > /dev/null
+
+# saving for later
+get_one_value "uuid"
+third_uuid=$val
+get_one_value "innodb_from_lsn"
+third_from_lsn=$val
+get_one_value "innodb_to_lsn"
+third_to_lsn=$val
+
+if [ -z "$third_from_lsn" ] || [ "$third_from_lsn" != "$second_to_lsn" ]
+then
+    vlog "Third backup was not properly based on the to_lsn of the second"
+    exit 1
+fi
+
+
+###############################################################################
+# This tests that we can base an incremental on a specific history record
+# identified by its uuid that we captured earlier from a history record or it
+# could be scraped from the output of innobackupex at some point in the past.
+# It also tests specifically that incremental, compressed, encrypted and format
+# are exactly the correct values after the backup.
+# It tests that --history can be specified, resulting in a history record with
+# no name
+vlog "Testing incremental based on history uuid"
+multi_row_insert incremental_sample.test \({301..400},100\)
+
+innobackupex --history --incremental --incremental-history-uuid=$third_uuid \
+--stream=xbstream --compress --encrypt=AES256 \
+--encrypt-key=percona_xtrabackup_is_awesome___ $backup_dir > /dev/null
+
+get_one_value "innodb_from_lsn"
+fourth_from_lsn=$val
+
+for column in incremental compressed encrypted
+do
+    check_for_value "$column" "Y"
+done
+
+check_for_value "format" "xbstream"
+check_for_value "name" "NULL"
+
+if [ -z "$fourth_from_lsn" ] || [ "$fourth_from_lsn" != "$third_to_lsn" ]
+then
+    vlog "Fourth backup was not properly based on the to_lsn of the third"
+    exit 1
+fi
+
+
+###############################################################################
+# This tests that innobackupex fails when an invalid --incremental-history-name
+# is given.
+vlog "Testing bad --incremental-history-name"
+run_cmd_expect_failure $IB_BIN $IB_ARGS --incremental \
+--incremental-history-name=foo --stream=tar $backup_dir > /dev/null
+
+
+
+###############################################################################
+# This tests that innobackupex fails when an invalid --incremental-history-uuid
+# is given.
+vlog "Testing bad --incremental-history-uuid"
+run_cmd_expect_failure $IB_BIN $IB_ARGS --incremental \
+--incremental-history-uuid=foo --stream=tar $backup_dir > /dev/null