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

[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.

[Alexey Kopytov (akopytov)]

As the 2.1 MP needs rebasing on trunk, let's not implement this in 2.0 (just to not put efforts at maintaining 2 different implementations).

Unmerged revisions

561. By George Ormond Lorch III on 2013-05-29

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 'innobackupex'
--- innobackupex	2013-05-03 10:40:03 +0000
+++ innobackupex	2013-05-29 22:46:37 +0000
@@ -121,6 +121,8 @@
 my $option_safe_slave_backup = '';
 my $option_safe_slave_backup_timeout = 300;
 
+my $option_use_valgrind = '';
+
 # name of the my.cnf configuration file
 #my $config_file = '';
 
@@ -989,7 +991,11 @@
         get_option(\%config, $option_defaults_group, 'innodb_data_file_path');
 
     # run ibbackup as a child process
-    $cmdline = "$option_ibbackup_binary $options";
+    if ($option_use_valgrind) {
+        $cmdline = "valgrind $option_ibbackup_binary $options";
+    } else {
+        $cmdline = "$option_ibbackup_binary $options";
+    }
     $now = current_time();
     print STDERR "\n$now  $prefix Starting ibbackup with command: $cmdline\n\n";
     $rcode = system("$cmdline");
@@ -1195,7 +1201,11 @@
     if ($option_stream) {
 	$options = $options . " --stream=$option_stream";
     }
-    $cmdline = "$option_ibbackup_binary $options";
+    if ($option_use_valgrind) {
+        $cmdline = "valgrind $option_ibbackup_binary $options";
+    } else {
+        $cmdline = "$option_ibbackup_binary $options";
+    }
 
     # run ibbackup as a child process
     $now = current_time();
@@ -2049,6 +2059,7 @@
                         'parallel=i' => \$option_parallel,
                         'safe-slave-backup' => \$option_safe_slave_backup,
                         'safe-slave-backup-timeout=i' => \$option_safe_slave_backup_timeout,
+                        'use-valgrind' => \$option_use_valgrind,
     );
                         
     if (!$rcode) {
@@ -3230,6 +3241,10 @@
 
 This option accepts a string argument that specifies the amount of memory in bytes for xtrabackup to use for crash recovery while preparing a backup. Multiples are supported providing the unit (e.g. 1MB, 1GB). It is used only with the option --apply-log. It is passed directly to xtrabackup's --use-memory option. See the xtrabackup documentation for details.
 
+=item --use-valgrind
+
+This option instructs innobackupex to invoke the xtrabackup binary through valgrind. You must have the valgrind binary within your path and should use either the file ~/.valgrindrc or the environment variable VALGRIND_OPTS to specify how you want valgrind to run and where to place its log file.
+
 =item --user=NAME
 
 This option specifies the MySQL username used when connecting to the server, if that's not the current user. The option accepts a string argument.  It is passed to the mysql child process without alteration. See mysql --help for details.
 
=== modified file 'utils/build.sh'
--- utils/build.sh	2013-05-07 07:53:25 +0000
+++ utils/build.sh	2013-05-29 22:46:37 +0000
@@ -36,8 +36,18 @@
         ;;
 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_SYNC_DEBUG -DUNIV_MEM_DEBUG \
@@ -208,14 +218,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
 
@@ -309,39 +322,47 @@
 	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 [ -d $branch_dir ]
-        then
-	    cd $branch_dir
-	    (bzr upgrade || true)
-	    bzr clean-tree --force --ignored
-	    bzr revert
-	    bzr pull --overwrite
+		# Get Percona Server
+		if [ -d $branch_dir ]
+		then
+		    rm -rf $branch_dir
+		fi
+	        if [ -d $branch_dir ]
+	        then
+		    cd $branch_dir
+		    (bzr upgrade || true)
+		    bzr clean-tree --force --ignored
+		    bzr revert
+		    bzr pull --overwrite
+		else
+		    bzr branch -r tag:Percona-Server-$PS_51_VERSION \
+			lp:percona-server/5.1 $branch_dir
+		    cd $branch_dir
+		fi
+
+		$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
-	    bzr branch -r tag:Percona-Server-$PS_51_VERSION \
-		lp:percona-server/5.1 $branch_dir
-	    cd $branch_dir
+		cd $server_dir
+
+		build_server $type
+
+		build_xtrabackup
 	fi
-
-	$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
-
 	;;
 "xtradb55" )
 	server_dir=$top_dir/Percona-Server-5.5
@@ -362,40 +383,48 @@
 	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 [ -d $branch_dir ]
-        then
-	    cd $branch_dir
-	    yes | bzr break-lock
-	    (bzr upgrade || true)
-	    bzr clean-tree --force --ignored
-	    bzr revert
-	    bzr pull --overwrite
+		# Get Percona Server
+		if [ -d $branch_dir ]
+		then
+		    rm -rf $branch_dir
+		fi
+	        if [ -d $branch_dir ]
+	        then
+		    cd $branch_dir
+		    yes | bzr break-lock
+		    (bzr upgrade || true)
+		    bzr clean-tree --force --ignored
+		    bzr revert
+		    bzr pull --overwrite
+		else
+		    bzr branch -r tag:Percona-Server-$PS_55_VERSION \
+			lp:percona-server $branch_dir
+		    cd $branch_dir
+		fi
+
+		$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
-	    bzr branch -r tag:Percona-Server-$PS_55_VERSION \
-		lp:percona-server $branch_dir
-	    cd $branch_dir
+		cd $server_dir
+
+		build_server $type
+
+		build_xtrabackup
 	fi
-
-	$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
-
 	;;
 *)
 	usage