Merge pull request #21 from redhat-performance/log_disk

Log disk

Author: dvalinrh

README.md

@@ -19,6 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 arguments="$@"
+log_mount=""
 
 curdir=`pwd`
 if [[ $0 == "./"* ]]; then
@@ -51,6 +52,7 @@ test_name="hammerdb"
 setenforce 0
 tuned_original=""
 disks=none
+log_disks=""
 user=""
 fs="xfs"
 tools_git=https://github.com/redhat-performance/test_tools-wrappers
@@ -166,9 +168,25 @@ create_and_mount_fs()
 	mkdir /perf1
 	$TOOLS_BIN/create_filesystem --fs_type $fs --mount_dir /perf1 --device /dev/hammerdb/hammerdb
 	if [ $? -ne 0 ]; then
-		echo filesystem create failedd.
+		echo filesystem create failed.
 		exit 1
 	fi
+
+	if [[ $log_disks != "" ]]; then
+		log_disks=`echo $log_disks | sed "s/,/ /g"`
+		umount /perf2
+		mkdir /perf2
+		$TOOLS_BIN/lvm_create --devices "${log_disks}" --lvm_vol log_hammerdb --lvm_grp log_hammerdb --wipefs
+		if [ $? -ne 0 ]; then
+			echo LVM create of log disk failed.
+			exit 1
+		fi
+		$TOOLS_BIN/create_filesystem --fs_type $fs --mount_dir /perf2 --device /dev/log_hammerdb/log_hammerdb
+		if [ $? -ne 0 ]; then
+			echo filesystem create for log failed.
+			exit 1
+		fi
+	fi
 }
 
 #
@@ -179,6 +197,7 @@ ARGUMENT_LIST=(
 	"filesys"
 	"home_parent"
 	"iterations"
+	"log_disks"
 	"run_user"
 	"sub_test"
 	"tools_git"
@@ -220,6 +239,11 @@ while [[ $# -gt 0 ]]; do
                         iterations=${2}
 			shift 2
                 ;;
+		--log_disks)
+			log_mount="-M /perf2"
+			log_disks=${2}
+			shift 2
+		;;
 		--users)
 			setto=`echo $2 | sed "s/,/ /g"`
 			users_to_run="-u \"${setto}\""
@@ -270,7 +294,7 @@ if [[ $to_tuned_setting != "none" ]]; then
 	tuned-adm profile $to_tuned_setting
 fi
 cd $exec_dir
-echo ./run_hammerdb -m /perf1 -t ${test} ${users_to_run} ${warehouses} > run_this
+echo ./run_hammerdb -m /perf1 -t ${test} ${users_to_run} ${warehouses} ${log_mount} > run_this
 chmod 755 run_this
 ./run_this
 

gpl_license

@@ -23,6 +23,7 @@
 disks=none
 mountpoint=none
 db_type=none
+log_mount_point="none"
 
 install_mssql()
 {
@@ -97,9 +98,12 @@ install_mariadb()
 	#
 	# Clean up any residual stuff and set up the directories
 	#
-	rm -rf ${mountpoint}/mysql/*
+	rm -rf ${mountpoint}/mysql/* ${log_mount_point}/mysql/log
 	mkdir -p ${mountpoint}/mysql/data
 	chown -R mysql:mysql ${mountpoint}/mysql
+        mkdir -p ${log_mount_point}/mysql/log
+        chown -R mysql:mysql ${log_mount_point}/mysql
+
 
 	totmem=`cat /proc/meminfo | grep "MemTotal:" | awk '{print $2}'`
 	#
@@ -119,15 +123,15 @@ install_mariadb()
 	else
    		sed -i "s/^innodb_buffer_pool_size=.*/innodb_buffer_pool_size=64000M/" my.cnf
 	fi
+	sed -i "/innodb_file_per_table/a innodb_log_group_home_dir = ${log_mount_point}\/mysql\/log" my.cnf
 
 	/usr/bin/cp my.cnf /etc/my.cnf
 
 	systemctl restart mariadb.service
 
 	#echo "UPDATE mysql.user SET Password=PASSWORD('100yard-')  WHERE User='root';" > input
 	#echo "GRANT ALL ON *.* to root@'%' IDENTIFIED BY '100yard-';" >> input
-	echo "use mysql;" > input
-    echo "SET PASSWORD FOR 'root'@localhost = PASSWORD('mysql');" > input
+    	echo "SET PASSWORD FOR 'root'@localhost = PASSWORD('mysql');" > input
 	echo "flush privileges;" >> input
 	echo "exit" >> input
 
@@ -154,8 +158,13 @@ install_postgres()
 	ln -sf ${mountpoint}/postgres_data /var/lib/pgsql/data
 	chmod 700 ${mountpoint}/postgres_data
 	chown -R postgres:postgres ${mountpoint}/postgres_data
+        mkdir -p ${log_mount_point}/postgres_log
+        chown -R mysql:mysql ${log_mount_point}/postgres_log
 
 	postgresql-setup initdb
+	sleep 10
+	mv /var/lib/pgsql/data/pg_wal ${log_mount_point}/postgres_log
+	ln -sf ${log_mount_point}/postgres_log/pg_wal /var/lib/pgsql/data/pg_wal
 
 	totmem=`cat /proc/meminfo |grep "MemTotal:" | awk '{print $2}'`
 
@@ -220,6 +229,10 @@ do
 			disks=$2
 			shift 2
 		;;
+		-M)
+			log_mount_point=$2
+			shift 2
+		;;
 		-m)
 			mountpoint=$2
 			shift 2
@@ -284,6 +297,9 @@ else
 	echo ${mountpoint}
 fi
 
+if [[ $log_mount_point == "none" ]]; then
+	log_mount_point=${mountpoint}
+fi
 if [[ $db_type == "mssql" ]]; then
 	install_mssql
 	exit

hammerdb/hammerdb

@@ -25,6 +25,7 @@
 # mssql.
 #
 mountpoint=none
+log_mount_point=""
 disklist=none
 whc=""
 #Usercount="10 20 40 80 100"
@@ -86,9 +87,9 @@ install_it()
 			export disklist
 			export mountpoint
 			if [[ $mountpoint == *"none"* ]]; then
-				ssh root@${hostnm} "./install-script -d ${disklist} -t $1" &
+				ssh root@${hostnm} "./install-script -d ${disklist} -t $1 ${log_mount_point}" &
 			else
-				ssh root@${hostnm} "./install-script -m ${mountpoint} -t $1" & 
+				ssh root@${hostnm} "./install-script -m ${mountpoint} -t $1 ${log_mount_point}" & 
 			fi
 			ctr=$((ctr + 1))
 		done
@@ -104,9 +105,9 @@ install_it()
 		# Local system
 		#
 		if [[ $mountpoint == *"none"* ]]; then
-			./install-script -d ${disklist} -t $1
+			./install-script -d ${disklist} -t $1 ${log_mount_point}
 		else
-			./install-script -m ${mountpoint} -t $1
+			./install-script -m ${mountpoint} -t $1 ${log_mount_point}
 		fi
 		if [[ $2 != "none" ]]; then
 			systemctl restart ${2} 
@@ -438,6 +439,10 @@ do
 			disklist=$2
 			shift 2
 		;;
+		-M)
+			log_mount_point="-M $2"
+			shift 2
+		;;
 		-m)
 			mountpoint=$2
 			shift 2