Merge lp:~akopytov/percona-xtrabackup/bug1411157 into lp:percona-xtrabackup/2.3

[Alexey Kopytov]

http://jenkins.percona.com/view/PXB%202.3/job/percona-xtrabackup-2.3-param/20/

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'storage/innobase/xtrabackup/doc/source/innobackupex/improved_ftwrl.rst'
--- storage/innobase/xtrabackup/doc/source/innobackupex/improved_ftwrl.rst	2014-12-18 12:48:27 +0000
+++ storage/innobase/xtrabackup/doc/source/innobackupex/improved_ftwrl.rst	2015-01-16 18:10:24 +0000
@@ -14,11 +14,11 @@
 Waiting for queries to finish
 -----------------------------
 
-Good moment to issue a global lock is the moment when there are no long queries running. But waiting for a good moment to issue the global lock for extended period of time isn't always good approach, as it can extend the time needed for backup to take place. To prevent |innobackupex| from waiting to issue ``FLUSH TABLES WITH READ LOCK`` for too long, new option has been implemented: :option:`innobackupex --lock-wait-timeout` option can be used to limit the waiting time. If the good moment to issue the lock did not happen during this time, |innobackupex| will give up and exit with an error message and backup will not be taken. Zero value for this option turns off the feature (which is default).
-
-Another possibility is to specify the type of query to wait on. In this case :option:`innobackupex --lock-wait-query-type`. Possible values are ``all`` and ``update``. When ``all`` is used |innobackupex| will wait for all long running queries (execution time longer than allowed by :option:`innobackupex --lock-wait-threshold`) to finish before running the ``FLUSH TABLES WITH READ LOCK``. When ``update`` is used |innobackupex| will wait on ``UPDATE/ALTER/REPLACE/INSERT`` queries to finish.
-
-Although time needed for specific query to complete is hard to predict, we can assume that queries that are running for a long time already will likely not be completed soon, and queries which are running for a short time will likely be completed shortly. |innobackupex| can use the value of :option:`innobackupex --lock-wait-threshold` option to specify which query is long running and will likely block global lock for a while. In order to use this option xtrabackup user should have ``PROCESS`` and ``SUPER`` privileges.
+Good moment to issue a global lock is the moment when there are no long queries running. But waiting for a good moment to issue the global lock for extended period of time isn't always good approach, as it can extend the time needed for backup to take place. To prevent |innobackupex| from waiting to issue ``FLUSH TABLES WITH READ LOCK`` for too long, new option has been implemented: :option:`innobackupex --ftwrl-wait-timeout` option can be used to limit the waiting time. If the good moment to issue the lock did not happen during this time, |innobackupex| will give up and exit with an error message and backup will not be taken. Zero value for this option turns off the feature (which is default).
+
+Another possibility is to specify the type of query to wait on. In this case :option:`innobackupex --ftwrl-wait-query-type`. Possible values are ``all`` and ``update``. When ``all`` is used |innobackupex| will wait for all long running queries (execution time longer than allowed by :option:`innobackupex --ftwrl-wait-threshold`) to finish before running the ``FLUSH TABLES WITH READ LOCK``. When ``update`` is used |innobackupex| will wait on ``UPDATE/ALTER/REPLACE/INSERT`` queries to finish.
+
+Although time needed for specific query to complete is hard to predict, we can assume that queries that are running for a long time already will likely not be completed soon, and queries which are running for a short time will likely be completed shortly. |innobackupex| can use the value of :option:`innobackupex --ftwrl-wait-threshold` option to specify which query is long running and will likely block global lock for a while. In order to use this option xtrabackup user should have ``PROCESS`` and ``SUPER`` privileges.
 
 Killing the blocking queries
 ----------------------------
@@ -30,11 +30,11 @@
 Options summary
 ---------------
 
-* :option:`--lock-wait-timeout=N` (seconds) - how long to wait for a good moment. Default is 0, not to wait.
-
-* :option:`--lock-wait-query-type={all|update}` - which long queries should be finished before ``FLUSH TABLES WITH READ LOCK`` is run. Default is all.
-
-* :option:`--lock-wait-threshold=N` (seconds) - how long query should be running before we consider it long running and potential blocker of global lock.
+* :option:`--ftwrl-wait-timeout=N` (seconds) - how long to wait for a good moment. Default is 0, not to wait.
+
+* :option:`--ftwrl-wait-query-type={all|update}` - which long queries should be finished before ``FLUSH TABLES WITH READ LOCK`` is run. Default is all.
+
+* :option:`--ftwrl-wait-threshold=N` (seconds) - how long query should be running before we consider it long running and potential blocker of global lock.
 
 * :option:`--kill-long-queries-timeout=N` (seconds) - how many time we give for queries to complete after ``FLUSH TABLES WITH READ LOCK`` is issued before start to kill. Default if ``0``, not to kill.
 
@@ -45,7 +45,7 @@
 
 Running the |innobackupex| with the following options: ::
 
- $ innobackupex --lock-wait-threshold=40 --lock-wait-query-type=all --lock-wait-timeout=180 --kill-long-queries-timeout=20 --kill-long-query-type=all /data/backups/
+ $ innobackupex --ftwrl-wait-threshold=40 --ftwrl-wait-query-type=all --ftwrl-wait-timeout=180 --kill-long-queries-timeout=20 --kill-long-query-type=all /data/backups/
 
 will cause |innobackupex| to spend no longer than 3 minutes waiting for all queries older than 40 seconds to complete. After ``FLUSH TABLES WITH READ LOCK`` is issued, |innobackupex| will wait 20 seconds for lock to be acquired. If lock is still not acquired after 20 seconds, it will kill all queries which are running longer that the ``FLUSH TABLES WITH READ LOCK``.
 

=== modified file 'storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst'
--- storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst	2014-12-18 10:39:15 +0000
+++ storage/innobase/xtrabackup/doc/source/innobackupex/innobackupex_option_reference.rst	2015-01-16 18:10:24 +0000
@@ -150,15 +150,15 @@
 
    This option specifies which types of queries should be killed to unblock the global lock. Default is "all".
 
-.. option:: --lock-wait-timeout=SECONDS
+.. option:: --ftwrl-wait-timeout=SECONDS
 
    This option specifies time in seconds that innobackupex should wait for queries that would block ``FLUSH TABLES WITH READ LOCK`` before running it. If there are still such queries when the timeout expires, innobackupex terminates with an error. Default is 0, in which case innobackupex does not wait for queries to complete and starts ``FLUSH TABLES WITH READ LOCK`` immediately.
 
-.. option:: --lock-wait-threshold=SECONDS
-
-   This option specifies the query run time threshold which is used by innobackupex to detect long-running queries with a non-zero value of :option:`innobackupex --lock-wait-timeout`. FLUSH TABLES WITH READ LOCK`` is not started until such long-running queries exist. This option has no effect if --lock-wait-timeout is 0. Default value is 60 seconds.
-
-.. option:: --lock-wait-query-type=all|update
+.. option:: --ftwrl-wait-threshold=SECONDS
+
+   This option specifies the query run time threshold which is used by innobackupex to detect long-running queries with a non-zero value of :option:`innobackupex --ftwrl-wait-timeout`. FLUSH TABLES WITH READ LOCK`` is not started until such long-running queries exist. This option has no effect if --ftwrl-wait-timeout is 0. Default value is 60 seconds.
+
+.. option:: --ftwrl-wait-query-type=all|update
 
    This option specifies which types of queries are allowed to complete before innobackupex will issue the global lock. Default is all.
 

=== modified file 'storage/innobase/xtrabackup/innobackupex.pl'
--- storage/innobase/xtrabackup/innobackupex.pl	2014-12-08 06:52:10 +0000
+++ storage/innobase/xtrabackup/innobackupex.pl	2015-01-16 18:10:24 +0000
@@ -229,14 +229,14 @@
 my $option_kill_long_queries_timeout = 0;
 
 # waiting for an appropriate time to start FTWRL timeout
-my $option_lock_wait_timeout = 0;
+my $option_ftwrl_wait_timeout = 0;
 
 # how old should be query to be waited for
-my $option_lock_wait_threshold = 60;
+my $option_ftwrl_wait_threshold = 60;
 
 # which type of queries we are waiting for during the pre-FTWRL phase
 # possible values are "update" and "all"
-my $option_lock_wait_query_type = "all";
+my $option_ftwrl_wait_query_type = "all";
 
 # which type of queries wa are waiting when clearing the way for FTWRL
 # by killing; possible values are "select" and "all"
@@ -3342,7 +3342,7 @@
     while (my ($id, $process) = each %$processlist) {
         if (defined($process->{Info}) &&
             $process->{Time} >= $threshold &&
-            (($option_lock_wait_query_type eq "all" &&
+            (($option_ftwrl_wait_query_type eq "all" &&
              is_query($process->{Info})) ||
              is_update_query($process->{Info}))) {
             print STDERR "\n$now  $prefix Waiting for query $id (duration " .
@@ -3456,9 +3456,9 @@
         return;
     }
 
-    if ($option_lock_wait_timeout) {
-        wait_for_no_updates($con, $option_lock_wait_timeout,
-                            $option_lock_wait_threshold);
+    if ($option_ftwrl_wait_timeout) {
+        wait_for_no_updates($con, $option_ftwrl_wait_timeout,
+                            $option_ftwrl_wait_threshold);
     }
 
     $now = current_time();
@@ -3831,10 +3831,10 @@
                         \$option_kill_long_queries_timeout,
                         'kill-long-query-type=s' =>
                         \$option_kill_long_query_type,
-                        'lock-wait-timeout=i' => \$option_lock_wait_timeout,
-                        'lock-wait-threshold=i' => \$option_lock_wait_threshold,
-                        'lock-wait-query-type=s' =>
-                        \$option_lock_wait_query_type,
+                        'ftwrl-wait-timeout=i' => \$option_ftwrl_wait_timeout,
+                        'ftwrl-wait-threshold=i' => \$option_ftwrl_wait_threshold,
+                        'ftwrl-wait-query-type=s' =>
+                        \$option_ftwrl_wait_query_type,
                         'version-check!' => \$option_version_check,
                         'force-non-empty-directories' =>
                         \$option_force_non_empty_dirs
@@ -3902,10 +3902,10 @@
         $option_compress = 0;
     }
 
-    # validate lock-wait-query-type and kill-long-query-type values
-    if (!(grep {$_ eq $option_lock_wait_query_type} qw/all update/)) {
-        die "Wrong value of lock-wait-query-type. ".
-            "Possible values are all|update, but $option_lock_wait_query_type ".
+    # validate ftwrl-wait-query-type and kill-long-query-type values
+    if (!(grep {$_ eq $option_ftwrl_wait_query_type} qw/all update/)) {
+        die "Wrong value of ftwrl-wait-query-type. ".
+            "Possible values are all|update, but $option_ftwrl_wait_query_type ".
             "is specified.";
     }
     if (!(grep {$_ eq $option_kill_long_query_type} qw/all select/)) {
@@ -5507,16 +5507,16 @@
 
 This option specifies which types of queries should be killed to unblock the global lock. Default is "all".
 
-=item --lock-wait-timeout=SECONDS
+=item --ftwrl-wait-timeout=SECONDS
 
 This option specifies time in seconds that innobackupex should wait for queries that would block FTWRL before running it. If there are still such queries when the timeout expires, innobackupex terminates with an error.
 Default is 0, in which case innobackupex does not wait for queries to complete and starts FTWRL immediately.
 
-=item --lock-wait-threshold=SECONDS
-
-This option specifies the query run time threshold which is used by innobackupex to detect long-running queries with a non-zero value of --lock-wait-timeout. FTWRL is not started until such long-running queries exist. This option has no effect if --lock-wait-timeout is 0. Default value is 60 seconds.
-
-=item --lock-wait-query-type=all|update
+=item --ftwrl-wait-threshold=SECONDS
+
+This option specifies the query run time threshold which is used by innobackupex to detect long-running queries with a non-zero value of --ftwrl-wait-timeout. FTWRL is not started until such long-running queries exist. This option has no effect if --ftwrl-wait-timeout is 0. Default value is 60 seconds.
+
+=item --ftwrl-wait-query-type=all|update
 
 This option specifies which types of queries are allowed to complete before innobackupex will issue the global lock. Default is all.
 

=== modified file 'storage/innobase/xtrabackup/test/t/kill_long_selects.sh'
--- storage/innobase/xtrabackup/test/t/kill_long_selects.sh	2014-09-04 16:53:33 +0000
+++ storage/innobase/xtrabackup/test/t/kill_long_selects.sh	2015-01-16 18:10:24 +0000
@@ -153,9 +153,9 @@
 wait_for_connection_count 2
 
 run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} $topdir/full \
-                          --lock-wait-timeout=3 \
-                          --lock-wait-query-type=all \
-                          --lock-wait-threshold=1 \
+                          --ftwrl-wait-timeout=3 \
+                          --ftwrl-wait-query-type=all \
+                          --ftwrl-wait-threshold=1 \
                           --kill-long-queries-timeout=1 \
                           --kill-long-query-type=all
 
@@ -171,9 +171,9 @@
 wait_for_connection_count 2
 
 run_cmd_expect_failure ${IB_BIN} ${IB_ARGS} $topdir/full \
-                          --lock-wait-timeout=3 \
-                          --lock-wait-query-type=update \
-                          --lock-wait-threshold=2 \
+                          --ftwrl-wait-timeout=3 \
+                          --ftwrl-wait-query-type=update \
+                          --ftwrl-wait-threshold=2 \
                           --kill-long-queries-timeout=1 \
                           --kill-long-query-type=all
 
@@ -190,9 +190,9 @@
 wait_for_connection_count 2
 
 innobackupex $topdir/full \
-                          --lock-wait-timeout=6 \
-                          --lock-wait-query-type=update \
-                          --lock-wait-threshold=2 \
+                          --ftwrl-wait-timeout=6 \
+                          --ftwrl-wait-query-type=update \
+                          --ftwrl-wait-threshold=2 \
                           --kill-long-queries-timeout=1 \
                           --kill-long-query-type=all