Merge lp:~patrick-crews/drizzle/sysbench-work into lp:drizzle

Proposed by Patrick Crews
Status: Merged
Merged at revision: 2590
Proposed branch: lp:~patrick-crews/drizzle/sysbench-work
Merge into: lp:drizzle
Diff against target: 56 lines (+6/-4)
3 files modified
tests/lib/util/sysbenchTestCase.py (+3/-3)
tests/qp_tests/sysbench/sysbench_readonly_test.py (+1/-0)
tests/qp_tests/sysbench/sysbench_readwrite_test.py (+2/-1)
To merge this branch: bzr merge lp:~patrick-crews/drizzle/sysbench-work
Reviewer Review Type Date Requested Status
Drizzle Trunk Pending
Review via email: mp+123864@code.launchpad.net

Description of the change

Various minor tweaks + adjustments to sysbench tests and infrastructure.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/lib/util/sysbenchTestCase.py'
2--- tests/lib/util/sysbenchTestCase.py 2012-08-17 17:00:31 +0000
3+++ tests/lib/util/sysbenchTestCase.py 2012-09-11 23:59:21 +0000
4@@ -54,7 +54,7 @@
5
6 # data for results database / regression analysis
7 self.test_data['run_date']= datetime.datetime.now().isoformat()
8- self.test_data['test_machine'] = socket.gethostname()
9+ self.test_data['test_machine'] = socket.gethostname()[0:20]
10 self.test_data['test_server_type'] = self.master_server.type
11 self.test_data['test_server_revno'], self.test_data['test_server_comment'] = self.master_server.get_bzr_info()
12 self.test_data['config_name'] = self.config_name
13@@ -70,8 +70,8 @@
14 # how many times to run sysbench at each concurrency
15 self.iterations = 3
16 # various concurrencies to use with sysbench
17- # self.concurrencies = [16, 32, 64, 128, 256, 512, 1024 ]
18- self.concurrencies = [ 128, 256, 512 ]
19+ self.concurrencies = [16, 32, 64, 128, 256, 512 ] #, 1024 ]
20+ # self.concurrencies = [ 128, 256, 512 ]
21
22 # we setup once. This is a readonly test and we don't
23 # alter the test bed once it is created
24
25=== modified file 'tests/qp_tests/sysbench/sysbench_readonly_test.py'
26--- tests/qp_tests/sysbench/sysbench_readonly_test.py 2012-08-17 17:00:31 +0000
27+++ tests/qp_tests/sysbench/sysbench_readonly_test.py 2012-09-11 23:59:21 +0000
28@@ -74,6 +74,7 @@
29 test_cmd.append("--mysql-socket=%s" %master_server.socket_file)
30
31 # preparing sysbench_readonly test
32+ time.sleep(20)
33 self.prepareSysbench(test_cmd,test_executor,servers)
34
35 # start the test!
36
37=== modified file 'tests/qp_tests/sysbench/sysbench_readwrite_test.py'
38--- tests/qp_tests/sysbench/sysbench_readwrite_test.py 2012-08-17 17:00:31 +0000
39+++ tests/qp_tests/sysbench/sysbench_readwrite_test.py 2012-09-11 23:59:21 +0000
40@@ -53,7 +53,7 @@
41
42 # defining the test command
43 master_server = servers[0]
44- self.config_name = 'innodb_1000K_readonly'
45+ self.config_name = 'innodb_1000K_readwrite'
46 test_cmd = [ "sysbench"
47 , "--max-time=240"
48 , "--max-requests=0"
49@@ -75,6 +75,7 @@
50 test_cmd.append("--mysql-socket=%s" %master_server.socket_file)
51
52 # preparing sysbench_readonly test
53+ time.sleep(20)
54 self.prepareSysbench(test_cmd,test_executor,servers)
55
56 # start the test!

Subscribers

People subscribed via source and target branches

to all changes: