Merge lp:~akopytov/percona-xtrabackup/bug798488 into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

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

[Stewart Smith (stewart)]

On Mon, 20 Jun 2011 14:27:10 -0000, Alexey Kopytov <email address hidden> wrote:
> http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-param/26/

Possibly need to merge trunk?

http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-param/26/Host=ubuntu-lucid-32bit,xtrabackuptarget=innodb51/console

2011-06-20 14:03:18: run.sh: Cannot find 'xtrabackup_51' in PATH

(and should we have this for 1.6.2?)
--
Stewart Smith

[Alexey Kopytov (akopytov)]

Trunk is already merged. innodb51 is broken in trunk as well which is a separate issue. It's just that in trunk we have all individual tests failing, but in this branch the problem is detected by run.sh before running tests.

As for 1.6.2. The problem is not critical for the customer, and an easy workaround exists, so it should rather be Low as discussed on IRC. Will update the bug.

[Stewart Smith (stewart)]

review: Approve

=== modified file 'test/inc/common.sh'
--- test/inc/common.sh	2011-06-15 07:04:42 +0000
+++ test/inc/common.sh	2011-06-20 15:49:26 +0000
@@ -4,12 +4,12 @@
 
 function innobackupex()
 {
-    run_cmd `which innobackupex` $IB_ARGS $*
+    run_cmd $IB_BIN $IB_ARGS $*
 }
 
 function xtrabackup()
 {
-    run_cmd `which $XB_BIN` $XB_ARGS $*
+    run_cmd $XB_BIN $XB_ARGS $*
 }
 
 function vlog
@@ -129,7 +129,24 @@
 function run_cmd()
 {
   vlog "===> $@"
-  "$@" || die "===> `basename $1` failed with exit code $?"
+  "$@"
+  if [ $? -ne 0 ]
+  then
+      die "===> `basename $1` failed with exit code $?"
+  fi
+}
+
+function run_cmd_expect_failure()
+{
+  vlog "===> $@"
+  set +e
+  "$@"
+  local rc=$?
+  set -e
+  if [ $rc -eq 0 ]
+  then
+      die "===> `basename $1` succeeded when it was expected to fail"
+  fi
 }
 
 function stop_mysqld()

=== modified file 'test/run.sh'
--- test/run.sh	2011-06-15 07:04:42 +0000
+++ test/run.sh	2011-06-20 15:49:26 +0000
@@ -94,10 +94,10 @@
 
 function get_version_info()
 {
-    init
+    init >>$OUTFILE 2>&1
     MYSQL_VERSION=""
     INNODB_VERSION=""
-    run_mysqld
+    run_mysqld >>$OUTFILE 2>&1
     # Get MySQL and InnoDB versions
     MYSQL_VERSION=`$MYSQL ${MYSQL_ARGS} -Nsf -e "SHOW VARIABLES LIKE 'version'"`
     MYSQL_VERSION=${MYSQL_VERSION#"version	"}
@@ -105,7 +105,7 @@
     MYSQL_VERSION_COMMENT=${MYSQL_VERSION_COMMENT#"version_comment	"}
     INNODB_VERSION=`$MYSQL ${MYSQL_ARGS} -Nsf -e "SHOW VARIABLES LIKE 'innodb_version'"`
     INNODB_VERSION=${INNODB_VERSION#"innodb_version	"}
-    XTRADB_VERSION=`echo $INNODB_VERSION  | sed 's/[0-9]\.[0-9]\.[0-9][0-9]*\(-[0-9][0-9]*\.[0-9][0-9]*\)*$/\1/'`
+    XTRADB_VERSION="`echo $INNODB_VERSION  | sed 's/[0-9]\.[0-9]\.[0-9][0-9]*\(-[0-9][0-9]*\.[0-9][0-9]*\)*$/\1/'`"
     if [ "${MYSQL_VERSION:0:3}" = "5.1" ]
     then
 	if [ -z "$INNODB_VERSION" ]
@@ -126,11 +126,26 @@
 	vlog "Uknown MySQL/InnoDB version: $MYSQL_VERSION/$INNODB_VERSION"
 	exit -1
     fi
-    vlog "Using '$XB_BIN' as xtrabackup binary"
-    # Set the correct binary for innobackupex
+
+    XB_PATH="`which $XB_BIN`"
+    if [ -z "$XB_PATH" ]
+    then
+	vlog "Cannot find '$XB_BIN' in PATH"
+	return 1
+    fi
+    XB_BIN="$XB_PATH"
+    vlog "Using '$`basename $XB_BIN`' as xtrabackup binary"
+
+    IB_BIN="`which innobackupex`"
+    if [ -z "$IB_BIN" ]
+    then
+	vlog "Cannot find 'innobackupex' in PATH"
+	return 1
+    fi
     IB_ARGS="$IB_ARGS --ibbackup=$XB_BIN"
 
-    export MYSQL_VERSION/ MYSQL_VERSION_COMMENT INNODB_VERSION XTRADB_VERSION XB_BIN
+    export MYSQL_VERSION MYSQL_VERSION_COMMENT INNODB_VERSION XTRADB_VERSION \
+	XB_BIN IB_BIN
 }
 
 tname=""
@@ -163,15 +178,32 @@
 total_count=0
 
 export OUTFILE="$PWD/results/setup"
-get_version_info >$OUTFILE 2>&1
-kill_leftovers >$OUTFILE 2>&1
-clean >$OUTFILE 2>&1
+
+if ! get_version_info
+then
+    echo "get_version_info failed. See $OUTFILE for details."
+    exit -1
+fi
+
+if [ -n "$XTRADB_VERSION" ]
+then
+    echo "Running against Percona Server $MYSQL_VERSION (XtraDB $INNODB_VERSION)"
+else
+    echo "Running against MySQL $MYSQL_VERSION (InnoDB $INNODB_VERSION)"
+fi
+echo "Using '`basename $XB_BIN`' as xtrabackup binary"
+echo
+
+kill_leftovers >>$OUTFILE 2>&1
+clean >>$OUTFILE 2>&1
 
 source subunit.sh
 
 SUBUNIT_OUT=test_results.subunit
 rm -f $SUBUNIT_OUT
 
+echo "========================================================================"
+
 for t in $tests
 do
    printf "%-40s" $t
@@ -212,6 +244,9 @@
    total_count=$((total_count+1))
 done
 
+echo "========================================================================"
+echo
+
 kill_leftovers
 
 if [ $result -eq 1 ]

=== added file 'test/t/xb_defaults_file.sh'
--- test/t/xb_defaults_file.sh	1970-01-01 00:00:00 +0000
+++ test/t/xb_defaults_file.sh	2011-06-20 15:49:26 +0000
@@ -0,0 +1,25 @@
+#
+# Bug #798488: xtrabackup ignores defaults-file in apply-log-only prepare mode 
+#
+# Test xtrabackup fails with an error when --defaults-file is not the first argument
+# on the command line (and thus would be ignored).
+
+. inc/common.sh
+
+init
+run_mysqld
+
+# The following should succeed (can't use xtrabackup directly as it uses
+# --no-defaults)
+run_cmd $XB_BIN --defaults-file=$topdir/my.cnf --backup \
+    --datadir=$mysql_datadir --target-dir=$topdir/backup
+
+rm -rf $topdir/backup
+
+# The following should fail (can't use xtrabackup directly as that would make
+# the test fail)
+
+run_cmd_expect_failure $XB_BIN --backup --defaults-file=$topdir/my.cnf \
+    --datadir=$mysql_datadir --target-dir=$topdir/backup
+
+exit 0

=== modified file 'test/t/xb_stats.sh'
--- test/t/xb_stats.sh	2011-06-10 07:55:26 +0000
+++ test/t/xb_stats.sh	2011-06-20 15:49:26 +0000
@@ -15,11 +15,8 @@
 # when trying to get stats before creating the log files
 
 vlog "===> xtrabackup --stats --datadir=$topdir/backup"
-# Cannot use run_cmd here
-if $XB_BIN $XB_ARGS --stats --datadir=$topdir/backup >$OUTFILE 2>&1
-then
-    die "xtrabackup --stats was expected to fail, but it did not."
-fi
+run_cmd_expect_failure $XB_BIN $XB_ARGS --stats --datadir=$topdir/backup
+
 if ! grep "Cannot find log file ib_logfile0" $OUTFILE
 then
     die "Cannot find the expected error message from xtrabackup --stats"

=== modified file 'xtrabackup.c'
--- xtrabackup.c	2011-06-15 07:04:42 +0000
+++ xtrabackup.c	2011-06-20 15:49:26 +0000
@@ -5935,6 +5935,13 @@
 		uint count;
 		struct my_option *opt= (struct my_option *) my_long_options;
 		optend= strcend((argv)[i], '=');
+		if (!strncmp(argv[i], "--defaults-file", optend - argv[i]))
+		{
+			fprintf(stderr, "xtrabackup: Error: --defaults-file "
+				"must be specified first on the command "
+				"line\n");
+			exit(EXIT_FAILURE);
+		}
 		for (count= 0; opt->name; opt++) {
 			if (!getopt_compare_strings(opt->name, (argv)[i] + 2,
 				(uint)(optend - (argv)[i] - 2))) /* match found */