Merge lp:~percona-core/percona-xtradb-cluster/bug-1409710-5.5 into lp:percona-xtradb-cluster/5.5

Proposed by Raghavendra D Prabhu on 2015-01-27
Status: Rejected
Rejected by: Alexey Kopytov on 2015-02-23
Proposed branch: lp:~percona-core/percona-xtradb-cluster/bug-1409710-5.5
Merge into: lp:percona-xtradb-cluster/5.5
Diff against target: 12 lines (+1/-1)
1 file modified
scripts/wsrep_sst_xtrabackup-v2.sh (+1/-1)
To merge this branch: bzr merge lp:~percona-core/percona-xtradb-cluster/bug-1409710-5.5
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) 2015-01-27 Resubmit on 2015-02-23
Review via email: mp+247688@code.launchpad.net
To post a comment you must log in.
Alexey Kopytov (akopytov) wrote :

Please resubmit on Github.

review: Resubmit

Unmerged revisions

840. By Raghavendra D Prabhu on 2015-01-27

Add -s9 to timeout for older CentOSes, the side-effect from SIGKILL shouldn't be much

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'scripts/wsrep_sst_xtrabackup-v2.sh'
--- scripts/wsrep_sst_xtrabackup-v2.sh 2014-09-04 18:46:14 +0000
+++ scripts/wsrep_sst_xtrabackup-v2.sh 2015-01-27 11:15:45 +0000
@@ -482,7 +482,7 @@
482 if timeout --help | grep -q -- '-k';then 482 if timeout --help | grep -q -- '-k';then
483 ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"483 ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
484 else 484 else
485 ltcmd="timeout $tmt $tcmd"485 ltcmd="timeout -s9 $tmt $tcmd"
486 fi486 fi
487 timeit "$msg" "$ltcmd | $strmcmd; RC=( "\${PIPESTATUS[@]}" )"487 timeit "$msg" "$ltcmd | $strmcmd; RC=( "\${PIPESTATUS[@]}" )"
488 else 488 else

Subscribers

People subscribed via source and target branches

to all changes: