Merge lp:~gl-az/percona-xtrabackup/2.1-valgrind into lp:percona-xtrabackup/2.1

[George Ormond Lorch III]

Added new environment variables to control build:
  MAKE_ONLY - Set this to 1 to only re 'make' the server and xtrabackup. Nothing will be downloaded, unpacked or patched. This is not advised if any compiler or other flags are being changed from previous builds.
  RELWITHDEBINFO - Set this to 1 to eliminate optimizations by changing C/CXXFLAGS to -g -O0 and pass CMAKE_BUILD_TYPE=RelWithDebInfo to PS or MySQL 5.5+ cmake.
  WITH_VALGRIND - Set this to 1 to perform Valgrind compatible build. Eliminates optimizations just like RELWITHDEBINFO and also passes WITH_VALGRIND=ON to PS or MySQL 5.5+ cmake.
Added innobackupex option --use-valgrind which will prefix backup and apply-log calls to xtrabackup with "valgrind".
The valgrind binary must be within path and valgrind options may be set by either using the ~/.valgrindrc file or setting the environment variable VALGRIND_OPTS.

----

Rebased to trunk and fixed typo.

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

[Stewart Smith (stewart)]

This will probably conflict with https://code.launchpad.net/~stewart/percona-xtrabackup/source-dist-refactor/+merge/167709 as I've moved things about a bit with regards to downloading/unpacking things and it may have the same end result as MAKE_ONLY

[Alexey Kopytov (akopytov)]

This needs a bug/BP and rebasing on trunk (as source-dist-refactor has been merged to 2.1).

review: Needs Fixing

[George Ormond Lorch III (gl-az)]

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

[Alexey Kopytov (akopytov)]

Hm, the comments mention the new --use-valgrind option in innobackupex, but I don't see it in the code?

Which is good, because I would prefer this to be implemented in a different way. Instead of adding a new option to innobackupex we can modify the test suite to pass:

--ibbackup="valgrind xtrabackup*"

to innobackupex. And likewise, call "valgrind xtrabackup*", if the xtrabackup binary is called directly by tests.

This is a bit tricky to implement due to Bash word splitting. But the following proof-of-concept patch works for me:

=== modified file 'test/inc/common.sh'
--- test/inc/common.sh 2013-07-25 15:04:49 +0000
+++ test/inc/common.sh 2013-07-27 10:17:31 +0000
@@ -2,7 +2,7 @@ set -eu

 function innobackupex()
 {
- run_cmd $IB_BIN $IB_ARGS $*
+ run_cmd $IB_BIN "${IB_ARGS[@]}" $*
 }

 function xtrabackup()
@@ -239,7 +239,7 @@ function switch_server()
  MYSQLD_ARGS="$MYSQLD_ARGS --user=root"
     fi

- IB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf --ibbackup=$XB_BIN"
+ IB_ARGS=("--defaults-file=$MYSQLD_VARDIR/my.cnf" "--ibbackup=$XB_BIN")
     XB_ARGS="--defaults-file=$MYSQLD_VARDIR/my.cnf"

     # Some aliases for compatibility, as tests use the following names

=== modified file 'test/run.sh'
--- test/run.sh 2013-07-25 15:04:49 +0000
+++ test/run.sh 2013-07-27 10:17:40 +0000
@@ -435,7 +435,7 @@ function get_version_info()
  vlog "Cannot find '$XB_BIN' in PATH"
  return 1
     fi
- XB_BIN="$XB_PATH"
+ XB_BIN="valgrind $XB_PATH"

     # Set the correct binary for innobackupex
     IB_BIN="`which innobackupex`"

The downside is that IB_ARGS is now an array (this is required to prevent "--ibbackup=valgrind xtrabackup" as 2 different words), so all tests referencing IB_ARGS also have to be modified. But I like it more than another option to innobackupex.

review: Needs Fixing

[Alexey Kopytov (akopytov)]

Having a Blueprint for this work would also be nice.

Unmerged revisions

629. By George Ormond Lorch III on 2013-07-12

Added new environment variables to control build:
  MAKE_ONLY - Set this to 1 to only re 'make' the server and xtrabackup. Nothing will be downloaded, unpacked or patched. This is not advised if any compiler or other flags are being changed from previous builds.
  RELWITHDEBINFO - Set this to 1 to eliminate optimizations by changing C/CXXFLAGS to -g -O0 and pass CMAKE_BUILD_TYPE=RelWithDebInfo to PS or MySQL 5.5+ cmake.
  WITH_VALGRIND - Set this to 1 to perform Valgrind compatible build. Eliminates optimizations just like RELWITHDEBINFO and also passes WITH_VALGRIND=ON to PS or MySQL 5.5+ cmake.
Added innobackupex option --use-valgrind which will prefix backup and apply-log calls to xtrabackup with "valgrind".
The valgrind binary must be within path and valgrind options may be set by either using the ~/.valgrindrc file or setting the environment variable VALGRIND_OPTS.

=== modified file 'utils/build.sh'
--- utils/build.sh	2013-06-05 08:39:54 +0000
+++ utils/build.sh	2013-07-12 20:00:37 +0000
@@ -35,8 +35,20 @@
         ;;
 esac
 
+if [ -n "$WITH_VALGRIND" ]
+then
+    export CFLAGS="$CFLAGS -g -O0"
+    export CXXFLAGS="$CXXFLAGS -g -O0"
+    extra_config_51=
+    extra_config_55plus="-DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_VALGRIND=ON"
+elif [ -n "$RELWITHDEBINFO" ]
+then
+    export CFLAGS="$CFLAGS -g -O0"
+    export CXXFLAGS="$CXXFLAGS -g -O0"
+    extra_config_51=
+    extra_config_55plus="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
 # Percona Server 5.5 does not build with -Werror, so ignore DEBUG for now
-if [ -n "$DEBUG" -a "$type" != "xtradb55" -a "$type" != "xtradb51" ]
+elif [ -n "$DEBUG" -a "$type" != "xtradb55" -a "$type" != "xtradb51" ]
 then
     # InnoDB extra debug flags
     innodb_extra_debug="-DUNIV_DEBUG -DUNIV_MEM_DEBUG \
@@ -219,14 +231,17 @@
     server_tarball=mysql-$mysql_version.tar.gz
     innodb_dir=$server_dir/storage/$innodb_name
 
-    echo "Downloading sources"
-    auto_download $server_tarball
-
-    test -d $server_dir && rm -r $server_dir
-
-    echo "Preparing sources"
-    unpack_and_patch $server_tarball $server_patch
-    mv $top_dir/mysql-$mysql_version $server_dir
+    if [ -z "$MAKE_ONLY" ]
+    then
+        echo "Downloading sources"
+        auto_download $server_tarball
+
+        test -d $server_dir && rm -r $server_dir
+
+        echo "Preparing sources"
+        unpack_and_patch $server_tarball $server_patch
+        mv $top_dir/mysql-$mysql_version $server_dir
+    fi
 
     build_server $type
 
@@ -302,35 +317,43 @@
 	fi
 
 
-	echo "Downloading sources"
+	if [ -z "$MAKE_ONLY" ]
+	then
+		echo "Downloading sources"
 	
-	# Get Percona Server
-	if [ -d $branch_dir ]
-	then
-	    rm -rf $branch_dir
-	fi
-
-        if [ ! -f Percona-Server-XtraBackup-$PS_51_VERSION.tar.gz ]
-        then
-	    make ps51source
-	fi
-
-	rm -rf $branch_dir
-	tar xfz Percona-Server-XtraBackup-$PS_51_VERSION.tar.gz
-	cd $branch_dir
-	$MAKE_CMD main
-	cd $top_dir
-	rm -rf $server_dir
-	ln -s $branch_dir/Percona-Server $server_dir
-
-	# Patch Percona Server
-	cd $server_dir
-	patch -p1 < $top_dir/patches/xtradb51.patch
-
-	build_server $type
-
-	build_xtrabackup
-
+		# Get Percona Server
+		if [ -d $branch_dir ]
+		then
+		    rm -rf $branch_dir
+		fi
+
+        	if [ ! -f Percona-Server-XtraBackup-$PS_51_VERSION.tar.gz ]
+	        then
+		    make ps51source
+		fi
+
+		rm -rf $branch_dir
+		tar xfz Percona-Server-XtraBackup-$PS_51_VERSION.tar.gz
+		cd $branch_dir
+		$MAKE_CMD main
+		cd $top_dir
+		rm -rf $server_dir
+		ln -s $branch_dir/Percona-Server $server_dir
+
+		# Patch Percona Server
+		cd $server_dir
+		patch -p1 < $top_dir/patches/xtradb51.patch
+
+		build_server $type
+
+		build_xtrabackup
+	else
+		cd $server_dir
+
+		build_server $type
+
+		build_xtrabackup
+	fi
 	;;
 "xtradb55" )
 	server_dir=$top_dir/Percona-Server-5.5
@@ -350,37 +373,44 @@
 		configure_cmd="LIBS=-lrt $configure_cmd"
 	fi
 
-
-	echo "Downloading sources"
+	if [ -z "$MAKE_ONLY" ]
+	then
+		echo "Downloading sources"
 	
-	# Get Percona Server
-	if [ -d $branch_dir ]
-	then
-	    rm -rf $branch_dir
-	fi
-
-        if [ ! -f Percona-Server-XtraBackup-$PS_55_VERSION.tar.gz ]
-        then
-	    make ps55source
-	fi
-
-	rm -rf $branch_dir
-	tar xfz Percona-Server-XtraBackup-$PS_55_VERSION.tar.gz
-	cd $branch_dir
-
-	$MAKE_CMD PERCONA_SERVER=Percona-Server-5.5 main
-	cd $top_dir
-	rm -rf $server_dir
-	ln -s $branch_dir/Percona-Server $server_dir
-
-	# Patch Percona Server
-	cd $server_dir
-	patch -p1 < $top_dir/patches/xtradb55.patch
-
-	build_server $type
-
-	build_xtrabackup
-
+		# Get Percona Server
+		if [ -d $branch_dir ]
+		then
+		    rm -rf $branch_dir
+		fi
+
+	        if [ ! -f Percona-Server-XtraBackup-$PS_55_VERSION.tar.gz ]
+        	then
+		    make ps55source
+		fi
+
+		rm -rf $branch_dir
+		tar xfz Percona-Server-XtraBackup-$PS_55_VERSION.tar.gz
+		cd $branch_dir
+
+		$MAKE_CMD PERCONA_SERVER=Percona-Server-5.5 main
+		cd $top_dir
+		rm -rf $server_dir
+		ln -s $branch_dir/Percona-Server $server_dir
+
+		# Patch Percona Server
+		cd $server_dir
+		patch -p1 < $top_dir/patches/xtradb55.patch
+
+		build_server $type
+
+		build_xtrabackup
+	else
+		cd $server_dir
+
+		build_server $type
+
+		build_xtrabackup
+	fi
 	;;
 *)
 	usage