|
176 | 176 | fi |
177 | 177 | } |
178 | 178 |
|
| 179 | +# Incase, user starts pstress in RR mode, check if RR is installed on the machine |
| 180 | +if [ $RR_MODE -eq 1 ]; then |
| 181 | + echoit "Running pstress in RR mode. It is expected that pstress executions will be slower" |
| 182 | + if [[ ! -e `which rr` ]];then |
| 183 | + echo "rr package is not installed. Exiting" |
| 184 | + echo "Install rr: https://github.com/rr-debugger/rr/wiki/Building-And-Installing" |
| 185 | + exit 1 |
| 186 | + else |
| 187 | + perf_event_var=$(cat /proc/sys/kernel/perf_event_paranoid) |
| 188 | + if [ $perf_event_var -ne 1 ]; then |
| 189 | + echo "rr needs /proc/sys/kernel/perf_event_paranoid <=1, but it is $perf_event_var" |
| 190 | + echo "Change it to 1, consider running sudo sysctl -w kernel.perf_event_paranoid=1" |
| 191 | + echo "For more information https://github.com/rr-debugger/rr/wiki/Building-And-Installing" |
| 192 | + exit 1 |
| 193 | + fi |
| 194 | + fi |
| 195 | +fi |
| 196 | + |
179 | 197 | # Find mysqld binary |
180 | 198 | if [ -r ${BASEDIR}/bin/mysqld ]; then |
181 | 199 | BIN=${BASEDIR}/bin/mysqld |
@@ -480,15 +498,27 @@ pxc_startup(){ |
480 | 498 | sed -i "2i wsrep_cluster_address=gcomm://${PXC_LADDRS[1]},${PXC_LADDRS[2]},${PXC_LADDRS[3]}" ${DATADIR}/n3.cnf |
481 | 499 |
|
482 | 500 | get_error_socket_file 1 |
483 | | - ${BASEDIR}/bin/mysqld --defaults-file=${DATADIR}/n1.cnf $STARTUP_OPTION $MYEXTRA $PXC_MYEXTRA --wsrep-new-cluster > ${ERR_FILE} 2>&1 & |
| 501 | + if [ $RR_MODE -eq 1 ]; then |
| 502 | + rr ${BASEDIR}/bin/mysqld --defaults-file=${DATADIR}/n1.cnf $STARTUP_OPTION $MYEXTRA $PXC_MYEXTRA --wsrep-new-cluster > ${ERR_FILE} 2>&1 & |
| 503 | + elif [ $RR_MODE -eq 0 ]; then |
| 504 | + ${BASEDIR}/bin/mysqld --defaults-file=${DATADIR}/n1.cnf $STARTUP_OPTION $MYEXTRA $PXC_MYEXTRA --wsrep-new-cluster > ${ERR_FILE} 2>&1 & |
| 505 | + fi |
484 | 506 | pxc_startup_status 1 |
485 | 507 |
|
486 | 508 | get_error_socket_file 2 |
487 | | - ${BASEDIR}/bin/mysqld --defaults-file=${DATADIR}/n2.cnf $STARTUP_OPTION $MYEXTRA $PXC_MYEXTRA > ${ERR_FILE} 2>&1 & |
| 509 | + if [ $RR_MODE -eq 1 ]; then |
| 510 | + rr ${BASEDIR}/bin/mysqld --defaults-file=${DATADIR}/n2.cnf $STARTUP_OPTION $MYEXTRA $PXC_MYEXTRA > ${ERR_FILE} 2>&1 & |
| 511 | + elif [ $RR_MODE -eq 0 ]; then |
| 512 | + ${BASEDIR}/bin/mysqld --defaults-file=${DATADIR}/n2.cnf $STARTUP_OPTION $MYEXTRA $PXC_MYEXTRA > ${ERR_FILE} 2>&1 & |
| 513 | + fi |
488 | 514 | pxc_startup_status 2 |
489 | 515 |
|
490 | 516 | get_error_socket_file 3 |
491 | | - ${BASEDIR}/bin/mysqld --defaults-file=${DATADIR}/n3.cnf $STARTUP_OPTION $MYEXTRA $PXC_MYEXTRA > ${ERR_FILE} 2>&1 & |
| 517 | + if [ $RR_MODE -eq 1 ]; then |
| 518 | + rr ${BASEDIR}/bin/mysqld --defaults-file=${DATADIR}/n3.cnf $STARTUP_OPTION $MYEXTRA $PXC_MYEXTRA > ${ERR_FILE} 2>&1 & |
| 519 | + elif [ $RR_MODE -eq 0 ]; then |
| 520 | + ${BASEDIR}/bin/mysqld --defaults-file=${DATADIR}/n3.cnf $STARTUP_OPTION $MYEXTRA $PXC_MYEXTRA > ${ERR_FILE} 2>&1 & |
| 521 | + fi |
492 | 522 | pxc_startup_status 3 |
493 | 523 |
|
494 | 524 | if [ "$IS_STARTUP" == "startup" ]; then |
@@ -905,6 +935,9 @@ pstress_test(){ |
905 | 935 | --log-output=none --log-error-verbosity=3 --log-error=${RUNDIR}/${TRIAL}/log/master.err" |
906 | 936 | fi |
907 | 937 |
|
| 938 | + if [ $RR_MODE -eq 1 ]; then |
| 939 | + CMD="rr $CMD" |
| 940 | + fi |
908 | 941 | echo $CMD |
909 | 942 | $CMD > ${RUNDIR}/${TRIAL}/log/master.err 2>&1 & |
910 | 943 | MPID="$!" |
@@ -1481,19 +1514,21 @@ elif [[ ${PXC} -eq 1 || ${GRP_RPL} -eq 1 ]]; then |
1481 | 1514 | if ${BASEDIR}/bin/mysqladmin -uroot -S${WORKDIR}/node1.template/node1_socket.sock ping > /dev/null 2>&1; then |
1482 | 1515 | echoit "PXC node1.template started" ; |
1483 | 1516 | else |
1484 | | - echoit "Assert: PXC data template creation failed.." |
| 1517 | + echoit "Assert: PXC data template1 creation failed.." |
1485 | 1518 | exit 1 |
1486 | 1519 | fi |
| 1520 | + sleep 2 |
1487 | 1521 | if ${BASEDIR}/bin/mysqladmin -uroot -S${WORKDIR}/node2.template/node2_socket.sock ping > /dev/null 2>&1; then |
1488 | 1522 | echoit "PXC node2.template started" ; |
1489 | 1523 | else |
1490 | | - echoit "Assert: PXC data template creation failed.." |
| 1524 | + echoit "Assert: PXC data template2 creation failed.." |
1491 | 1525 | exit 1 |
1492 | 1526 | fi |
| 1527 | + sleep 2 |
1493 | 1528 | if ${BASEDIR}/bin/mysqladmin -uroot -S${WORKDIR}/node3.template/node3_socket.sock ping > /dev/null 2>&1; then |
1494 | 1529 | echoit "PXC node3.template started" ; |
1495 | 1530 | else |
1496 | | - echoit "Assert: PXC data template creation failed.." |
| 1531 | + echoit "Assert: PXC data template3 creation failed.." |
1497 | 1532 | exit 1 |
1498 | 1533 | fi |
1499 | 1534 | echoit "Created PXC data templates for pstress run.." |
|
0 commit comments