Merge lp:~akopytov/percona-xtrabackup/bug1214730-2.1 into lp:percona-xtrabackup/2.1

Proposed by Alexey Kopytov on 2013-08-21
Status: Merged
Approved by: Sergei Glushchenko on 2013-08-21
Approved revision: 670
Merged at revision: 670
Proposed branch: lp:~akopytov/percona-xtrabackup/bug1214730-2.1
Merge into: lp:percona-xtrabackup/2.1
Diff against target: 22 lines (+7/-5)
1 file modified
test/run.sh (+7/-5)
To merge this branch: bzr merge lp:~akopytov/percona-xtrabackup/bug1214730-2.1
Reviewer Review Type Date Requested Status
Sergei Glushchenko g2 2013-08-21 Approve on 2013-08-21
Review via email: mp+181288@code.launchpad.net
To post a comment you must log in.

Approve

review: Approve (g2)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/run.sh'
2--- test/run.sh 2013-07-25 15:04:49 +0000
3+++ test/run.sh 2013-08-21 12:49:10 +0000
4@@ -74,12 +74,14 @@
5 exit -1
6 fi
7
8- if [ "$NWORKERS" -gt 16 ]
9+ XB_TEST_MAX_WORKERS=${XB_TEST_MAX_WORKERS:-16}
10+ if [ "$NWORKERS" -gt $XB_TEST_MAX_WORKERS ]
11 then
12- echo "Autodetected number of cores: $NWORKERS"
13- echo "Limiting to 16 to avoid excessive resource consumption"
14-
15- NWORKERS=16
16+ cat <<EOF
17+Autodetected number of cores: $NWORKERS
18+Limiting to $XB_TEST_MAX_WORKERS to avoid excessive resource consumption
19+EOF
20+ NWORKERS=$XB_TEST_MAX_WORKERS
21 fi
22 }
23

Subscribers

People subscribed via source and target branches

to all changes: