Segregate setup and running of stress test

Author: maksm90

run_tests.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #
-# Copyright (c) 2018, Postgres Professional
+# Copyright (c) 2019, Postgres Professional
 #
 # supported levels:
 #		* standard
@@ -55,7 +55,7 @@ fi
 
 # build and install PostgreSQL
 if [ "$LEVEL" = "hardcore" ] || \
-  [ "$LEVEL" = "nightmare" ]; then
+   [ "$LEVEL" = "nightmare" ]; then
 	# enable Valgrind support
 	sed -i.bak "s/\/* #define USE_VALGRIND *\//#define USE_VALGRIND/g" src/include/pg_config_manual.h
 
@@ -148,7 +148,8 @@ pip install -r tests/requirements.txt
 set -e #exit virtualenv with error code
 python tests/pg_qs_test_runner.py --port $PGPORT
 if [[ "$USE_TPCDS" == "1" ]]; then
-	python tests/pg_qs_test_runner.py --port $PGPORT --tpc-ds
+	python tests/pg_qs_test_runner.py --port $PGPORT --tpc-ds-setup
+	python tests/pg_qs_test_runner.py --port $PGPORT --tpc-ds-run
 fi
 deactivate
 set -x

tests/pg_qs_test_runner.py

@@ -86,9 +86,15 @@ def main(config):
 		key:config.__dict__[key] for key in ('host', 'port', 'user', 'database', 'password')
 	}
 
-	if config.use_tpcds:
+	if config.tpcds_setup:
+		print('Setup database for TPC-DS bench')
+		tpcds.setup_tpcds(conn_params)
+		print('Database is setup successfully')
+		return
+
+	if config.tpcds_run:
 		print('Starting stress test')
-		tpcds.test_tpc_ds(conn_params)
+		tpcds.run_tpcds(conn_params)
 		print('Stress finished successfully')
 		return
 
@@ -115,7 +121,8 @@ def main(config):
 	parser.add_argument('--user', dest='user', default='postgres', help='user name')
 	parser.add_argument('--database', dest='database', default='postgres', help='database name')
 	parser.add_argument('--password', dest='password', nargs=0, action=PasswordPromptAction, default='', help='password')
-	parser.add_argument('--tpc-ds', dest='use_tpcds', action='store_true', help='run only stress test based on TPC-DS benchmark')
+	parser.add_argument('--tpc-ds-setup', dest='tpcds_setup', action='store_true', help='setup database to run TPC-DS benchmark')
+	parser.add_argument('--tpc-ds-run', dest='tpcds_run', action='store_true', help='run only stress test based on TPC-DS benchmark')
 
 	args = parser.parse_args()
 	main(args)

tests/tpcds.py

@@ -48,22 +48,10 @@ def setup_tpcds(config):
 
 	print('done!')
 
-def test_tpc_ds(config):
+def run_tpcds(config):
 	"""TPC-DS stress test"""
 
-	setup_tpcds(config)
-
 	print('Preparing TPC-DS queries...')
-	# # Execute query in separate thread
-	# # with open('tmp_stress/tpcds-kit/tools/query_0.sql', 'r') as f:
-	# with open('tests/query_tpcds.sql', 'r') as f:
-	# 	sql = f.read()
-
-	# queries = sql.split(';')
-	# for i, query in enumerate(queries):
-	# 	queries[i] = query.replace('%','%%')
-	# 	if (len(query.strip()) == 0):
-	# 		del queries[i]
 	queries = []
 	for query_file in sorted(os.listdir('tmp_stress/tpcds-result-reproduction/query_qualification/')):
 		with open('tmp_stress/tpcds-result-reproduction/query_qualification/%s' % query_file, 'r') as f: