Skip to content

Commit def715f

Browse files
inikepinikep
committed
PSTRESS-156: MYEXTRA are not used for server start
1. Rename `PXC_MYEXTRA` to `PXC_EXTRA`. 2. Rename `MYEXTRA` to `PS_EXTRA`. 3. Add support for `MYEXTRA` that is not modified by `pstress-run.sh`.
1 parent cd13b8f commit def715f

File tree

1 file changed

+46
-47
lines changed

1 file changed

+46
-47
lines changed

‎pstress/pstress-run.sh‎

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -815,25 +815,25 @@ pxc_startup(){
815815

816816
get_error_socket_file 1
817817
if [ $RR_MODE -ge 1 ]; then
818-
rr ${MYSQLD_BIN} --defaults-file=${DATADIR}/n1.cnf $STARTUP_OPTION $MYEXTRA $PXC_MYEXTRA --wsrep-new-cluster > ${ERR_FILE} 2>&1 &
818+
rr ${MYSQLD_BIN} --defaults-file=${DATADIR}/n1.cnf $STARTUP_OPTION $PS_EXTRA $PXC_EXTRA --wsrep-new-cluster > ${ERR_FILE} 2>&1 &
819819
elif [ $RR_MODE -eq 0 ]; then
820-
${MYSQLD_BIN} --defaults-file=${DATADIR}/n1.cnf $STARTUP_OPTION $MYEXTRA $PXC_MYEXTRA --wsrep-new-cluster > ${ERR_FILE} 2>&1 &
820+
${MYSQLD_BIN} --defaults-file=${DATADIR}/n1.cnf $STARTUP_OPTION $PS_EXTRA $PXC_EXTRA --wsrep-new-cluster > ${ERR_FILE} 2>&1 &
821821
fi
822822
pxc_startup_status 1
823823

824824
get_error_socket_file 2
825825
if [ $RR_MODE -ge 1 ]; then
826-
rr ${MYSQLD_BIN} --defaults-file=${DATADIR}/n2.cnf $STARTUP_OPTION $MYEXTRA $PXC_MYEXTRA > ${ERR_FILE} 2>&1 &
826+
rr ${MYSQLD_BIN} --defaults-file=${DATADIR}/n2.cnf $STARTUP_OPTION $PS_EXTRA $PXC_EXTRA > ${ERR_FILE} 2>&1 &
827827
elif [ $RR_MODE -eq 0 ]; then
828-
${MYSQLD_BIN} --defaults-file=${DATADIR}/n2.cnf $STARTUP_OPTION $MYEXTRA $PXC_MYEXTRA > ${ERR_FILE} 2>&1 &
828+
${MYSQLD_BIN} --defaults-file=${DATADIR}/n2.cnf $STARTUP_OPTION $PS_EXTRA $PXC_EXTRA > ${ERR_FILE} 2>&1 &
829829
fi
830830
pxc_startup_status 2
831831

832832
get_error_socket_file 3
833833
if [ $RR_MODE -ge 1 ]; then
834-
rr ${MYSQLD_BIN} --defaults-file=${DATADIR}/n3.cnf $STARTUP_OPTION $MYEXTRA $PXC_MYEXTRA > ${ERR_FILE} 2>&1 &
834+
rr ${MYSQLD_BIN} --defaults-file=${DATADIR}/n3.cnf $STARTUP_OPTION $PS_EXTRA $PXC_EXTRA > ${ERR_FILE} 2>&1 &
835835
elif [ $RR_MODE -eq 0 ]; then
836-
${MYSQLD_BIN} --defaults-file=${DATADIR}/n3.cnf $STARTUP_OPTION $MYEXTRA $PXC_MYEXTRA > ${ERR_FILE} 2>&1 &
836+
${MYSQLD_BIN} --defaults-file=${DATADIR}/n3.cnf $STARTUP_OPTION $PS_EXTRA $PXC_EXTRA > ${ERR_FILE} 2>&1 &
837837
fi
838838
pxc_startup_status 3
839839

@@ -865,9 +865,9 @@ gr_startup(){
865865
MID="${MYSQLD_BIN} --no-defaults --initialize-insecure --basedir=${BASEDIR}"
866866
if [ "$1" == "startup" ]; then
867867
if [ ${GRP_RPL_CLUSTER_RUN} -eq 1 ]; then
868-
MYEXTRA="$MYEXTRA --plugin-load=group_replication.so --group_replication_single_primary_mode=OFF"
868+
PS_EXTRA="${PS_EXTRA} --plugin-load=group_replication.so --group_replication_single_primary_mode=OFF"
869869
else
870-
MYEXTRA="$MYEXTRA --plugin-load=group_replication.so"
870+
PS_EXTRA="${PS_EXTRA} --plugin-load=group_replication.so"
871871
fi
872872
fi
873873
if [ "$1" == "startup" ]; then
@@ -1024,20 +1024,20 @@ fi
10241024
if [ ${ENCRYPTION_RUN} -eq 1 ]; then
10251025
if [ ${COMPONENT_KEYRING_FILE} -eq 1 -o ${COMPONENT_KEYRING_VAULT} -eq 1 -o ${COMPONENT_KEYRING_KMIP} -eq 1 ]; then
10261026
${MYSQLD_BIN} --defaults-file=$DATADIR_1/n1.cnf --basedir=${BASEDIR} --datadir=$DATADIR_1 \
1027-
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE1 $MYEXTRA > $ERR_FILE 2>&1 &
1027+
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE1 $PS_EXTRA > $ERR_FILE 2>&1 &
10281028
elif [ ${PLUGIN_KEYRING_FILE} -eq 1 ]; then
10291029
${MYSQLD_BIN} --defaults-file=$DATADIR_1/n1.cnf --basedir=${BASEDIR} --datadir=$DATADIR_1 \
1030-
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE1 $MYEXTRA ${KEYRING_PARAM} > $ERR_FILE 2>&1 &
1030+
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE1 $PS_EXTRA ${KEYRING_PARAM} > $ERR_FILE 2>&1 &
10311031
elif [ ${PLUGIN_KEYRING_VAULT} -eq 1 ]; then
10321032
${MYSQLD_BIN} --defaults-file=$DATADIR_1/n1.cnf --basedir=${BASEDIR} --datadir=$DATADIR_1 \
1033-
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE1 $MYEXTRA ${VAULT_PARAM} > $ERR_FILE 2>&1 &
1033+
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE1 $PS_EXTRA ${VAULT_PARAM} > $ERR_FILE 2>&1 &
10341034
else
10351035
echoit "ERROR: Atleast one encryption type must be enabled or else set ENCRYPTION_RUN=0 to continue"
10361036
exit 1
10371037
fi
10381038
else
10391039
${MYSQLD_BIN} --defaults-file=$DATADIR_1/n1.cnf --basedir=${BASEDIR} --datadir=$DATADIR_1 \
1040-
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE1 $MYEXTRA > $ERR_FILE 2>&1 &
1040+
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE1 $PS_EXTRA > $ERR_FILE 2>&1 &
10411041
fi
10421042
gr_startup_status 1
10431043

@@ -1066,20 +1066,20 @@ fi
10661066
if [ "${ENCRYPTION_RUN}" == "1" ]; then
10671067
if [ ${COMPONENT_KEYRING_FILE} -eq 1 -o ${COMPONENT_KEYRING_VAULT} -eq 1 -o ${COMPONENT_KEYRING_KMIP} -eq 1 ]; then
10681068
${MYSQLD_BIN} --defaults-file=$DATADIR_2/n2.cnf --basedir=${BASEDIR} --datadir=$DATADIR_2 \
1069-
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE2 $MYEXTRA > $ERR_FILE 2>&1 &
1069+
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE2 $PS_EXTRA > $ERR_FILE 2>&1 &
10701070
elif [ ${PLUGIN_KEYRING_FILE} -eq 1 ]; then
10711071
${MYSQLD_BIN} --defaults-file=$DATADIR_2/n2.cnf --basedir=${BASEDIR} --datadir=$DATADIR_2 \
1072-
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE2 $MYEXTRA ${KEYRING_PARAM} > $ERR_FILE 2>&1 &
1072+
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE2 $PS_EXTRA ${KEYRING_PARAM} > $ERR_FILE 2>&1 &
10731073
elif [ ${PLUGIN_KEYRING_VAULT} -eq 1 ]; then
10741074
${MYSQLD_BIN} --defaults-file=$DATADIR_2/n2.cnf --basedir=${BASEDIR} --datadir=$DATADIR_2 \
1075-
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE2 $MYEXTRA ${VAULT_PARAM} > $ERR_FILE 2>&1 &
1075+
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE2 $PS_EXTRA ${VAULT_PARAM} > $ERR_FILE 2>&1 &
10761076
else
10771077
echoit "ERROR: Atleast one encryption type must be enabled or else set ENCRYPTION_RUN=0 to continue"
10781078
exit 1
10791079
fi
10801080
else
10811081
${MYSQLD_BIN} --defaults-file=$DATADIR_2/n2.cnf --basedir=${BASEDIR} --datadir=$DATADIR_2 \
1082-
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE2 $MYEXTRA > $ERR_FILE 2>&1 &
1082+
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE2 $PS_EXTRA > $ERR_FILE 2>&1 &
10831083
fi
10841084

10851085
gr_startup_status 2
@@ -1108,20 +1108,20 @@ fi
11081108
if [ ${ENCRYPTION_RUN} -eq 1 ]; then
11091109
if [ ${COMPONENT_KEYRING_FILE} -eq 1 -o ${COMPONENT_KEYRING_VAULT} -eq 1 -o ${COMPONENT_KEYRING_KMIP} -eq 1 ]; then
11101110
${MYSQLD_BIN} --defaults-file=$DATADIR_3/n3.cnf --basedir=${BASEDIR} --datadir=$DATADIR_3 \
1111-
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE3 $MYEXTRA > $ERR_FILE 2>&1 &
1111+
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE3 $PS_EXTRA > $ERR_FILE 2>&1 &
11121112
elif [ ${PLUGIN_KEYRING_FILE} -eq 1 ]; then
11131113
${MYSQLD_BIN} --defaults-file=$DATADIR_3/n3.cnf --basedir=${BASEDIR} --datadir=$DATADIR_3 \
1114-
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE3 $MYEXTRA ${KEYRING_PARAM} > $ERR_FILE 2>&1 &
1114+
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE3 $PS_EXTRA ${KEYRING_PARAM} > $ERR_FILE 2>&1 &
11151115
elif [ ${PLUGIN_KEYRING_VAULT} -eq 1 ]; then
11161116
${MYSQLD_BIN} --defaults-file=$DATADIR_3/n3.cnf --basedir=${BASEDIR} --datadir=$DATADIR_3 \
1117-
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE3 $MYEXTRA ${VAULT_PARAM} > $ERR_FILE 2>&1 &
1117+
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE3 $PS_EXTRA ${VAULT_PARAM} > $ERR_FILE 2>&1 &
11181118
else
11191119
echoit "ERROR: Atleast one encryption type must be enabled or else set ENCRYPTION_RUN=0 to continue"
11201120
exit 1
11211121
fi
11221122
else
11231123
${MYSQLD_BIN} --defaults-file=$DATADIR_3/n3.cnf --basedir=${BASEDIR} --datadir=$DATADIR_3 \
1124-
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE3 $MYEXTRA > $ERR_FILE 2>&1 &
1124+
--core-file --log-error=$ERR_FILE --socket=$SOCKET --port=$RBASE3 $PS_EXTRA > $ERR_FILE 2>&1 &
11251125
fi
11261126

11271127
gr_startup_status 3
@@ -1163,6 +1163,7 @@ pstress_test(){
11631163
rm -Rf ${RUNDIR}/*
11641164
echoit "Generating new trial workdir ${RUNDIR}/${TRIAL}..."
11651165
ISSTARTED=0
1166+
PS_EXTRA="${MYEXTRA}"
11661167
if [[ ${PXC} -eq 0 && ${GRP_RPL} -eq 0 ]]; then
11671168
if check_for_version $MYSQL_VERSION "8.0.0" ; then
11681169
mkdir -p ${RUNDIR}/${TRIAL}/data ${RUNDIR}/${TRIAL}/tmp ${RUNDIR}/${TRIAL}/log # Cannot create /data/test, /data/mysql in 8.0
@@ -1190,14 +1191,12 @@ pstress_test(){
11901191
fi
11911192
fi
11921193
if [ "${COMPONENT_NAME:-}" == "component_js_lang" ]; then
1193-
MYEXTRA="--log_bin_trust_function_creators=ON" # Required for the stored functions or procedures created using DEFINER clause
1194-
else
1195-
MYEXTRA=
1194+
PS_EXTRA="${PS_EXTRA} --log_bin_trust_function_creators=ON" # Required for the stored functions or procedures created using DEFINER clause
11961195
fi
11971196
if [ "${ADD_RANDOM_OPTIONS}" == "" ]; then # Backwards compatibility for .conf files without this option
11981197
ADD_RANDOM_OPTIONS=0
11991198
fi
1200-
if [ ${ADD_RANDOM_OPTIONS} -eq 1 ]; then # Add random mysqld --options to MYEXTRA
1199+
if [ ${ADD_RANDOM_OPTIONS} -eq 1 ]; then # Add random mysqld --options to PS_EXTRA
12011200
OPTIONS_TO_ADD=
12021201
NR_OF_OPTIONS_TO_ADD=$(( RANDOM % MAX_NR_OF_RND_OPTS_TO_ADD + 1 ))
12031202
OPTION_NAME=()
@@ -1211,14 +1210,14 @@ pstress_test(){
12111210
OPTION_NAME+=(${OPTION_TO_ADD%=*})
12121211
fi
12131212
done
1214-
echoit "ADD_RANDOM_OPTIONS=1: adding mysqld option(s) ${OPTIONS_TO_ADD} to this run's MYEXTRA..."
1215-
MYEXTRA="${MYEXTRA} ${OPTIONS_TO_ADD}"
1216-
echo -e "${MYEXTRA}\n" > ${RUNDIR}/${TRIAL}/MYEXTRA
1213+
echoit "ADD_RANDOM_OPTIONS=1: adding mysqld option(s) ${OPTIONS_TO_ADD} to this run's PS_EXTRA..."
1214+
PS_EXTRA="${PS_EXTRA} ${OPTIONS_TO_ADD}"
1215+
echo -e "${PS_EXTRA}\n" > ${RUNDIR}/${TRIAL}/MYEXTRA
12171216
fi
12181217
if [ "${ADD_RANDOM_ROCKSDB_OPTIONS}" == "" ]; then # Backwards compatibility for .conf files without this option
12191218
ADD_RANDOM_ROCKSDB_OPTIONS=0
12201219
fi
1221-
if [ ${ADD_RANDOM_ROCKSDB_OPTIONS} -eq 1 ]; then # Add random rocksdb --options to MYEXTRA
1220+
if [ ${ADD_RANDOM_ROCKSDB_OPTIONS} -eq 1 ]; then # Add random rocksdb --options to PS_EXTRA
12221221
OPTIONS_TO_ADD=
12231222
NR_OF_OPTIONS_TO_ADD=$(( RANDOM % MAX_NR_OF_RND_OPTS_TO_ADD + 1 ))
12241223
OPTION_NAME=()
@@ -1232,12 +1231,12 @@ pstress_test(){
12321231
OPTION_NAME+=(${OPTION_TO_ADD%=*})
12331232
fi
12341233
done
1235-
echoit "ADD_RANDOM_ROCKSDB_OPTIONS=1: adding RocksDB mysqld option(s) ${OPTIONS_TO_ADD} to this run's MYEXTRA..."
1236-
MYEXTRA="${MYEXTRA} ${OPTIONS_TO_ADD}"
1237-
echo -e "${MYEXTRA}\n" > ${RUNDIR}/${TRIAL}/MYEXTRA
1234+
echoit "ADD_RANDOM_ROCKSDB_OPTIONS=1: adding RocksDB mysqld option(s) ${OPTIONS_TO_ADD} to this run's PS_EXTRA..."
1235+
PS_EXTRA="${PS_EXTRA} ${OPTIONS_TO_ADD}"
1236+
echo -e "${PS_EXTRA}\n" > ${RUNDIR}/${TRIAL}/MYEXTRA
12381237
fi
1239-
echo "${MYEXTRA}" | if grep -qi "innodb[_-]log[_-]checksum[_-]algorithm"; then
1240-
# Ensure that mysqld server startup will not fail due to a mismatched checksum algo between the original MID and the changed MYEXTRA options
1238+
echo "${PS_EXTRA}" | if grep -qi "innodb[_-]log[_-]checksum[_-]algorithm"; then
1239+
# Ensure that mysqld server startup will not fail due to a mismatched checksum algo between the original MID and the changed PS_EXTRA options
12411240
rm ${RUNDIR}/${TRIAL}/data/ib_log*
12421241
fi
12431242
PORT=$[50000 + ( $RANDOM % ( 9999 ) ) ]
@@ -1246,23 +1245,23 @@ pstress_test(){
12461245
rm -f ${PID_FILE}
12471246
if [ ${ENCRYPTION_RUN} -eq 1 ]; then
12481247
if [ ${PLUGIN_KEYRING_VAULT} -eq 1 ]; then
1249-
CMD="${MYSQLD_BIN} ${MYEXTRA} ${VAULT_PARAM} --basedir=${BASEDIR} --datadir=${RUNDIR}/${TRIAL}/data \
1248+
CMD="${MYSQLD_BIN} ${PS_EXTRA} ${VAULT_PARAM} --basedir=${BASEDIR} --datadir=${RUNDIR}/${TRIAL}/data \
12501249
--tmpdir=${RUNDIR}/${TRIAL}/tmp --core-file --port=$PORT --pid_file=${PID_FILE} --socket=${SOCKET} \
12511250
--log-output=none --log-error-verbosity=3 --log-error=${RUNDIR}/${TRIAL}/log/master.err"
12521251
elif [ ${PLUGIN_KEYRING_FILE} -eq 1 ]; then
1253-
CMD="${MYSQLD_BIN} ${MYEXTRA} ${KEYRING_PARAM} --basedir=${BASEDIR} --datadir=${RUNDIR}/${TRIAL}/data \
1252+
CMD="${MYSQLD_BIN} ${PS_EXTRA} ${KEYRING_PARAM} --basedir=${BASEDIR} --datadir=${RUNDIR}/${TRIAL}/data \
12541253
--tmpdir=${RUNDIR}/${TRIAL}/tmp --core-file --port=$PORT --pid_file=${PID_FILE} --socket=${SOCKET} \
12551254
--log-output=none --log-error-verbosity=3 --log-error=${RUNDIR}/${TRIAL}/log/master.err"
12561255
elif [ ${COMPONENT_KEYRING_FILE} -eq 1 -o ${COMPONENT_KEYRING_VAULT} -eq 1 -o ${COMPONENT_KEYRING_KMIP} -eq 1 ]; then
1257-
CMD="${MYSQLD_BIN} ${MYEXTRA} --basedir=${BASEDIR} --datadir=${RUNDIR}/${TRIAL}/data \
1256+
CMD="${MYSQLD_BIN} ${PS_EXTRA} --basedir=${BASEDIR} --datadir=${RUNDIR}/${TRIAL}/data \
12581257
--tmpdir=${RUNDIR}/${TRIAL}/tmp --core-file --port=$PORT --pid_file=${PID_FILE} --socket=${SOCKET} \
12591258
--log-output=none --log-error-verbosity=3 --log-error=${RUNDIR}/${TRIAL}/log/master.err"
12601259
else
12611260
echoit "ERROR: Atleast one encryption type must be enabled or else set ENCRYPTION_RUN=0 to continue"
12621261
exit 1
12631262
fi
12641263
else
1265-
CMD="${MYSQLD_BIN} ${MYEXTRA} --basedir=${BASEDIR} --datadir=${RUNDIR}/${TRIAL}/data \
1264+
CMD="${MYSQLD_BIN} ${PS_EXTRA} --basedir=${BASEDIR} --datadir=${RUNDIR}/${TRIAL}/data \
12661265
--tmpdir=${RUNDIR}/${TRIAL}/tmp --core-file --port=$PORT --pid_file=${PID_FILE} --socket=${SOCKET} \
12671266
--log-output=none --log-error-verbosity=3 --log-error=${RUNDIR}/${TRIAL}/log/master.err"
12681267
fi
@@ -1378,14 +1377,14 @@ pstress_test(){
13781377
fi
13791378
fi
13801379

1381-
PXC_MYEXTRA=
1382-
# === PXC Options Stage 1: Add random mysqld options to PXC_MYEXTRA
1380+
PXC_EXTRA=
1381+
# === PXC Options Stage 1: Add random mysqld options to PXC_EXTRA
13831382
if [ ${PXC_ADD_RANDOM_OPTIONS} -eq 1 ]; then
13841383
OPTIONS_TO_ADD=
13851384
NR_OF_OPTIONS_TO_ADD=$(( RANDOM % PXC_MAX_NR_OF_RND_OPTS_TO_ADD + 1 ))
13861385
OPTION_NAME=()
13871386
for X in $(seq 1 ${NR_OF_OPTIONS_TO_ADD}); do
1388-
OPTION_TO_ADD="$(shuf --random-source=/dev/urandom ${PXC_OPTIONS_INFILE} | head -n1)"
1387+
OPTION_TO_ADD="$(shuf --random-source=/dev/urandom ${PXC_OPTIONS_INFILE} | head -n1)"
13891388
if [ ${#OPTION_NAME[@]} -eq 0 ]; then
13901389
OPTIONS_TO_ADD="$OPTIONS_TO_ADD $OPTION_TO_ADD"
13911390
OPTION_NAME+=(${OPTION_TO_ADD%=*})
@@ -1394,26 +1393,26 @@ pstress_test(){
13941393
OPTION_NAME+=(${OPTION_TO_ADD%=*})
13951394
fi
13961395
done
1397-
echoit "PXC_ADD_RANDOM_OPTIONS=1: adding mysqld option(s) ${OPTIONS_TO_ADD} to this run's PXC_MYEXTRA..."
1398-
PXC_MYEXTRA="${OPTIONS_TO_ADD}"
1396+
echoit "PXC_ADD_RANDOM_OPTIONS=1: adding mysqld option(s) ${OPTIONS_TO_ADD} to this run's PXC_EXTRA..."
1397+
PXC_EXTRA="${OPTIONS_TO_ADD}"
13991398
fi
1400-
# === PXC Options Stage 2: Add random wsrep mysqld options to PXC_MYEXTRA
1399+
# === PXC Options Stage 2: Add random wsrep mysqld options to PXC_EXTRA
14011400
if [ ${PXC_WSREP_ADD_RANDOM_WSREP_MYSQLD_OPTIONS} -eq 1 ]; then
14021401
OPTIONS_TO_ADD=
14031402
NR_OF_OPTIONS_TO_ADD=$(( RANDOM % PXC_WSREP_MAX_NR_OF_RND_OPTS_TO_ADD + 1 ))
14041403
OPTION_NAME=()
14051404
for X in $(seq 1 ${NR_OF_OPTIONS_TO_ADD}); do
14061405
OPTION_TO_ADD="$(shuf --random-source=/dev/urandom ${PXC_WSREP_OPTIONS_INFILE} | head -n1)"
1407-
if [ ${#OPTION_NAME[@]} -eq 0 ]; then
1406+
if [ ${#OPTION_NAME[@]} -eq 0 ]; then
14081407
OPTIONS_TO_ADD="$OPTIONS_TO_ADD $OPTION_TO_ADD"
14091408
OPTION_NAME+=(${OPTION_TO_ADD%=*})
14101409
elif [[ ! ${OPTION_NAME[@]} =~ ${OPTION_TO_ADD%=*} ]]; then
14111410
OPTIONS_TO_ADD="$OPTIONS_TO_ADD $OPTION_TO_ADD"
14121411
OPTION_NAME+=(${OPTION_TO_ADD%=*})
14131412
fi
14141413
done
1415-
echoit "PXC_WSREP_ADD_RANDOM_WSREP_MYSQLD_OPTIONS=1: adding wsrep provider mysqld option(s) ${OPTIONS_TO_ADD} to this run's PXC_MYEXTRA..."
1416-
PXC_MYEXTRA="${PXC_MYEXTRA} ${OPTIONS_TO_ADD}"
1414+
echoit "PXC_WSREP_ADD_RANDOM_WSREP_MYSQLD_OPTIONS=1: adding wsrep provider mysqld option(s) ${OPTIONS_TO_ADD} to this run's PXC_EXTRA..."
1415+
PXC_EXTRA="${PXC_EXTRA} ${OPTIONS_TO_ADD}"
14171416
fi
14181417
# === PXC Options Stage 3: Add random wsrep (Galera) configuration options
14191418
if [ ${PXC_WSREP_PROVIDER_ADD_RANDOM_WSREP_PROVIDER_CONFIG_OPTIONS} -eq 1 ]; then
@@ -1433,7 +1432,7 @@ pstress_test(){
14331432
echoit "PXC_WSREP_PROVIDER_ADD_RANDOM_WSREP_PROVIDER_CONFIG_OPTIONS=1: adding wsrep provider configuration option(s) ${OPTIONS_TO_ADD} to this run..."
14341433
WSREP_PROVIDER_OPT="$OPTIONS_TO_ADD"
14351434
fi
1436-
echo "${MYEXTRA} ${KEYRING_PARAM} ${PXC_MYEXTRA}" > ${RUNDIR}/${TRIAL}/MYEXTRA
1435+
echo "${PS_EXTRA} ${KEYRING_PARAM} ${PXC_EXTRA}" > ${RUNDIR}/${TRIAL}/MYEXTRA
14371436
echo "${MYINIT}" > ${RUNDIR}/${TRIAL}/MYINIT
14381437
echo "$WSREP_PROVIDER_OPT" > ${RUNDIR}/${TRIAL}/WSREP_PROVIDER_OPT
14391438
pxc_startup

0 commit comments

Comments
 (0)