Drizzle Automation

Merge lp://qastaging/~kalebral-deactivatedaccount/drizzle-automation/add-randgen-config-file into lp://qastaging/drizzle-automation

  1. add-randgen-config-file
  2. Merge into trunk
Proposed by Lee Bieber
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~kalebral-deactivatedaccount/drizzle-automation/add-randgen-config-file
Merge into: lp://qastaging/drizzle-automation
Diff against target: 83 lines (+9/-26)
3 files modified
drizzle/automation/config/automation.cnf (+0/-21)
drizzle/automation/lib/options.py (+2/-2)
drizzle/automation/randgen/run.py (+7/-3)
To merge this branch: bzr merge lp://qastaging/~kalebral-deactivatedaccount/drizzle-automation/add-randgen-config-file
Reviewer Review Type Date Requested Status
Jay Pipes Approve
Review via email: mp+17672@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote :

add configuration file for randgen to be consistent with the other benchmarks

Revision history for this message
Jay Pipes (jaypipes) wrote :

Excellent.

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/automation.cnf'
2--- drizzle/automation/config/automation.cnf 2010-01-07 20:48:08 +0000
3+++ drizzle/automation/config/automation.cnf 2010-01-19 17:23:12 +0000
4@@ -54,27 +54,6 @@
5
6 directories= client,drizzled,plugin
7
8-[randgen]
9-# location of the Random Query Generator repository
10-randgen_home= /home/drizzle/repos/randgen
11-
12-[randgen_tests]
13-basic= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/drizzle.yy --engine=Innodb
14-combinations= --queries=500 --threads=10 --gendata=conf/combinations_drizzle.zz --grammar=conf/combinations.yy --engine=Innodb
15-database_consistency_after_recovery= --queries=10000 --threads=10 --gendata=conf/transactions.zz --grammar=conf/transactions.yy --reporters=RecoveryConsistency --engine=Innodb
16-database_integrity_after_recovery= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/drizzle.yy --reporters=Recovery --engine=Innodblimit_validator= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/subquery_semijoin_drizzle.yy --validators=Limit --engine=Innodb
17-many_indexes= --queries=10 --threads=2 --gendata=conf/many_indexes_drizzle.zz --grammar=conf/many_indexes_drizzle.yy --engine=Innodb
18-optimized_semijoin_compare= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/subquery_semijoin_drizzle.yy --validators=ResultsetComparator --engine=Innodb
19-optimizer_basic= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/optimizer_basic.yy --engine=Innodb
20-optimizer_simple= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/optimizer_simple.yy --engine=Innodb
21-orderby_validator= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/subquery_semijoin_drizzle.yy --validators=OrderBy --engine=Innodb
22-repeatable_read= --queries=10000 --threads=10 --gendata=conf/transactions.zz --grammar=conf/repeatable_read.yy --validators=RepeatableRead --engine=Innodb
23-select_stability_validator= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/subquery_materialization_drizzle.yy --validators=SelectStability --engine=Innodbsubquery= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/subquery_drizzle.yy --engine=Innodb
24-subquery_semijoin_nested= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/subquery_semijoin_nested_drizzle.yy --engine=Innodb
25-#transactional_integrity= --queries=10 --threads=5 --gendata=conf/transactions.zz --grammar=conf/transactions.yy --validator=DatabaseConsistency --engine=Innodb
26-varchar= --queries=10000 --threads=10 --gendata=conf/varchar_drizzle.zz --grammar=conf/varchar.yy --engine=Innodb
27-
28-
29 [sqlbench]
30
31 # Email recipients to receive a text regression report on completion of
32
33=== modified file 'drizzle/automation/lib/options.py'
34--- drizzle/automation/lib/options.py 2010-01-12 20:54:51 +0000
35+++ drizzle/automation/lib/options.py 2010-01-19 17:23:12 +0000
36@@ -363,10 +363,10 @@
37 os.environ['LD_PRELOAD']= variables['ld_preload']
38 logging.info("LD_PRELOAD is set to %s\n" % variables['ld_preload'])
39
40- # For crashme, dbt2, drizzleslap, sqlbench and sysbench, we require that
41+ # For crashme, dbt2, drizzleslap, randgen, sqlbench and sysbench, we require that
42 # a configuration file with options is supplied at runtime...
43 command_to_run= variables['command']
44- if command_to_run in ['crashme', 'dbt2','drizzleslap','sqlbench','sysbench']:
45+ if command_to_run in ['crashme', 'dbt2','drizzleslap','randgen', 'sqlbench','sysbench']:
46 # Check to ensure we have a bench_config value...
47 bench_config_name= supplied.bench_config_name
48 if bench_config_name is None:
49
50=== modified file 'drizzle/automation/randgen/run.py'
51--- drizzle/automation/randgen/run.py 2009-12-18 19:19:48 +0000
52+++ drizzle/automation/randgen/run.py 2010-01-19 17:23:12 +0000
53@@ -42,7 +42,11 @@
54 working_dir= variables['working_dir']
55 run_date= datetime.datetime.now().isoformat()
56 server_name= variables['server']
57- randgen_home= variables['randgen']['randgen_home']
58+ bench_config_name= variables['bench_config_name']
59+
60+ # need the location where the randgen repository is located to run the randgen commands
61+ randgen_config_variables= util.loadConfigFile("randgen", bench_config_name)
62+ randgen_home= randgen_config_variables['run']['randgen_home']
63
64 os.chdir(working_dir)
65
66@@ -89,7 +93,7 @@
67 try:
68 configure_options= variables['defaults']['configure_options']
69 except KeyError:
70- configure_options= "--with-debug"
71+ configure_options= ""
72
73 try:
74 make_options= variables['defaults']['make_options']
75@@ -107,7 +111,7 @@
76
77 # get the list of tests that are specified
78 # in the configuration file in the randgen_test section
79- list_of_tests= variables['randgen_tests']
80+ list_of_tests= randgen_config_variables['randgen_tests']
81
82 server.start()
83 # Drop test database if it exists and create a new one

Subscribers

People subscribed via source and target branches

to all changes: