Merge lp:~patrick-crews/drizzle/randgen_rpl_crash_tests into lp:~drizzle-trunk/drizzle/development

[Patrick Crews]

Added some code + randgen_test .cnf files so we now have crash tests for the innodb rpl log and the slave plugin (not yet hacked up for the file-based log)

slave_plugin.multi_thread1_crash_recover
innodb_trx_log.multi_thread1_crash_recover

We kill the server mid-randgen run (while multiple-threads are executing queries), we then restart the server and compare master and slave states (for slave plugin)

for the innodb log, we restart the master, then dump the sql from the log, populate a validation server, then compare master and slave contents.

These tests help us know that in the event of a crash the log will reflect the state of the data and the slave accurately reflects the master's state : )

=== modified file 'tests/lib/server_mgmt/server.py'
--- tests/lib/server_mgmt/server.py	2011-03-17 06:31:49 +0000
+++ tests/lib/server_mgmt/server.py	2011-03-24 20:20:59 +0000
@@ -77,6 +77,7 @@
         self.tried_start = 0
         self.failed_test = 0 # was the last test a failure?  our state is suspect
         self.server_start_timeout = 60 * self.valgrind_time_buffer
+        self.pid = None
 
     def initialize_databases(self):
         """ Call schemawriter to make db.opt files """

=== modified file 'tests/lib/server_mgmt/server_management.py'
--- tests/lib/server_mgmt/server_management.py	2011-03-24 00:34:19 +0000
+++ tests/lib/server_mgmt/server_management.py	2011-03-24 20:20:59 +0000
@@ -185,6 +185,7 @@
         else:
             # manual-gdb issue
             server_retcode = 0
+        
         timer = float(0)
         timeout = float(server.server_start_timeout)
 
@@ -206,6 +207,11 @@
      
         if server_retcode == 0:
             server.status = 1 # we are running
+            if os.path.exists(server.pid_file):
+                pid_file = open(server.pid_file,'r')
+                pid = pid_file.readline().strip()
+                pid_file.close()
+                server.pid = pid
 
         if server_retcode != 0 and not expect_fail and self.debug:
             self.logging.debug("Server startup command: %s failed with error code %d" %( start_cmd

=== modified file 'tests/lib/test_mgmt/test_execution.py'
--- tests/lib/test_mgmt/test_execution.py	2011-03-17 06:31:49 +0000
+++ tests/lib/test_mgmt/test_execution.py	2011-03-24 20:20:59 +0000
@@ -140,6 +140,9 @@
                 variable_name = "%s_%s" %(self.name.upper(), server.name.upper())
                 variable_value = str(server.master_port)
                 extra_reqs[variable_name] = variable_value
+                variable_name = variable_name + "_PID"
+                variable_value = str(server.pid)
+                extra_reqs[variable_name] = variable_value
             self.working_environment.update(extra_reqs)
         return 
 

=== modified file 'tests/randgen_tests/innodb_trx_log/multi_thread1_crash_recover.cnf'
--- tests/randgen_tests/innodb_trx_log/multi_thread1_crash_recover.cnf	2011-03-14 22:22:08 +0000
+++ tests/randgen_tests/innodb_trx_log/multi_thread1_crash_recover.cnf	2011-03-24 20:20:59 +0000
@@ -2,7 +2,7 @@
 comment = single threaded test
 
 [test_command]
-command = ./gentest.pl --gendata=conf/drizzle/translog_drizzle.zz --grammar=conf/drizzle/translog_concurrent1.yy --Reporter=DrizzleInnoTrxLogCrashRecovery  --queries=250 --threads=3
+command = ./gentest.pl --gendata=conf/drizzle/translog_drizzle.zz --grammar=conf/drizzle/translog_concurrent1.yy --Reporter=DrizzleInnoTrxLogCrashRecovery  --queries=1000 --threads=3
 
 [test_servers]
 servers = [[--innodb.replication-log --plugin-add=shutdown_function ],[]]

=== modified file 'tests/randgen_tests/slave_plugin/multi_thread1_crash_recover.cnf'
--- tests/randgen_tests/slave_plugin/multi_thread1_crash_recover.cnf	2011-03-14 22:22:08 +0000
+++ tests/randgen_tests/slave_plugin/multi_thread1_crash_recover.cnf	2011-03-24 20:20:59 +0000
@@ -2,7 +2,7 @@
 comment = single threaded test
 
 [test_command]
-command = ./gentest.pl --gendata=conf/drizzle/translog_drizzle.zz --grammar=conf/drizzle/translog_concurrent1.yy --Reporter=DrizzleSlavePluginCrashRecover  --queries=100 --threads=3
+command = ./gentest.pl --gendata=conf/drizzle/translog_drizzle.zz --grammar=conf/drizzle/translog_concurrent1.yy --Reporter=DrizzleSlavePluginCrashRecover  --queries=1000 --threads=3
 
 [test_servers]
 servers = [[--innodb.replication-log --plugin-add=shutdown_function ],[--plugin-add=slave --slave.config-file=$MASTER_SERVER_SLAVE_CONFIG]]