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

[Lee Bieber]

[Lee Bieber (kalebral-deactivatedaccount)]

add report ability for sqlbench and drizzleslap, still more work to on drizzleslap to pretty print output

[Jay Pipes (jaypipes)]

Hi!

Mostly good stuff, but there's a few things I'd like to clean up. :)

1)

+ if working_dir != "None":

In Python, you use None, not "None" to designate a NULL object. So, I believe the above is an error. In fact, for the REPORT command, I don't believe there is a need for the working_dir variable or os.chdir() command at all.

The reason that the working_dir variable and os.chdir() call was made in, for instance, sysbench/run.py is to output the BZR information for that specific run:

bzr log -r-1 -n0 --line

However, when you re-run a report, the above may be misleading, as the above command gets the *last* revision of the current directory. For a re-run report, the last revision may actually not be the revision to which the report refers. :)

So, I would recommend removing the BZR commit output from the drizzleslap and sqlbench report command output like I have done in the sysbench re-run report output.

2) You've added a new function to reports/run.py:

88 +def getLastRunId(config_name, server_name, bzr_branch, bzr_revision):

This is exactly the same as a function in reports/sysbench.py. Please pull out queries that will be used in multiple reports into a file reports/common_queries.py (or similar) to reduce duplicate code. Thanks!

Cheers!

jay

review: Needs Fixing

[Lee Bieber (kalebral-deactivatedaccount)]

Hi Jay
For #1 I wanted to pass "None" so that I could reuse the existing function and not have to duplicate a lot of code. When the report sees "None" is just prints "N/A" in the output. I was trying to avoid lots of duplication of code. Should I be passing something else?

For #2 I had pulled out the function from reports/sysbench.py so that everyone can use this function. Do you still want me to put it in a separate file?

[Jay Pipes (jaypipes)]

> Hi Jay
> For #1 I wanted to pass "None" so that I could reuse the existing function and
> not have to duplicate a lot of code. When the report sees "None" is just
> prints "N/A" in the output. I was trying to avoid lots of duplication of code.
> Should I be passing something else?

OK. Just pass None then, not "None", since it can be confusing. :)

> For #2 I had pulled out the function from reports/sysbench.py so that everyone
> can use this function. Do you still want me to put it in a separate file?

Let's put it in lib/util.py along with some of the other common queries.

Thanks!

Jay

[lp:~kalebral-deactivatedaccount/drizzle-automation/report-sqlbench]

111. By lbieber <lbieber@orisndriz05> on 2009-11-19

move the error logging from lib/util.py to report/run.py for when run_id cannot be found

Unmerged revisions

=== modified file 'drizzle/automation/drizzleslap/run.py'
--- drizzle/automation/drizzleslap/run.py	2009-11-13 23:17:05 +0000
+++ drizzle/automation/drizzleslap/run.py	2009-11-19 22:35:18 +0000
@@ -232,6 +232,8 @@
     import drizzle.automation.reports.drizzleslap as reports
     email_text= reports.getDrizzleslapReport(working_dir, config_name, run_id, run_date, server_name, variables['bzr_branch'], int(variables['bzr_revision']))
     logging.info("Sending email...")
+    # bug https://bugs.launchpad.net/launchpad/+bug/419562 - need to use registered launchpad name for from
+    #from_string= ('%s <[e-mail]>' % socket.gethostname())
     from_string= ('%s <[e-mail]>' % socket.gethostname())
     util.mail(from_string, variables['drizzleslap']['report_email'], "Drizzleslap Report - %s" % server_version, email_text)
 

=== modified file 'drizzle/automation/lib/options.py'
--- drizzle/automation/lib/options.py	2009-11-17 01:28:37 +0000
+++ drizzle/automation/lib/options.py	2009-11-19 22:35:18 +0000
@@ -385,15 +385,6 @@
       else:
         variables['report_name']= report_name
 
-      # Check to ensure we have a sysbench_config value...
-      bench_config= supplied.sysbench_config
-      if bench_config is None:
-        logging.error("The --sysbench-config CLI option is required when running the BENCH command. Exiting.")
-        sys.exit(1)
-      else:
-        variables['sysbench_config']= bench_config
-    
-
     return variables
 
 options= RuntimeOptions()

=== modified file 'drizzle/automation/lib/util.py'
--- drizzle/automation/lib/util.py	2009-10-14 22:35:50 +0000
+++ drizzle/automation/lib/util.py	2009-11-19 22:35:18 +0000
@@ -29,6 +29,7 @@
 import textwrap
 import types
 from drizzle.automation.lib import logging
+from drizzle.automation.lib import db
 
 def pretty_print_configuration(configuration, key=None, indent_level= 0):
   """Prints configuration variables for the run."""
@@ -121,3 +122,33 @@
     new_run_id= int(result[0][0]) + 1
 
   return new_run_id
+
+# Find the specific last run_id which corresponds to the revision and branch ...
+def getLastRunId(config_name, server_name, bzr_branch, bzr_revision):
+
+  version= bzr_branch + '-' + str(bzr_revision)
+
+  sql= """
+SELECT 
+  run_id
+FROM sysbench_config c
+NATURAL JOIN sysbench_runs r
+WHERE c.name = '%s'
+AND r.server = '%s'
+AND r.version LIKE '%s%%'
+ORDER BY run_id DESC
+LIMIT 1
+""" % (
+        config_name
+      , server_name
+      , version
+      )
+  results= db.get_select(sql)
+
+  if len(results) == 1:
+    return int(results[0][0])
+  else:
+    return False
+
+  return True
+

=== modified file 'drizzle/automation/reports/drizzleslap.py'
--- drizzle/automation/reports/drizzleslap.py	2009-11-16 05:11:43 +0000
+++ drizzle/automation/reports/drizzleslap.py	2009-11-19 22:35:18 +0000
@@ -95,13 +95,13 @@
 
   return report_text
 
-
 def getDrizzleslapReport(working_dir, drizzleslap_config_name, run_id, run_date, server_name, bzr_branch, bzr_revision):
   """Returns a textual report of the results over a series of runs"""
 
   # Find the revision comment from BZR
-  os.chdir(working_dir)
-  (retcode, rev_comment_output)= commands.getstatusoutput("bzr log -r-1 -n0 --line")
+  if working_dir != None:
+    os.chdir(working_dir)
+    (retcode, rev_comment_output)= commands.getstatusoutput("bzr log -r-1 -n0 --line")
 
   # Output from above command looks like this:
   # jpipes@serialcoder:~/repos/drizzle/trunk-sysbench-r1046$ bzr log -r-1 -n0 --line
@@ -115,11 +115,14 @@
   # 1039.2.3: Jay Pipes 2009-05-31 Phase 3 of refactoring JOIN
   # 1039.2.2: Jay Pipes 2009-05-31 Phase 2 of JOIN refactoring.
 
-  comment_lines= rev_comment_output.split("\n")
-  rev_comment= comment_lines[0]
-  if len(comment_lines) > 1:
-    full_commentary= "\n".join(comment_lines[1:])
+    comment_lines= rev_comment_output.split("\n")
+    rev_comment= comment_lines[0]
+    if len(comment_lines) > 1:
+      full_commentary= "\n".join(comment_lines[1:])
+    else:
+      full_commentary= None
   else:
+    rev_comment= "N/A"
     full_commentary= None
 
   sql= """

=== modified file 'drizzle/automation/reports/run.py'
--- drizzle/automation/reports/run.py	2009-11-16 21:25:20 +0000
+++ drizzle/automation/reports/run.py	2009-11-19 22:35:18 +0000
@@ -31,48 +31,92 @@
 import os.path
 from drizzle.automation.lib import logging
 from drizzle.automation.lib import util
+from drizzle.automation.lib import db
 import commands
 import re
 import time
 import datetime
 
+# Email or display the report
+def email_or_display_report(email_flag, email_string, report_string, report_text, bzr_revision, run_id):
+  if email_flag is True:
+    # bug https://bugs.launchpad.net/launchpad/+bug/419562 - need to use registered launchpad name for from
+    #from_string= ('%s <[e-mail]>' % socket.gethostname())
+    from_string= ('%s <[e-mail]>' % socket.gethostname())
+    util.mail(from_string, email_string, "%s Report for Build %d and Run ID %d" % (report_string, int(bzr_revision), int(run_id)), report_text)
+  else:
+    print report_text
+
 def execute(report_name, variables):
   # Verify configuration variables and run the requested report
 
+  # We need a server, a revision, and a branch
+  try:
+    bzr_revision= variables['bzr_revision']
+    bzr_branch= variables['bzr_branch']
+  except KeyError:
+    logging.error("The report option requires the --bzr-revision, --bzr-branch CLI options to be supplied. Exiting.")
+    return False
+
   if report_name == 'sysbench':
-    # We need a config file, a server, a revision, and a branch
+    # For sysbench We need a config file, a server, a revision, and a branch
     try:
       sysbench_config= variables['sysbench_config']
-      bzr_revision= variables['bzr_revision']
-      bzr_branch= variables['bzr_branch']
     except KeyError:
       logging.error("The sysbench report requires the --sysbench-config, --bzr-revision, --bzr-branch CLI options to be supplied. Exiting.")
       return False
 
-    try:
-      server_name= variables['server']
-    except KeyError:
-      server_name= 'drizzled'
+  try:
+    server_name= variables['server']
+  except KeyError:
+    server_name= 'drizzled'
 
+  if report_name == 'sysbench':
     import drizzle.automation.reports.sysbench as reports
-
-    # OK, now we need to find the specific last run_id which 
-    # corresponds to the revision and branch ...
-    run_id= reports.getLastRunId(sysbench_config, server_name, variables['bzr_branch'], int(variables['bzr_revision']))
-
+    run_id= util.getLastRunId(variables['sysbench_config'], server_name, variables['bzr_branch'], int(variables['bzr_revision']))
     if run_id is None:
-      logging.error("Could not find the last run ID for config %s, server %s, branch %s at revision %s. Exiting." % (sysbench_config,
-                                                                                                                     server_name,
-                                                                                                                     variables['bzr_branch'],
-                                                                                                                     variables['bzr_revision']))
-      return False
-
+      logging.error("Could not find the last run ID for config %s, server %s, branch %s at revision %s. Exiting."
+         % (
+              sysbench_config_name
+            , server_name
+            , variables['bzr_branch']
+            , variables['bzr_revision']
+           ))
+      sys.exit(1)
     report_text= reports.getSysbenchRegressionReportForRunId(run_id, sysbench_config, server_name, variables['bzr_branch'], int(variables['bzr_revision']))
-
-    if variables['with_email_report'] is True:
-      from_string= ('%s <[e-mail]>' % socket.gethostname())
-      util.mail(from_string, variables['sysbench']['report_email'], "SYSBENCH Regression Report for Run ID %d" % int(run_id), report_text)
-    else:
-      print report_text
-
-    return True
+    email_or_display_report(variables['with_email_report'], variables['sysbench']['report_email'], 'SYSBENCH', report_text, bzr_revision, run_id)
+
+  elif report_name == 'sqlbench':
+    import drizzle.automation.reports.sqlbench as reports
+    run_id= util.getLastRunId(variables['sqlbench']['sqlbench_config_name'], server_name, variables['bzr_branch'], int(variables['bzr_revision']))
+    if run_id is None:
+      logging.error("Could not find the last run ID for config %s, server %s, branch %s at revision %s. Exiting."
+         % (
+              variables['sysbench']['sysbench_config_name']
+            , server_name
+            , variables['bzr_branch']
+            , variables['bzr_revision']
+           ))
+      sys.exit(1)
+    report_text= reports.getSqlbenchReport(None, variables['sqlbench']['sqlbench_config_name'], run_id, 'N/A', server_name, variables['bzr_branch'], int(variables['bzr_revision']), variables['engine'])
+    email_or_display_report(variables['with_email_report'], variables['sysbench']['report_email'], 'SQLBENCH', report_text, bzr_revision, run_id)
+
+  elif report_name == 'drizzleslap':
+    import drizzle.automation.reports.drizzleslap as reports
+    run_id= util.getLastRunId(variables['drizzleslap']['drizzleslap_config_name'], server_name, variables['bzr_branch'], int(variables['bzr_revision']))
+    if run_id is None:
+      logging.error("Could not find the last run ID for config %s, server %s, branch %s at revision %s. Exiting."
+         % (
+              variables['drizzleslap']['drizzleslap_config_name']
+            , server_name
+            , variables['bzr_branch']
+            , variables['bzr_revision']
+           ))
+      sys.exit(1)
+    report_text= reports.getDrizzleslapReport(None, variables['drizzleslap']['drizzleslap_config_name'], run_id, 'N/A', server_name, variables['bzr_branch'], int(variables['bzr_revision']))
+    email_or_display_report(variables['with_email_report'], variables['sysbench']['report_email'], 'DRIZZLESLAP', report_text, bzr_revision, run_id)
+  else: 
+    logging.error("Invalid report option %s. Must be drizzleslap, sqlbench or sysbench", report_name)
+    return False
+
+  return True

=== modified file 'drizzle/automation/reports/sqlbench.py'
--- drizzle/automation/reports/sqlbench.py	2009-11-16 05:11:43 +0000
+++ drizzle/automation/reports/sqlbench.py	2009-11-19 22:35:18 +0000
@@ -31,12 +31,80 @@
 import socket
 import commands
 
-def getSysbenchRegressionReport(working_dir, run_id, run_date, server_name, bzr_branch, bzr_revision,storage_engine):
+
+def sqlQueryString(last_revs, run_id):
+  sql= """
+SELECT 
+  i.engine
+, i.operation_name
+, ROUND(AVG(i.seconds),2) AS seconds
+, IF (AVG(i.seconds) >= agg.avg_seconds
+  , CONCAT('+', ROUND(((AVG(i.seconds) - agg.avg_seconds) / agg.avg_seconds) * 100, 2), '%%')
+  , CONCAT('-', ROUND(((agg.avg_seconds- AVG(i.seconds)) / agg.avg_seconds) * 100, 2), '%%')
+  ) as pct_diff_from_avg
+, ROUND((AVG(i.seconds) - agg.avg_seconds), 2) AS diff_from_avg
+, IF(ABS(AVG(i.seconds) - agg.avg_seconds) <= agg.stddev_seconds
+  , 'within norms'
+  , 'outside norms'
+  ) as is_normal
+, ROUND(agg.min_seconds,2) AS min_seconds
+, ROUND(agg.max_seconds,2) AS max_seconds
+, ROUND(agg.avg_seconds,2) AS avg_seconds
+, ROUND(agg.stddev_seconds,2) AS stddev_seconds
+FROM sysbench_config c
+NATURAL JOIN sysbench_runs r
+NATURAL JOIN sqlbench_run_iterations i
+INNER JOIN (
+  SELECT
+    operation_name
+  , MIN(seconds) as min_seconds
+  , MAX(seconds) as max_seconds
+  , AVG(seconds) as avg_seconds
+  , STDDEV(seconds) as stddev_seconds
+  FROM sqlbench_run_iterations iter
+  WHERE run_id IN (%s)
+  GROUP BY engine, operation_name
+) AS agg
+  ON i.operation_name = agg.operation_name
+WHERE r.run_id = %d
+GROUP BY i.engine, i.operation_name
+ORDER BY i.engine, i.operation_name
+      """ % (
+        ",".join(last_revs)
+      , run_id
+      )
+
+  return db.get_select(sql)
+
+def printResults(results, report_text):
+  """ Print out the sql results for a query """
+
+  for result in results:
+    if result[1] != "TOTALS":
+      report_text= report_text + "%-7s %-33s %8s %12s %10s %14s %7s %7s %7s %7s\n" % tuple(result)
+  return report_text
+
+# Returns header information for each section
+def printHeader(string, report_text):
+  report_text= report_text + """
+=========================================================================================================================
+TRENDING OVER %s
+""" % (string)
+
+  report_text= report_text + "%-7s %-36s %-6s %-17s %-10s %-11s %-7s %-7s %-7s %-7s" % ("Engine","Test","Time","% Diff from Avg","Diff","Norm?","Min","Max","Avg","STD")
+
+  report_text= report_text + """
+=========================================================================================================================
+"""
+  return report_text
+
+def getSqlbenchReport(working_dir, sqlbench_config_name, run_id, run_date, server_name, bzr_branch, bzr_revision,storage_engine):
   """Returns a textual report of the regression over a series of runs"""
 
   # Find the revision comment from BZR
-  os.chdir(working_dir)
-  (retcode, rev_comment_output)= commands.getstatusoutput("bzr log -r-1 -n0 --line")
+  if working_dir != None:
+    os.chdir(working_dir)
+    (retcode, rev_comment_output)= commands.getstatusoutput("bzr log -r-1 -n0 --line")
 
   # Output from above command looks like this:
   # jpipes@serialcoder:~/repos/drizzle/trunk-sysbench-r1046$ bzr log -r-1 -n0 --line
@@ -45,67 +113,131 @@
   # 1039.2.8: Jay Pipes 2009-05-31 Yet more indentation and style cleanup
   # 1039.2.7: Jay Pipes 2009-05-31 Yet more style and indentation cleanups.
   # 1039.2.6: Jay Pipes 2009-05-31 No code changes...only indentation and style cleanup.
-  # 1039.2.5: Jay Pipes 2009-05-31 Style cleanups and moves JOIN_TAB definition out into its own header.
-  # 1039.2.4: Jay Pipes 2009-05-31 Tiny indentation cleanup.
-  # 1039.2.3: Jay Pipes 2009-05-31 Phase 3 of refactoring JOIN
-  # 1039.2.2: Jay Pipes 2009-05-31 Phase 2 of JOIN refactoring.
 
-  comment_lines= rev_comment_output.split("\n")
-  rev_comment= comment_lines[0]
-  if len(comment_lines) > 1:
-    full_commentary= "\n".join(comment_lines[1:])
+    comment_lines= rev_comment_output.split("\n")
+    rev_comment= comment_lines[0]
+    if len(comment_lines) > 1:
+      full_commentary= "\n".join(comment_lines[1:])
+    else:
+      full_commentary= None
   else:
-    full_commentary= None
-
-  rev_range= range(int(bzr_revision) - 3, int(bzr_revision) + 1)
-  revision_versions= ""
-  for rev in rev_range:
-    revision_versions= revision_versions + "'" + bzr_branch + '-' + str(rev) + "',"
-  # Cut off the last comma...
-  revision_versions= revision_versions[0:-1]
-
-  sql= """SELECT r.version, r.run_id, r.run_date, i.operation_name, i.seconds, i.usr, i.sys, i.cpu
-    FROM sysbench_config c 
-    NATURAL JOIN sysbench_runs r
-    NATURAL JOIN sqlbench_run_iterations i
-    WHERE r.server = '%s'
-    AND i.engine = '%s'
-    AND r.version IN (%s)
-    GROUP BY i.operation_name, r.version
-    ORDER BY i.operation_name, r.version
-     """ % (
-        server_name
-      , storage_engine
-      , revision_versions
+      rev_comment= "N/A"
+      full_commentary= None
+
+  sql= """
+SELECT 
+  run_id
+FROM sysbench_config c
+NATURAL JOIN sysbench_runs r
+WHERE c.name = '%s'
+AND r.server = '%s'
+AND r.version LIKE '%s%%'
+AND r.run_id <= %d
+ORDER BY run_id DESC
+LIMIT 20
+""" % (
+        sqlbench_config_name
+      , server_name
+      , bzr_branch
+      , run_id
       )
-
-  report_text= """==================================================================
-SQLBENCH REGRESSION REPORT
-==================================================================
+  results= db.get_select(sql)
+
+  last_5_revs= []
+  last_20_revs= []
+  x= 0
+  for result in results:
+    cur_run_id= int(result[0])
+    if x < 5:
+      last_5_revs.append(str(cur_run_id))
+    last_20_revs.append(str(cur_run_id))
+    x= x + 1
+
+  report_text= """=======================================================================================
+SQLBENCH REPORT
+=======================================================================================
 ENGINE:   %s
 MACHINE:  %s
 RUN ID:   %d
 RUN DATE: %s
+SERVER:   %s
 VERSION:  %s
 REVISION: %d
 COMMENT:  %s
-==================================================================
-Version\t\tRun ID\tDate\t\t\tTest\t\tSeconds\tUsr\tSys\tCPU
-==================================================================
 """ % (
     storage_engine
   , socket.gethostname()
   , run_id
   , run_date
+  , server_name
   , bzr_branch
   , int(bzr_revision)
   , rev_comment
 )
 
+  report_text= printHeader('LAST 5 runs', report_text)
+  results= sqlQueryString(last_5_revs, run_id)
+  report_text= printResults(results, report_text)
+
+  report_text= printHeader('LAST 20 runs', report_text)
+  results= sqlQueryString(last_20_revs, run_id)
+  report_text= printResults(results, report_text)
+
+  report_text= printHeader('ALL runs', report_text)
+
+  sql= """
+SELECT 
+  i.engine
+, i.operation_name
+, ROUND(AVG(i.seconds),2) AS seconds
+, IF (AVG(i.seconds) >= agg.avg_seconds
+  , CONCAT('+', ROUND(((AVG(i.seconds) - agg.avg_seconds) / agg.avg_seconds) * 100, 2), '%%')
+  , CONCAT('-', ROUND(((agg.avg_seconds- AVG(i.seconds)) / agg.avg_seconds) * 100, 2), '%%')
+  ) as pct_diff_from_avg
+, ROUND((AVG(i.seconds) - agg.avg_seconds), 2) AS diff_from_avg
+, IF(ABS(AVG(i.seconds) - agg.avg_seconds) <= agg.stddev_seconds
+  , 'within norms'
+  , 'outside norms'
+  ) as is_normal
+, ROUND(agg.min_seconds,2) AS min_seconds
+, ROUND(agg.max_seconds,2) AS max_seconds
+, ROUND(agg.avg_seconds,2) AS avg_seconds
+, ROUND(agg.stddev_seconds,2) AS stddev_seconds
+FROM sysbench_config c
+NATURAL JOIN sysbench_runs r
+NATURAL JOIN sqlbench_run_iterations i
+INNER JOIN (
+  SELECT
+    iter.operation_name
+  , MIN(seconds) as min_seconds
+  , MAX(seconds) as max_seconds
+  , AVG(seconds) as avg_seconds
+  , STDDEV(seconds) as stddev_seconds
+  FROM sysbench_config conf
+  NATURAL JOIN sysbench_runs runs
+  NATURAL JOIN sqlbench_run_iterations iter
+  WHERE conf.name = '%s'
+  AND runs.server = '%s'
+  AND runs.version LIKE '%s%%'
+  GROUP BY iter.engine, iter.operation_name
+) AS agg
+  ON i.operation_name= agg.operation_name
+WHERE r.run_id = %d
+GROUP BY i.engine, i.operation_name
+ORDER BY i.engine, i.operation_name
+      """ % (
+        sqlbench_config_name
+      , server_name
+      , bzr_branch
+      , run_id
+      )
+
   results= db.get_select(sql)
-  for result in results:
-    report_text= report_text + "\t".join(result) + "\n"
-  report_text= report_text + "=================================================================="
+
+  report_text= printResults(results, report_text)
+  report_text= report_text + """
+========================================================================================================================="""
+
   if full_commentary:
     report_text= report_text + """
 FULL REVISION COMMENTARY:

=== modified file 'drizzle/automation/reports/sysbench.py'
--- drizzle/automation/reports/sysbench.py	2009-11-16 21:25:20 +0000
+++ drizzle/automation/reports/sysbench.py	2009-11-19 22:35:18 +0000
@@ -30,33 +30,6 @@
 import socket
 import commands
 
-def getLastRunId(sysbench_config, server_name, bzr_branch, bzr_revision):
-  """Returns the last Run ID given the supplied config, server, branch and revision"""
-
-  version= bzr_branch + '-' + str(bzr_revision)
-
-  sql= """
-SELECT 
-  run_id
-FROM sysbench_config c
-NATURAL JOIN sysbench_runs r
-WHERE c.name = '%s'
-AND r.server = '%s'
-AND r.version LIKE '%s%%'
-ORDER BY run_id DESC
-LIMIT 1
-""" % (
-        sysbench_config
-      , server_name
-      , version
-      )
-  results= db.get_select(sql)
-
-  if len(results) == 1:
-    return int(results[0][0])
-  else:
-    return None
-
 def get5and20RevisionRanges(sysbench_config, server_name, bzr_branch, run_id):
   """Return a tuple with 2 ranges of run_id values for the last 5 and 20 runs"""
   sql= """

=== modified file 'drizzle/automation/sqlbench/run.py'
--- drizzle/automation/sqlbench/run.py	2009-11-07 17:39:19 +0000
+++ drizzle/automation/sqlbench/run.py	2009-11-19 22:35:18 +0000
@@ -197,8 +197,10 @@
   # send email report
   if variables['with_email_report'] is True:
     import drizzle.automation.reports.sqlbench as reports
-    email_text= reports.getSysbenchRegressionReport(working_dir, run_id, run_date, server_name, variables['bzr_branch'], int(variables['bzr_revision']),storage_engine)
+    email_text= reports.getSqlbenchReport(working_dir, sqlbench_config_name, run_id, run_date, server_name, variables['bzr_branch'], int(variables['bzr_revision']),storage_engine)
     logging.info("Sending email...")
+    # bug https://bugs.launchpad.net/launchpad/+bug/419562 - need to use registered launchpad name for from
+    #from_string= ('%s <[e-mail]>' % socket.gethostname())
     from_string= ('%s <[e-mail]>' % socket.gethostname())
     util.mail(from_string, variables['sysbench']['report_email'], "SQLBENCH Regression Report - %s" % server_version, email_text)
 

=== modified file 'drizzle/automation/sysbench/run.py'
--- drizzle/automation/sysbench/run.py	2009-10-16 15:40:17 +0000
+++ drizzle/automation/sysbench/run.py	2009-11-19 22:35:18 +0000
@@ -444,7 +444,9 @@
   if variables['with_email_report'] is True:
     import drizzle.automation.reports.sysbench as reports
     email_text= reports.getSysbenchRegressionReport(working_dir, sysbench_config, run_id, run_date, server_name, variables['bzr_branch'], int(variables['bzr_revision']))
-    from_string= ('%s <[e-mail]>' % socket.gethostname())
+    # bug https://bugs.launchpad.net/launchpad/+bug/419562 - need to use registered launchpad name for from
+    #from_string= ('%s <[e-mail]>' % socket.gethostname())
+    from_string= ('%s <[e-mail]>' % socket.gethostname())
     util.mail(from_string, variables['sysbench']['report_email'], "SYSBENCH Regression Report - %s" % server_version, email_text)
 
   return True