Merge lp:~longbow/percona-xtrabackup/fix737569-1.6 into lp:percona-xtrabackup/1.6

[Valentine Gostev]

Added fix and test for bug 737569

[Alexey Kopytov (akopytov)]

review: Approve

[Valentine Gostev (longbow)]

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

=== modified file 'innobackupex'
--- innobackupex	2011-11-11 18:12:31 +0000
+++ innobackupex	2011-11-28 11:54:41 +0000
@@ -477,6 +477,25 @@
     return 0;
 }
 
+#
+# if_directory_exists_and_empty accepts two arguments:
+# variable with directory name and comment.
+# Sub checks that directory exists and is empty
+# usage: is_directory_exists_and_empty($directory,"Comment");
+#
+
+sub if_directory_exists_and_empty {
+    my $empty_dir = shift;
+    my $is_directory_empty_comment = shift;
+    if (! -d $empty_dir) {
+        die "$is_directory_empty_comment directory does not exist!";
+    }
+    opendir (my $dh, $empty_dir) or die "Not a directory";
+    if ( ! scalar( grep { $_ ne "." && $_ ne ".." } readdir($dh)) == 0) {
+        die "$is_directory_empty_comment directory is not empty!";
+    }
+    closedir($dh);
+}
 
 #
 # copy_back subroutine copies data and index files from backup directory 
@@ -497,18 +516,10 @@
     my $compressed_data_file = '.*\.ibz$';
     my $file;
     my $backup_innodb_data_file_path;
-    # check that original data directory exists
-    if (! -d $orig_datadir) {
-        Die "Original data directory '$orig_datadir' does not exist!";
-    }
-    # check that original InnoDB data directory exists
-    if (! -d $orig_ibdata_dir) {
-        Die "Original InnoDB data directory '$orig_ibdata_dir' does not exist!";
-    }
-    # check that original InnoDB log directory exists
-    if (! -d $orig_iblog_dir) {
-        Die "Original InnoDB log directory '$orig_iblog_dir' does not exist!";
-    }
+    # check that original data directories exist and they are empty
+    if_directory_exists_and_empty($orig_datadir, "Original data");
+    if_directory_exists_and_empty($orig_ibdata_dir, "Original InnoDB data");
+    if_directory_exists_and_empty($orig_iblog_dir, "Original InnoDB log");
 
     # check that the original options file and the backup options file have
     # the same value for "innodb_data_file_path" option

=== added file 'test/t/ib_empty_dir.sh'
--- test/t/ib_empty_dir.sh	1970-01-01 00:00:00 +0000
+++ test/t/ib_empty_dir.sh	2011-11-28 11:54:41 +0000
@@ -0,0 +1,35 @@
+# Test for bug https://bugs.launchpad.net/percona-xtrabackup/+bug/737569
+. inc/common.sh
+
+init
+run_mysqld
+
+innobackupex --no-timestamp $topdir/backup
+backup_dir=$topdir/backup
+vlog "Backup created in directory $backup_dir"
+
+stop_mysqld
+# Remove datadir
+rm -r $mysql_datadir
+# Restore backup
+vlog "Applying log"
+vlog "###########"
+vlog "# PREPARE #"
+vlog "###########"
+innobackupex --apply-log $backup_dir
+vlog "Restoring MySQL datadir"
+mkdir -p $mysql_datadir
+touch $mysql_datadir/anyfile
+vlog "###########"
+vlog "# RESTORE #"
+vlog "###########"
+run_cmd_expect_failure $IB_BIN $IB_ARGS --copy-back $backup_dir
+
+if grep -q "is not empty!" $OUTFILE
+then
+    vlog "innobackupex reported error about non-empty dirrectory correctly"
+    exit 0
+else
+    vlog "innobackupex did not report an error about non-empty dir"
+    exit 1
+fi