Commit 4a793fb6 authored by unknown's avatar unknown

Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

parents 942ba22e 91b3447c
...@@ -1647,19 +1647,20 @@ int do_sleep(struct st_query *query, my_bool real_sleep) ...@@ -1647,19 +1647,20 @@ int do_sleep(struct st_query *query, my_bool real_sleep)
char *p= query->first_argument; char *p= query->first_argument;
char *sleep_start, *sleep_end= query->end; char *sleep_start, *sleep_end= query->end;
double sleep_val; double sleep_val;
char *cmd = (real_sleep ? "real_sleep" : "sleep");
while (my_isspace(charset_info, *p)) while (my_isspace(charset_info, *p))
p++; p++;
if (!*p) if (!*p)
die("Missing argument to %s", cmd); die("Missing argument to %.*s", query->first_word_len, query->query);
sleep_start= p; sleep_start= p;
/* Check that arg starts with a digit, not handled by my_strtod */ /* Check that arg starts with a digit, not handled by my_strtod */
if (!my_isdigit(charset_info, *sleep_start)) if (!my_isdigit(charset_info, *sleep_start))
die("Invalid argument to %s \"%s\"", cmd, query->first_argument); die("Invalid argument to %.*s \"%s\"", query->first_word_len, query->query,
query->first_argument);
sleep_val= my_strtod(sleep_start, &sleep_end, &error); sleep_val= my_strtod(sleep_start, &sleep_end, &error);
if (error) if (error)
die("Invalid argument to %s \"%s\"", cmd, query->first_argument); die("Invalid argument to %.*s \"%s\"", query->first_word_len, query->query,
query->first_argument);
/* Fixed sleep time selected by --sleep option */ /* Fixed sleep time selected by --sleep option */
if (opt_sleep && !real_sleep) if (opt_sleep && !real_sleep)
...@@ -2529,8 +2530,8 @@ my_bool end_of_query(int c) ...@@ -2529,8 +2530,8 @@ my_bool end_of_query(int c)
size size of the buffer i.e max size to read size size of the buffer i.e max size to read
DESCRIPTION DESCRIPTION
This function actually reads several lines an adds them to the This function actually reads several lines and adds them to the
buffer buf. It will continue to read until it finds what it believes buffer buf. It continues to read until it finds what it believes
is a complete query. is a complete query.
Normally that means it will read lines until it reaches the Normally that means it will read lines until it reaches the
...@@ -3760,7 +3761,7 @@ static void handle_no_error(struct st_query *q) ...@@ -3760,7 +3761,7 @@ static void handle_no_error(struct st_query *q)
command - currrent command pointer command - currrent command pointer
query - query string to execute query - query string to execute
query_len - length query string to execute query_len - length query string to execute
ds - output buffer wherte to store result form query ds - output buffer where to store result form query
RETURN VALUE RETURN VALUE
error - function will not return error - function will not return
...@@ -3778,7 +3779,7 @@ static void run_query_stmt(MYSQL *mysql, struct st_query *command, ...@@ -3778,7 +3779,7 @@ static void run_query_stmt(MYSQL *mysql, struct st_query *command,
DBUG_PRINT("query", ("'%-.60s'", query)); DBUG_PRINT("query", ("'%-.60s'", query));
/* /*
Init a new stmt if it's not alreday one created for this connectoon Init a new stmt if it's not already one created for this connection
*/ */
if(!(stmt= cur_con->stmt)) if(!(stmt= cur_con->stmt))
{ {
...@@ -3867,7 +3868,7 @@ static void run_query_stmt(MYSQL *mysql, struct st_query *command, ...@@ -3867,7 +3868,7 @@ static void run_query_stmt(MYSQL *mysql, struct st_query *command,
goto end; goto end;
} }
/* If we got here the statement was both executed and read succeesfully */ /* If we got here the statement was both executed and read successfully */
handle_no_error(command); handle_no_error(command);
if (!disable_result_log) if (!disable_result_log)
{ {
...@@ -4594,7 +4595,7 @@ int main(int argc, char **argv) ...@@ -4594,7 +4595,7 @@ int main(int argc, char **argv)
case Q_QUERY_HORIZONTAL: case Q_QUERY_HORIZONTAL:
{ {
my_bool old_display_result_vertically= display_result_vertically; my_bool old_display_result_vertically= display_result_vertically;
/* fix up query pointer if this is * first iteration for this line */ /* fix up query pointer if this is first iteration for this line */
if (q->query == q->query_buf) if (q->query == q->query_buf)
q->query += q->first_word_len + 1; q->query += q->first_word_len + 1;
display_result_vertically= (q->type==Q_QUERY_VERTICAL); display_result_vertically= (q->type==Q_QUERY_VERTICAL);
...@@ -4639,15 +4640,15 @@ int main(int argc, char **argv) ...@@ -4639,15 +4640,15 @@ int main(int argc, char **argv)
case Q_SEND: case Q_SEND:
if (!q->query[q->first_word_len]) if (!q->query[q->first_word_len])
{ {
/* This happens when we use 'send' on it's own line */ /* This happens when we use 'send' on its own line */
q_send_flag=1; q_send_flag=1;
break; break;
} }
/* fix up query pointer if this is * first iteration for this line */ /* fix up query pointer if this is first iteration for this line */
if (q->query == q->query_buf) if (q->query == q->query_buf)
q->query += q->first_word_len; q->query += q->first_word_len;
/* /*
run_query() can execute a query partially, depending on the flags run_query() can execute a query partially, depending on the flags.
QUERY_SEND flag without QUERY_REAP tells it to just send the QUERY_SEND flag without QUERY_REAP tells it to just send the
query and read the result some time later when reap instruction query and read the result some time later when reap instruction
is given on this connection. is given on this connection.
...@@ -4731,7 +4732,7 @@ int main(int argc, char **argv) ...@@ -4731,7 +4732,7 @@ int main(int argc, char **argv)
break; break;
case Q_ENABLE_PARSING: case Q_ENABLE_PARSING:
/* /*
Ensure we don't get parsing_disabled < 0 as this would accidently Ensure we don't get parsing_disabled < 0 as this would accidentally
disable code we don't want to have disabled disable code we don't want to have disabled
*/ */
if (parsing_disabled > 0) if (parsing_disabled > 0)
...@@ -4777,9 +4778,9 @@ int main(int argc, char **argv) ...@@ -4777,9 +4778,9 @@ int main(int argc, char **argv)
start_lineno= 0; start_lineno= 0;
/* /*
The whole test has been executed _sucessfully_ The whole test has been executed _sucessfully_.
Time to compare result or save it to record file Time to compare result or save it to record file.
The entire output from test is now kept in ds_res The entire output from test is now kept in ds_res.
*/ */
if (ds_res.length) if (ds_res.length)
{ {
...@@ -5509,7 +5510,7 @@ static int get_next_bit(REP_SET *set,uint lastpos) ...@@ -5509,7 +5510,7 @@ static int get_next_bit(REP_SET *set,uint lastpos)
} }
/* find if there is a same set in sets. If there is, use it and /* find if there is a same set in sets. If there is, use it and
free given set, else put in given set in sets and return it's free given set, else put in given set in sets and return its
position */ position */
static int find_set(REP_SETS *sets,REP_SET *find) static int find_set(REP_SETS *sets,REP_SET *find)
...@@ -5528,7 +5529,7 @@ static int find_set(REP_SETS *sets,REP_SET *find) ...@@ -5528,7 +5529,7 @@ static int find_set(REP_SETS *sets,REP_SET *find)
/* find if there is a found_set with same table_offset & found_offset /* find if there is a found_set with same table_offset & found_offset
If there is return offset to it, else add new offset and return pos. If there is return offset to it, else add new offset and return pos.
Pos returned is -offset-2 in found_set_structure because it's is Pos returned is -offset-2 in found_set_structure because it is
saved in set->next and set->next[] >= 0 points to next set and saved in set->next and set->next[] >= 0 points to next set and
set->next[] == -1 is reserved for end without replaces. set->next[] == -1 is reserved for end without replaces.
*/ */
......
...@@ -2,114 +2,118 @@ ...@@ -2,114 +2,118 @@
Overview Overview
-------- --------
Stress script is designed to perform testsing of mysql server in The stress script is designed to perform testing of the MySQL server in
multi-thread environment. a multi-threaded environment.
Stress script allows: All functionality regarding stress testing is implemented in the
mysql-stress-test.pl script.
- to use for stress testing mysqltest binary as test engine
- to use for stress testing both regular test suite and any The stress script allows:
additional test suites (e.g. mysql-test-extra-5.0)
- to specify files with lists of tests both for initialization of - To stress test the mysqltest binary test engine.
stress db and for further testing itself - To stress test the regular test suite and any additional test suites
- to define number of threads that will be concurrently used in testing (such as mysql-test-extra-5.0).
- to define limitations for test run. e.g. number of tests or loops - To specify files with lists of tests both for initialization of
for execution or duration of testing, delay between test executions, etc. stress db and for further testing itself.
- to get readable log file which can be used for identification of - To define the number of threads to be concurrently used in testing.
errors arose during testing - To define limitations for the test run. such as the number of tests or
loops for execution or duration of testing, delay between test
All functionality regarding stress testing was implemeted in executions, and so forth.
mysql-stress-test.pl script and there are two ways to run stress test: - To get a readable log file that can be used for identification of
errors that occur during testing.
- for most cases it is enough to use options below for starting of
stress test from mysql-test-run wrapper. In this case server will There are two ways to run the mysql-stress-test.pl script:
be run automatically, all preparation steps will be performed
and after that stress test will be started. - For most cases, it is enough to use the options below for starting
the stress test from the mysql-test-run wrapper. In this case, the
- in advanced case one can run mysql-stress-test.pl script directly. server is run automatically, all preparation steps are performed,
But it requires to perform some preparation steps and to specify a and after that the stress test is started.
bunch of options as well so this way may look a bit complicate.
- In advanced case, you can run the mysql-stress-test.pl script directly.
But this requires that you perform some preparation steps and to specify
a bunch of options as well, so this invocation method may be a bit
complicated.
Usage Usage
----- -----
Below is list of stress test specific options for mysql-test-run: The following mysql-test-run options are specific to stress-testing:
--stress --stress
Enable stress mode Enable stress mode
--stress-suite=<suite name> --stress-suite=<suite name>
Test suite name that will be used in stress testing. Test suite name to use in stress testing. We assume that all suites
We assume that all suites are located in mysql-test/suite directory are located in the mysql-test/suite directory.
There is one special suite name - <main|default> that corresponds There is one special suite name - <main|default> that corresponds
to regular test suite located in mysql-test directory. to the regular test suite located in the mysql-test directory.
--stress-threads=<number of threads> --stress-threads=<number of threads>
Number of threads that will be used in stress testing The number of threads to use in stress testing.
--stress-tests-file=<filename with list of tests> --stress-tests-file=<filename with list of tests>
Filename with list of tests(without .test suffix) that will be used in The file that contains the list of tests (without .test suffix) to use in
stress testing. Default filename is stress_tests.txt and default stress testing. The default filename is stress_tests.txt and the default
location of this file is suite/<suite name>/stress_tests.txt location of this file is suite/<suite name>/stress_tests.txt
--stress-init-file=<filename with list of tests> --stress-init-file=<filename with list of tests>
Filename with list of tests(without .test suffix) that will be used in The file that contains list of tests (without .test suffix) to use in
stress testing for initialization of stress db. These tests will be stress testing for initialization of the stress db. These tests will be
executed only once before starting of test itself. Default filename executed only once before starting the test itself. The default filename
is stress_init.txt and default location of this file is is stress_init.txt and the default location of this file is
suite/<suite name>/stress_init.txt suite/<suite name>/stress_init.txt
--stress-mode=<method which will be used for choosing tests from the list> --stress-mode=<method which will be used for choosing tests from the list>
Possible values are: random(default), seq Possible values are: random(default), seq
There are two possible modes which affect order of selecting of tests There are two possible modes that affect the order of test selection
from the list: from the list:
- in random mode tests will be selected in random order - In random mode, tests are selected in random order
- in seq mode each thread will execute tests in the loop one by one as - In seq mode, each thread executes tests in a loop one by one in
they specified in the list file. the order specified in the list file.
--stress-test-count= <number> --stress-test-count=<number>
Total number of tests that will be executed concurrently by all threads Total number of tests that will be executed concurrently by all threads
--stress-loop-count= <number> --stress-loop-count=<number>
Total number of loops in seq mode that will be executed concurrently Total number of loops in seq mode that will be executed concurrently
by all threads by all threads
--stress-test-duration= <number> --stress-test-duration=<number>
Duration of stress testing in seconds Duration of stress testing in seconds
Examples Examples
-------- --------
1. Example of simple command line to start stress test: 1. Example of a simple command line to start a stress test:
mysql-test-run --stress alias mysql-test-run --stress alias
Runs stress test with default values for number of threads and number of tests, Runs a stress test with default values for number of threads and number
with test 'alias' from suite 'main'. of tests, with test 'alias' from suite 'main'.
2. Using in stress testing tests from other suites: 2. Using in stress testing tests from other suites:
- mysql-test-run --stress --stress-threads=10 --stress-test-count=1000 \ - mysql-test-run --stress --stress-threads=10 --stress-test-count=1000 \
--stress-suite=example --stress-tests-file=testslist.txt --stress-suite=example --stress-tests-file=testslist.txt
Will run stress test with 10 threads, will execute 1000 tests by all Runs a stress test with 10 threads, executes 1000 tests by all
threads, test will be used from suite 'example', list of test will be threads, tests are used from suite 'example', the list of tests is
taken from file 'testslist.txt' taken from file 'testslist.txt'
- mysql-test-run --stress --stress-threads=10 --stress-test-count=1000 \ - mysql-test-run --stress --stress-threads=10 --stress-test-count=1000 \
--stress-suite=example sum_distinct --stress-suite=example sum_distinct
Will run stress test with 10 threads, will execute 1000 tests by all Runs stress test with 10 threads, executes 1000 tests by all
threads, test will be used from suite 'example', list of test contains threads, tests are used from suite 'example', the list of tests
only one test 'sum_distinct' contains only one test 'sum_distinct'
3. Debugging of issues found with stress test 3. Debugging of issues found with stress test
Right now stress test is not fully integrated in mysql-test-run Right now, the stress test is not fully integrated in mysql-test-run
and does not support --gdb option so to debug issue found with stress and does not support the --gdb option. To debug issues found with the
test you have to start separately mysql server under debuger and then stress test, you must start the MySQL server separately under a debugger
run stress test as: and then run the stress test like this:
- mysql-test-run --extern --stress --stress-threads=10 \ - mysql-test-run --extern --stress --stress-threads=10 \
--stress-test-count=1000 --stress-suite=example \ --stress-test-count=1000 --stress-suite=example \
......
...@@ -14,16 +14,17 @@ ...@@ -14,16 +14,17 @@
# #
# Design of stress script should allow one: # Design of stress script should allow one:
# #
# - to use for stress testing mysqltest binary as test engine # - To stress test the mysqltest binary test engine.
# - to use for stress testing both regular test suite and any # - To stress test the regular test suite and any additional test suites
# additional test suites (e.g. mysql-test-extra-5.0) # (such as mysql-test-extra-5.0).
# - to specify files with lists of tests both for initialization of # - To specify files with lists of tests both for initialization of
# stress db and for further testing itself # stress db and for further testing itself.
# - to define number of threads that will be concurrently used in testing # - To define the number of threads to be concurrently used in testing.
# - to define limitations for test run. e.g. number of tests or loops # - To define limitations for the test run. such as the number of tests or
# for execution or duration of testing, delay between test executions, etc. # loops for execution or duration of testing, delay between test
# - to get readable log file which can be used for identification of # executions, and so forth.
# errors arose during testing # - To get a readable log file that can be used for identification of
# errors that occur during testing.
# #
# Basic scenarios: # Basic scenarios:
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment