Merge lp:~percona-toolkit-dev/percona-toolkit/pt-osc-alter-foreign-keys-method-drop-swap-is-vulnerable-to-interruption-1368244 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.14

[Frank Cizmich]

Problem:
when pt-osc --alter-foreign-keys-method is drop_swap, a "normal-signal" (HUP, INT, PIPE, TERM) issued during the drop_swap phase interrupts the procedure, dropping the original table without renaming the new one.

Solution:
have the handler ignore those signals during the drop_swap function, reinstating them afterwards.

Note:
Tested manually adding pauses in between different stages of drop_swap and sending different signals with kill command.

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-online-schema-change'
--- bin/pt-online-schema-change	2015-01-23 10:19:56 +0000
+++ bin/pt-online-schema-change	2015-03-18 17:54:46 +0000
@@ -7970,6 +7970,7 @@
 
 my $exit_status = 0;
 my $oktorun     = 1;
+my $dont_interrupt_now = 0;
 my @drop_trigger_sqls;
 my @triggers_not_dropped;
 
@@ -7983,6 +7984,7 @@
    $oktorun              = 1;
    @drop_trigger_sqls    = ();
    @triggers_not_dropped = ();
+   $dont_interrupt_now   = 0;
 
    my %stats = (
       INSERT => 0,
@@ -10251,6 +10253,11 @@
       "DROP TABLE IF EXISTS $orig_tbl->{name}",
       "RENAME TABLE $new_tbl->{name} TO $orig_tbl->{name}",
    );
+  
+   # we don't want to be interrupted during the swap!
+   # since it might leave original table dropped
+   # https://bugs.launchpad.net/percona-toolkit/+bug/1368244
+   $dont_interrupt_now = 1; 
 
    foreach my $sql ( @sqls ) {
       PTDEBUG && _d($sql);
@@ -10269,6 +10276,8 @@
       }
    }
 
+   $dont_interrupt_now = 0; 
+
    if ( $o->get('execute') ) {
       print ts("Dropped and swapped tables OK.\n");
    }
@@ -10667,6 +10676,11 @@
 # Catches signals so we can exit gracefully.
 sub sig_int {
    my ( $signal ) = @_;
+   if ( $dont_interrupt_now ) {
+      # we're in the middle of something that shouldn't be interrupted 
+      PTDEBUG && _d("Received Signal: \"$signal\" in middle of critical operation. Continuing anyway.");
+      return;
+   }
    $oktorun = 0;  # flag for cleanup tasks
    print STDERR "# Exiting on SIG$signal.\n";
    # restore terminal to normal state in case CTL+C issued while