Drizzle Automation

Merge lp:~kalebral-deactivatedaccount/drizzle-automation/sysbench-report-fix into lp:drizzle-automation

  1. sysbench-report-fix
  2. Merge into trunk
Proposed by Lee Bieber
Status: Merged
Approved by: Patrick Crews
Approved revision: 223
Merged at revision: 224
Proposed branch: lp:~kalebral-deactivatedaccount/drizzle-automation/sysbench-report-fix
Merge into: lp:drizzle-automation
Diff against target: 69 lines (+14/-10)
3 files modified
drizzle/automation/config/sysbench/innodb_1000K_readonly.cnf (+1/-0)
drizzle/automation/config/sysbench/innodb_1000K_readwrite.cnf (+1/-0)
drizzle/automation/reports/sysbench.py (+12/-10)
To merge this branch: bzr merge lp:~kalebral-deactivatedaccount/drizzle-automation/sysbench-report-fix
Reviewer Review Type Date Requested Status
Patrick Crews Approve
Review via email: mp+43493@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Patrick Crews (patrick-crews) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'drizzle/automation/config/sysbench/innodb_1000K_readonly.cnf'
2--- drizzle/automation/config/sysbench/innodb_1000K_readonly.cnf 2010-10-11 04:31:43 +0000
3+++ drizzle/automation/config/sysbench/innodb_1000K_readonly.cnf 2010-12-13 05:04:52 +0000
4@@ -10,6 +10,7 @@
5 innodb.additional-mem-pool-size= 16M
6 table-open-cache= 4096
7 table-definition-cache= 4096
8+mysql-protocol.max-connections=2048
9
10 [mysqld]
11
12
13=== modified file 'drizzle/automation/config/sysbench/innodb_1000K_readwrite.cnf'
14--- drizzle/automation/config/sysbench/innodb_1000K_readwrite.cnf 2010-10-11 04:31:43 +0000
15+++ drizzle/automation/config/sysbench/innodb_1000K_readwrite.cnf 2010-12-13 05:04:52 +0000
16@@ -10,6 +10,7 @@
17 innodb.additional-mem-pool-size= 16M
18 table-open-cache= 4096
19 table-definition-cache= 4096
20+mysql-protocol.max-connections=2048
21
22 [mysqld]
23
24
25=== modified file 'drizzle/automation/reports/sysbench.py'
26--- drizzle/automation/reports/sysbench.py 2010-11-12 23:27:46 +0000
27+++ drizzle/automation/reports/sysbench.py 2010-12-13 05:04:52 +0000
28@@ -282,10 +282,11 @@
29 report_text= report_text + """
30 ====================================================================================================
31 """
32- results= getRegressionOverRange(run_id, last_5_revs)
33- for result in results:
34- report_text= report_text + "%-6s %6s %12s %10s %10s %10s %10s %10s\n" % tuple(result)
35- report_text= report_text + """====================================================================================================
36+ if len(last_5_revs) > 0:
37+ results= getRegressionOverRange(run_id, last_5_revs)
38+ for result in results:
39+ report_text= report_text + "%-6s %6s %12s %10s %10s %10s %10s %10s\n" % tuple(result)
40+ report_text= report_text + """====================================================================================================
41
42 TRENDING OVER Last 20 runs %s
43
44@@ -297,19 +298,20 @@
45 report_text= report_text + """
46 ====================================================================================================
47 """
48- results= getRegressionOverRange(run_id, last_20_revs)
49- for result in results:
50- report_text= report_text + "%-6s %6s %12s %10s %10s %10s %10s %10s\n" % tuple(result)
51+ if len(last_20_revs) > 0:
52+ results= getRegressionOverRange(run_id, last_20_revs)
53+ for result in results:
54+ report_text= report_text + "%-6s %6s %12s %10s %10s %10s %10s %10s\n" % tuple(result)
55
56- report_text= report_text + """====================================================================================================
57+ report_text= report_text + """====================================================================================================
58
59 TRENDING OVER ALL runs %s
60
61 """ % (
62 report_notation
63 )
64- report_text= report_text + "%-6s %-7s %-17s %-10s %-10s %-10s %-10s %-10s" % ("Conc","TPS","% Diff from Avg","Diff","Min","Max","Avg","STD")
65- report_text= report_text + """
66+ report_text= report_text + "%-6s %-7s %-17s %-10s %-10s %-10s %-10s %-10s" % ("Conc","TPS","% Diff from Avg","Diff","Min","Max","Avg","STD")
67+ report_text= report_text + """
68 ====================================================================================================
69 """
70

Subscribers

People subscribed via source and target branches

to all changes: