← Back to branch summary

~gl-az/percona-xtrabackup/2.1-bug1190610

« back to all changes in this revision

Viewing changes to innobackupex

  • Committer: Alexey Kopytov
  • Date: 2013-05-22 10:25:21 UTC
  • Revision ID: akopytov@gmail.com-20130522102521-qx8qy2vk005gzhow
Bug #1182698: XtraBackup 2.1.2 Hangs on SST

The problem was in the keepalives process ignoring SIGINT, so
innobackupex got stuck in stop_keepalives() waiting for the child
process to exit.

Disable keepalives completely for the server connection. Instead set
wait_timeout unconditionally, i.e. even if keepalives are disabled.

Show diffs side-by-side

added added

removed removed

Lines of Context:
innobackupex
285
285
        }
286
286
} elsif ($option_backup) {
287
287
    # backup
288
 
    %mysql = mysql_connect(abort_on_error => 1, keepalives => 1);
 
288
    %mysql = mysql_connect(abort_on_error => 1);
289
289
 
290
290
    if ($option_ibbackup_binary eq 'autodetect') {
291
291
        $option_ibbackup_binary = set_xtrabackup_version();
1404
1404
        }
1405
1405
    }
1406
1406
 
1407
 
    if ($con{dbh} && $con{keepalives}) {
 
1407
    if ($con{dbh}) {
1408
1408
        $con{dbh}->do("SET SESSION wait_timeout=2147483");
1409
 
        start_keepalives(\%con);
 
1409
        if ($con{keepalives}) {
 
1410
            start_keepalives(\%con);
 
1411
        }
1410
1412
    }
1411
1413
 
1412
1414
    return %con;