Fix PXC_QA framework to work with Pstress instead of Pquery (#11)

* Fix PXC-QA Framework to work with Pstress instead of Pquery.

Author: kaushikpuneet07

README.md

@@ -15,16 +15,16 @@ config.ini
 ```
 [config]
 workdir = /dev/shm/qa
-basedir = /dev/shm/qa/Percona-XtraDB-Cluster_8.0.19-10.1_Linux.x86_64.el7
+basedir = /dev/shm/qa/PXC_tarball
 server=pxc
 node = 3
 user = root
 ps1_socket = /tmp/psnode1.sock
 ps2_socket = /tmp/psnode2.sock
 ps3_socket = /tmp/psnode3.sock
 pt_basedir = /dev/shm/qa/percona-toolkit-3.0.10
-pquery_bin = /dev/shm/qa/pquery3-pxc
-pquery_grammer_file = /dev/shm/qa/grammer.sql
+pstress_bin = /dev/shm/qa/pstress/src/pstress-pxc
+pstress_grammar_file = /dev/shm/qa/pstress/src/grammar.sql
 
 [sysbench]
 sysbench_user=sysbench

config.ini

@@ -1,15 +1,15 @@
 [config]
 workdir = /dev/shm/qa
-basedir = /dev/shm/qa/Percona-XtraDB-Cluster-5.7.25-rel28-31.35.1.Linux.x86_64.ssl100
+basedir = /dev/shm/qa/PXC_tarball
 server=pxc
 node = 3
 user = root
 ps1_socket = /tmp/psnode1.sock
 ps2_socket = /tmp/psnode2.sock
 ps3_socket = /tmp/psnode3.sock
 pt_basedir = /dev/shm/qa/percona-toolkit-3.0.10
-pquery_bin = /dev/shm/qa/pquery3-pxc
-pquery_grammer_file = /dev/shm/qa/grammer.sql
+pstress_bin = /dev/shm/qa/pstress/src/pstress-pxc
+pstress_grammar_file = /dev/shm/qa/pstress/src/grammar.sql
 
 [sysbench]
 sysbench_user=sysbench

config.py

@@ -13,8 +13,8 @@
 PS2_SOCKET = config['config']['ps2_socket']
 PS3_SOCKET = config['config']['ps3_socket']
 PT_BASEDIR = config['config']['pt_basedir']
-PQUERY_BIN = config['config']['pquery_bin']
-PQUERY_GRAMMER_FILE = config['config']['pquery_grammer_file']
+PSTRESS_BIN = config['config']['pstress_bin']
+PSTRESS_GRAMMAR_FILE = config['config']['pstress_grammar_file']
 SYSBENCH_USER = config['sysbench']['sysbench_user']
 SYSBENCH_PASS = config['sysbench']['sysbench_pass']
 SYSBENCH_DB = config['sysbench']['sysbench_db']

pquery3/pquery3-run.ini renamed to pstress/pstress-run.ini

@@ -1,7 +1,7 @@
 [config]
-workdir = /qa/pxc
+workdir = $HOME/qa/pxc/pxc_runs
 rundir = /dev/shm
-basedir = /qa/pxc/Percona-XtraDB-Cluster-5.7.25-rel28-31.35.1.Linux.x86_64.ssl100
+basedir = /dev/shm/qa/PXC_tarball
 server = pxc
 node = 3
 user = root
@@ -11,9 +11,9 @@ save_trials_with_core = 0
 encryption = yes
 myextra = ''
 
-[pquery]
-pquery_bin = /qa/pxc/pquery2-pxc
-pquery_base_config = /qa/pxc/pquery3-single-pxc.cfg
+[pstress]
+pstress_bin = /dev/shm/qa/pstress/src/pstress-pxc
+pstress_base_config = /dev/shm/qa/pstress/pstress/pstress-cluster-pxc.cfg
 tables = 30
 records = 200
 seed = 200
@@ -27,4 +27,4 @@ primary_key_probablity = 100
 
 [upgrade]
 pxc_lower_base = /dev/shm/qa/Percona-XtraDB-Cluster-5.6.44-rel86.0-28.34-debug..Linux.x86_64
-pxc_upper_base = /dev/shm/qa/Percona-XtraDB-Cluster-5.7.25-rel28-31.35.1.Linux.x86_64.ssl100
+pxc_upper_base = /dev/shm/qa/Percona-XtraDB-Cluster-5.7.25-rel28-31.35.1.Linux.x86_64.ssl100

pquery3/pquery3-run.py renamed to pstress/pstress-run.py

@@ -12,7 +12,7 @@
 
 # Reading initial configuration
 config = configparser.ConfigParser()
-config.read('pquery3-run.ini')
+config.read('pstress-run.ini')
 
 WORKDIR = config['config']['workdir']
 RUNDIR = config['config']['rundir']
@@ -25,21 +25,21 @@
 SAVE_TRIALS_WITH_CORE = config['config']['save_trials_with_core']
 ENCRYPTION = config['config']['encryption']
 MY_EXTRA = config['config']['myextra']
-PQUERY_BIN = config['pquery']['pquery_bin']
-PQUERY_BASE_CONFIG = config['pquery']['pquery_base_config']
-TABLES = config['pquery']['tables']
-RECORDS = config['pquery']['records']
-SEED = config['pquery']['seed']
-RECREATE_TABLE = config['pquery']['recreate_table']
-OPTIMIZE = config['pquery']['optimize']
-RENAME_COLUMN = config['pquery']['rename_column']
-ADD_INDEX = config['pquery']['add_index']
-DROP_INDEX = config['pquery']['drop_index']
-ADD_COLUMN = config['pquery']['add_column']
-PRIMARY_KEY_PROBABLITY = config['pquery']['primary_key_probablity']
+PSTRESS_BIN = config['pstress']['pstress_bin']
+PSTRESS_BASE_CONFIG = config['pstress']['pstress_base_config']
+TABLES = config['pstress']['tables']
+RECORDS = config['pstress']['records']
+SEED = config['pstress']['seed']
+RECREATE_TABLE = config['pstress']['recreate_table']
+OPTIMIZE = config['pstress']['optimize']
+RENAME_COLUMN = config['pstress']['rename_column']
+ADD_INDEX = config['pstress']['add_index']
+DROP_INDEX = config['pstress']['drop_index']
+ADD_COLUMN = config['pstress']['add_column']
+PRIMARY_KEY_PROBABLITY = config['pstress']['primary_key_probablity']
 
 
-class PQueryRun:
+class PstressRun:
     def printit(self, text):
         now = datetime.now().strftime("%H:%M:%S ")
         print(now + ' ' + f'{text:100}')
@@ -67,10 +67,10 @@ def stop_server(self, node):
 
 
 print("-------------------------")
-print("\nPXC pquery run         ")
+print("\nPXC pstress run         ")
 print("-------------------------")
-pquery_run = PQueryRun()
+pstress_run = PstressRun()
 if SERVER == "pxc":
-    pquery_run.start_server(NODE)
+    pstress_run.start_server(NODE)
 elif SERVER == "ps":
-    pquery_run.start_server(1)
+    pstress_run.start_server(1)

randgen/util/reducer/reducer.sh

@@ -27,10 +27,10 @@ SKIPSTAGE=0
 TEXT="strcmp"
 #TEXT="\|      0 \|      7 \|"  # Example of CLI output for MODE5
 #TEXT="\| i      \|"
-PQUERY_MOD=0
-PQUERY_LOC=~/percona-qa/pquery/pquery
+PSTRESS_MOD=0
+PSTRESS_LOC="/dev/shm/qa/pstress"
 PXC_DOCKER_FIG_MOD=0
-PXC_DOCKER_FIG_LOC=~/percona-qa/pxc-pquery/existing/fig.yml
+#PXC_DOCKER_FIG_LOC=~/percona-qa/pxc/existing/fig.yml --> Deprecated
 PXC_ISSUE_NODE=0
 MODE5_COUNTTEXT=1
 MODE5_ADDITIONAL_TEXT=""
@@ -62,11 +62,11 @@ FORCE_SKIPV=0
 # - TEXT: Text to look for in MODEs 1,2,3,5,6,7,8. Ignored in MODEs 4 and 9. 
 #   Can contain egrep+regex syntax like "^ERROR|some_other_string". Remember this is regex: specify | as \| etc. 
 #   For MODE5, you would use a mysql CLI to get the desired output "string" (see example given above) and then set MODE5_COUNTTEXT
-# - PQUERY_MOD: 1: use pquery, 0: use mysql CLI. Causes reducer.sh to use pquery instead of the mysql client for replays (default=0). Supported for MODE=1,3,4
-# - PQUERY_LOC: Location of the pquery binary
+# - PSTRESS_MODE: 1: use pstress, 0: use mysql CLI. Causes reducer.sh to use pstress instead of the mysql client for replays (default=0). Supported for MODE=1,3,4
+# - PSTRESS_LOC: Location of the pstress binary
 # - PXC_DOCKER_FIG_MOD: 1: use Fig + Docker to bring up 3 node Percona XtraDB Cluster instead of default server, 0: use default non-cluster server (mysqld)
-#   see lp:/percona-qa/pxc-pquery/new/pxc-pquery_info.txt and lp:/percona-qa/docker_info.txt for more information on this. See above for some limitations etc.
-#   IMPORTANT NOTE: If this is set to 1, ftm, these settings (and limitations) are automatically set: INHERENT: PQUERY_MOD=1, LIMTATIONS: FORCE_SPORADIC=0, 
+#   see lp:/percona-qa/pxc-query/new/pxc-pquery_info.txt and lp:/percona-qa/docker_info.txt for more information on this. See above for some limitations etc. 
+#   IMPORTANT NOTE: If this is set to 1, ftm, these settings (and limitations) are automatically set: INHERENT: PSTRESS_MOD=1, LIMTATIONS: FORCE_SPORADIC=0, 
 #   SPORADIC=0, FORCE_SKIPV=0, SKIPV=1, MYEXTRA="", MULTI_THREADS=0 
 # - PXC_ISSUE_NODE: This indicates which node you would like to be checked for presence of the issue. 0 = Any node. Valid options: 0, 1, 2, or 3. Only works
 #   for MODE=4 currently.
@@ -372,7 +372,7 @@ options_check(){
     SPORADIC=0
     FORCE_SKIPV=0
     SKIPV=1
-    PQUERY_MOD=1
+    PSTRESS_MOD=1
     MYEXTRA=""
     if [ ! -r $PXC_DOCKER_FIG_LOC ]; then
       echo "Error: PXC_DOCKER_FIG_MOD is set to 1, but the Fig file (as defined by PXC_DOCKER_FIG_LOC; currently set to '$PXC_DOCKER_FIG_LOC') is not available."
@@ -381,7 +381,7 @@ options_check(){
     fi
     if [ $MODE -eq 1 -o $MODE -eq 6 ]; then
       echo "Error: Valgrind for 3 node PXC replay has not been implemented yet. Please do so! Free cookies afterwards!"
-      echo "Starting tip: this would involve creating a new lp:percona-qa/pxc-pquery/ Fig+Docker setup that has Valgrind build in"
+      echo "Starting tip: this would involve creating a new lp:percona-qa/pxc-pstress/ Fig+Docker setup that has Valgrind build in"
       exit 1
     fi
     if [ $MODE -ge 6 -a $MODE -le 9 ]; then
@@ -404,10 +404,10 @@ options_check(){
       fi
     fi
   fi
-  if [ $PQUERY_MOD -eq 1 ]; then
-    if [ ! -r $PQUERY_LOC ]; then
-      echo "Error: PQUERY_MOD is set to 1, but the pquery binary (as defined by PQUERY_LOC; currently set to '$PQUERY_LOC') is not available."
-      echo 'Please check script contents/options ($PQUERY_MOD and $PQUERY_LOC variables)'
+  if [ $PSTRESS_MOD -eq 1 ]; then
+    if [ ! -r $PSTRESS_LOC ]; then
+      echo "Error: PSTRESS_MOD is set to 1, but the pstress binary (as defined by PSTRESS_LOC; currently set to '$PSTRESS_LOC') is not available."
+      echo 'Please check script contents/options ($PSTRESS_MOD and $PSTRESS_LOC variables)'
       exit 1
     fi
   fi
@@ -902,7 +902,7 @@ init_mysql_dir(){
   if [ $PXC_DOCKER_FIG_MOD -eq 1 ]; then
     sudo rm -Rf $WORKD/data/*
     cp $PXC_DOCKER_FIG_LOC $WORKD
-    sed -i "s|/dev/shm/pxc-pquery|$WORKD/data/|" $WORKD/fig.yml
+    sed -i "s|/dev/shm/pxc-pstress|$WORKD/data/|" $WORKD/fig.yml
   else
     rm -Rf $WORKD/data/*
     if [ "$MULTI_REDUCER" != "1" ]; then  # This is a parent/main reducer
@@ -1229,9 +1229,9 @@ run_sql_code(){
       cat $WORKT | $MYBASE/bin/mysql -uroot -S$WORKD/socket.sock -vvv --force test > $WORKD/mysql.out 2>&1
     fi
   else
-    # Could MODE=2 (CLI output capture) be extended to cater for pquery replay? Untill this research is done, just use client CLI for replay only.
+    # Could MODE=2 (CLI output capture) be extended to cater for pstress replay? Untill this research is done, just use client CLI for replay only.
     # Obviously with the same issues/limiations that the CLI comes with; a mis-matched single or double quote will fail re-play if the original
-    # issue was generated by pquery. Reason; pquery is C/API driven, each statement executed is a statement in and by itself. In the CLI OTOH. each
+    # issue was generated by pstress. Reason; pstress is C/API driven, each statement executed is a statement in and by itself. In the CLI OTOH. each
     # statement can be continued on the next line, and a mismatched (i.e. unterminated) single or double quote in the sql file can throw off the replay.
     if [ $MODE -eq 2 ]; then
       if [ $PXC_DOCKER_FIG_MOD -eq 1 ]; then
@@ -1240,12 +1240,12 @@ run_sql_code(){
         cat $WORKT | $MYBASE/bin/mysql -uroot -S$WORKD/socket.sock --binary-mode --force test > $WORKD/mysql.out 2>&1
       fi
     else
-      if [ $PQUERY_MOD -eq 1 ]; then
+      if [ $PSTRESS_MOD -eq 1 ]; then
         export LD_LIBRARY_PATH=${MYBASE}/lib
         if [ $PXC_DOCKER_FIG_MOD -eq 1 ]; then
-          ${PQUERY_LOC} --infile=$WORKT --database=test --threads=1 --no-shuffle --user=root --addr=127.0.0.1 --port=10000 > $WORKD/pquery.out 2>&1
+          ${PSTRESS_LOC} --infile=$WORKT --database=test --threads=1 --no-shuffle --user=root --addr=127.0.0.1 --port=10000 > $WORKD/pstress.out 2>&1
         else
-          ${PQUERY_LOC} --infile=$WORKT --database=test --threads=1 --no-shuffle --user=root --socket=$WORKD/socket.sock > $WORKD/pquery.out 2>&1
+          ${PSTRESS_LOC} --infile=$WORKT --database=test --threads=1 --no-shuffle --user=root --socket=$WORKD/socket.sock > $WORKD/pstress.out 2>&1
         fi
       else
         if [ $PXC_DOCKER_FIG_MOD -eq 1 ]; then

suite/random_qa/pquery_crash_recovery_qa.py renamed to suite/random_qa/pstress_crash_recovery_qa.py

@@ -5,6 +5,7 @@
 import time
 import subprocess
 import itertools
+import random
 cwd = os.path.dirname(os.path.realpath(__file__))
 parent_dir = os.path.normpath(os.path.join(cwd, '../../'))
 sys.path.insert(0, parent_dir)
@@ -22,10 +23,10 @@
 args = parser.parse_args()
 if args.encryption_run is True:
     encryption = 'YES'
-    PQUERY_EXTRA = ""
+    PSTRESS_EXTRA = ""
 else:
     encryption = 'NO'
-    PQUERY_EXTRA = "--no-enc"
+    PSTRESS_EXTRA = "--no-encryption"
 
 if args.debug is True:
     debug = 'YES'
@@ -35,9 +36,9 @@
 utility_cmd = utility.Utility(debug)
 utility_cmd.check_python_version()
 
-class RandomPQueryQA:
+class RandomPstressQA:
     def start_pxc(self):
-        # Start PXC cluster for pquery run
+        # Start PXC cluster for pstress run
         dbconnection_check = db_connection.DbConnection(USER, WORKDIR + '/node1/mysql.sock')
         server_startup = pxc_startup.StartCluster(parent_dir, WORKDIR, BASEDIR, int(NODE), debug)
         result = server_startup.sanity_check()
@@ -80,19 +81,20 @@ def startup_check(self, cluster_node):
                 break  # break the loop if mysqld is running
 
     def data_load(self, socket, db):
-        # pquery crash recovery qa
+        # pstress crash recovery qa
         self.start_pxc()
+        n = random.randint(10000, 99999)
         for i in range(1, 10):
-            PQUERY_CMD = PQUERY_BIN + " --database=" + db + " --threads=50 --logdir=" + \
+            PSTRESS_CMD = PSTRESS_BIN + " --database=" + db + " --threads=50 --logdir=" + \
                          WORKDIR + "/log --log-all-queries --log-failed-queries --user=root --socket=" + \
-                         socket + " --seed 1000 --tables 25 --records 1000 " + \
-                         PQUERY_EXTRA + " --seconds 300 --undo-tbs-count 0  --sql-file " + \
-                         PQUERY_GRAMMER_FILE + " --step " + str(i) + " > " + \
-                         WORKDIR + "/log/pquery_run.log"
-            utility_cmd.check_testcase(0, "PQUERY RUN command : " + PQUERY_CMD)
-            query_status = os.system(PQUERY_CMD)
+                         socket + " --seed " + str(n) + " --tables 25 --records 1000 " + \
+                         PSTRESS_EXTRA + " --seconds 300 --grammar-file " + \
+                         PSTRESS_GRAMMAR_FILE + " --step " + str(i) + " > " + \
+                         WORKDIR + "/log/pstress_run.log"
+            utility_cmd.check_testcase(0, "PSTRESS RUN command : " + PSTRESS_CMD)
+            query_status = os.system(PSTRESS_CMD)
             if int(query_status) != 0:
-                utility_cmd.check_testcase(1, "ERROR!: PQUERY run is failed")
+                utility_cmd.check_testcase(1, "ERROR!: PSTRESS run failed")
             # kill existing mysqld process
             if debug == 'YES':
                 print("Killing existing mysql process using 'kill -9' command")
@@ -110,11 +112,11 @@ def data_load(self, socket, db):
                 self.startup_check(j)
 
 
-print("--------------------")
-print("PXC Random PQUERY QA")
-print("--------------------")
-random_pquery_qa = RandomPQueryQA()
-if not os.path.isfile(PQUERY_BIN):
-    print(PQUERY_BIN + ' does not exist')
+print("-----------------------------")
+print("PXC Crash Recovery PSTRESS QA")
+print("-----------------------------")
+random_pstress_qa = RandomPstressQA()
+if not os.path.isfile(PSTRESS_BIN):
+    print(PSTRESS_BIN + ' does not exist')
     exit(1)
-random_pquery_qa.data_load(WORKDIR + '/node1/mysql.sock', 'test')
+random_pstress_qa.data_load(WORKDIR + '/node1/mysql.sock', 'test')

suite/random_qa/pquery_random_qa.py renamed to suite/random_qa/pstress_random_qa.py

@@ -20,10 +20,10 @@
 args = parser.parse_args()
 if args.encryption_run is True:
     encryption = 'YES'
-    PQUERY_EXTRA = ""
+    PSTRESS_EXTRA = ""
 else:
     encryption = 'NO'
-    PQUERY_EXTRA = "--no-enc"
+    PSTRESS_EXTRA = "--no-encryption"
 
 if args.debug is True:
     debug = 'YES'
@@ -34,9 +34,9 @@
 utility_cmd.check_python_version()
 
 
-class RandomPQueryQA:
+class RandomPstressQA:
     def start_pxc(self):
-        # Start PXC cluster for pquery run
+        # Start PXC cluster for pstress run
         dbconnection_check = db_connection.DbConnection(USER, WORKDIR + '/node1/mysql.sock')
         server_startup = pxc_startup.StartCluster(parent_dir, WORKDIR, BASEDIR, int(NODE), debug)
         result = server_startup.sanity_check()
@@ -66,31 +66,31 @@ def start_pxc(self):
 
     def data_load(self, socket, db):
 
-        # pquery random load
+        # pstress random load
         threads = [16, 64, 512, 1024]
         tables = [16, 32, 64, 128]
         records = [100, 500, 1000]
         seeds = [100, 500, 1000]
         for thread, table, record, seed in \
                 itertools.product(threads, tables, records, seeds):
             self.start_pxc()
-            pquery_cmd = PQUERY_BIN + " --database=" + db + " --threads=" + str(table) + " --logdir=" + \
+            pstress_cmd = PSTRESS_BIN + " --database=" + db + " --threads=" + str(table) + " --logdir=" + \
                 WORKDIR + "/log --log-all-queries --log-failed-queries --user=root --socket=" + \
                 socket + " --seed " + str(seed) + " --tables " + str(table) + " " + \
-                PQUERY_EXTRA + " --seconds 300  --sql-file " + \
-                PQUERY_GRAMMER_FILE + " --records " + str(record) + "> " + \
-                WORKDIR + "/log/pquery_run.log"
-            utility_cmd.check_testcase(0, "PQUERY RUN command : " + pquery_cmd)
-            query_status = os.system(pquery_cmd)
+                PSTRESS_EXTRA + " --seconds 300  --grammar-file " + \
+                PSTRESS_GRAMMAR_FILE + " --records " + str(record) + "> " + \
+                WORKDIR + "/log/pstress_run.log"
+            utility_cmd.check_testcase(0, "PSTRESS RUN command : " + pstress_cmd)
+            query_status = os.system(pstress_cmd)
             if int(query_status) != 0:
-                utility_cmd.check_testcase(1, "ERROR!: PQUERY run is failed")
+                utility_cmd.check_testcase(1, "ERROR!: PSTRESS run is failed")
 
 
 print("--------------------")
-print("PXC Random PQUERY QA")
+print("PXC Random PSTRESS QA")
 print("--------------------")
-random_pquery_qa = RandomPQueryQA()
-if not os.path.isfile(PQUERY_BIN):
-    print(PQUERY_BIN + ' does not exist')
+random_pstress_qa = RandomPstressQA()
+if not os.path.isfile(PSTRESS_BIN):
+    print(PSTRESS_BIN + ' does not exist')
     exit(1)
-random_pquery_qa.data_load(WORKDIR + '/node1/mysql.sock', 'test')
+random_pstress_qa.data_load(WORKDIR + '/node1/mysql.sock', 'test')