Merge lp:~kalebral-deactivatedaccount/drizzle-automation/dbt2-script-changes into lp:drizzle-automation

[Lee Bieber]

[Lee Bieber (kalebral-deactivatedaccount)]

changes necessary to get dbt2 benchmark to run with the latest dbt2 scripts

[Jay Pipes (jaypipes)]

Cool.

review: Approve

=== modified file 'drizzle/automation/dbt2/run.py'
--- drizzle/automation/dbt2/run.py	2010-01-07 20:48:08 +0000
+++ drizzle/automation/dbt2/run.py	2010-01-19 23:49:11 +0000
@@ -76,6 +76,12 @@
   db.execute_sql(sql)
   fileHandle.close()
 
+# location where test results are stored, dbt2 expects it to not exist
+def remove_directory(output_dirname):
+  if os.path.exists(output_dirname):
+    logging.info("Removing %s" % output_dirname)
+    import shutil
+    shutil.rmtree(output_dirname)
 
 def execute(processing_mode, variables):
   # Set/verify some required variables, depending on the server we are benchmarking.
@@ -144,14 +150,6 @@
   # clean data directory (var)
   server.clear()
 
-  # Start up the server...
-  server.start()
-
-  # create test database
-  if not util.drop_and_create_test_database(client):
-    server.stop()
-    sys.exit(1)
-
   # If we are profiling, we must now stop and restart the server
   # under the profiler now that the database is prepared
   util.get_profile_options(server,variables['profiler'])
@@ -164,39 +162,41 @@
 
   # location of dbt2 tools and scripts
   dbt2_home= dbt2_config_variables['run']['dbt2_home']
+
   bzr_revision= variables['bzr_revision']
   test_time= dbt2_config_variables['run']['dbt2_time']
   warehouses= dbt2_config_variables['run']['dbt2_warehouses']
 
-  # location where test results are stored
-  output_dirname= ('dbt2-%s' % (bzr_revision))
-  if not os.path.isdir(output_dirname):
-    logging.info("Creating %s" % output_dirname)
-    os.mkdir(output_dirname)
-
   # load data into database
+  server.start()
   cmd= "%s/bin/drizzle/dbt2-drizzle-load-db --path %s --verbose --drizzle_path %s" % (dbt2_home, dbt2_config_variables['run']['dbt2_data_dir'],  os.path.join(working_dir, 'client/drizzle'))
-  logging.info("Loading data.... ")
-  logging.info("%s " % cmd)
+  logging.info("Loading data.... %s " % cmd)
   (retcode, output)= commands.getstatusoutput(cmd)
   if not retcode == 0:
     logging.info("Failed to load data\n%s" % output)
     sys.exit(1)
+  server.stop()
 
   # get list of connections to run with
   connection_levels= [int(x) for x in dbt2_config_variables['run']['dbt2_connections'].split(",")]
   
+  # need to set the path so we can find the dbt2 scripts
+  temp_env= os.environ["PATH"]
+  os.environ["PATH"] = "%s:%s/bin" % (temp_env, dbt2_home)
+  logging.info("Setting PATH environment variable to %s" % os.environ["PATH"])
+
   # run the tests
+  # Note that the tests start and stop drizzled after each run
   for connections in connection_levels: 
-    cmd= "%s/bin/drizzle/dbt2-drizzle-run --connections %d --time %d  --warehouses %d --verbose --output-base %s --run-number %s" % (dbt2_home, connections, int(test_time), int(warehouses), output_dirname, connections)
+    output_dirname= "results-%s/%s" % (bzr_revision, connections)
+    remove_directory(output_dirname)
+    cmd= "%s/bin/dbt2-run-workload -a drizzle -c %d -d %d  -w %d -o %s -i %s -l %d -b 40" % (dbt2_home, connections, int(test_time), int(warehouses), output_dirname, working_dir, server.getPort())
     logging.info("Running %s " % cmd)
     (retcode, output)= commands.getstatusoutput(cmd)
     if not retcode == 0:
       logging.info("Failed to run test with %d connections\n%s" % (connections,output))
       sys.exit(1)
 
-  server.stop()
-
   if variables['no_store_db'] is False:
 
      util.log_sysbench_run(run_id, config_id, server_name, server_version, run_date)
@@ -204,7 +204,7 @@
      # We now log the results of this run - 
      logging.info("Logging dbt2 revision %s results to database for run %d" % (bzr_revision, run_id))
      for connections in connection_levels: 
-       stat_file= ("%s/%s/output/%d/driver/statistics.log" % (working_dir, output_dirname, connections))
+       stat_file= ("%s/results-%s/%s/report.txt" % (working_dir, bzr_revision, connections))
        log_dbt2_iteration(run_id, connections, test_time, warehouses, stat_file)
 
   # send email report