diff options
| author | Florian Fischer <florian.fl.fischer@fau.de> | 2019-08-11 22:02:37 +0200 |
|---|---|---|
| committer | Florian Fischer <florian.fl.fischer@fau.de> | 2019-08-11 22:02:37 +0200 |
| commit | f7d64e02af941515bc894dea10f55255d06cbcf7 (patch) | |
| tree | 8c249f73cd5593a750240bad1107695180a87e73 | |
| parent | 712ea6e1dece300cbdca0b30b07ed3957118a9bd (diff) | |
| download | allocbench-f7d64e02af941515bc894dea10f55255d06cbcf7.tar.gz allocbench-f7d64e02af941515bc894dea10f55255d06cbcf7.zip | |
fix and adjust to mysql installations on Ubuntu 18.04
| -rw-r--r-- | src/benchmarks/mysql.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/benchmarks/mysql.py b/src/benchmarks/mysql.py index a1c23f9..47d884f 100644 --- a/src/benchmarks/mysql.py +++ b/src/benchmarks/mysql.py @@ -21,7 +21,7 @@ cmd = ("sysbench oltp_read_only --threads={nthreads} --time=10 --tables=5 " "--db-driver=mysql --mysql-user=root --mysql-socket=" + cwd + "/mysql_test/socket run") -server_cmd = ("mysqld -h {0}/mysql_test --socket={0}/mysql_test/socket " +server_cmd = ("mysqld --no-defaults -h {0}/mysql_test --socket={0}/mysql_test/socket --port=123456 " "--max-connections={1} --secure-file-priv=").format(cwd, multiprocessing.cpu_count()) @@ -48,8 +48,9 @@ class Benchmark_MYSQL(Benchmark): os.makedirs("mysql_test") # Init database - if b"MariaDB" in subprocess.run(["mysqld", "--version"], - stdout=PIPE).stdout: + self.results["facts"]["mysqld"] = subprocess.run(["mysqld", "--version"], + stdout=PIPE).stdout + if b"MariaDB" in self.results["facts"]["mysqld"]: init_db_cmd = ["mysql_install_db", "--basedir=/usr", "--datadir="+cwd+"/mysql_test"] print_info2("MariaDB detected") @@ -61,7 +62,9 @@ class Benchmark_MYSQL(Benchmark): p = subprocess.run(init_db_cmd, stdout=PIPE, stderr=PIPE) if not p.returncode == 0: - print_debug(p.stderr, file=sys.stderr) + print_debug(init_db_cmd) + print_debug("Stdout:", p.stdout, file=sys.stdout) + print_debug("Stderr:", p.stderr, file=sys.stderr) raise Exception("Creating test DB failed with:", p.returncode) self.start_servers() @@ -71,9 +74,8 @@ class Benchmark_MYSQL(Benchmark): input=b"CREATE DATABASE sbtest;\n", stdout=PIPE, stderr=PIPE) - if not p.returncode == 0: + if p.returncode != 0: print_debug("Stderr:", p.stderr, file=sys.stderr) - self.terminate_server() raise Exception("Creating test tables failed with:", p.returncode) print_status("Prepare test tables ...") @@ -82,7 +84,6 @@ class Benchmark_MYSQL(Benchmark): if p.returncode != 0: print_debug("Stdout:", p.stdout, file=sys.stderr) print_debug("Stderr:", p.stderr, file=sys.stderr) - self.terminate_server() raise Exception("Preparing test tables failed with:", p.returncode) self.shutdown_servers() |