Attachment 882558 Details for Bug 1082018 – Recent changes in the mariadb helper scripts

Recent changes in the mariadb helper scripts

scripts.patch (text/plain), 2.67 KB, created by Honza Horak on 2014-04-04 07:34:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Honza Horak

Created: 2014-04-04 07:34:03 UTC

Size: 2.67 KB

patch

obsolete

>diff -rup /usr/libexec/mariadb-prepare-db-dir /usr/libexec/mariadb-prepare-db-dir
>--- /usr/libexec/mariadb-prepare-db-dir	2013-11-04 13:50:33.000000000 +0100
>+++ /usr/libexec/mariadb-prepare-db-dir	2014-03-06 16:12:48.000000000 +0100
>@@ -21,6 +21,8 @@ get_mysql_option mysqld datadir "/var/li
> datadir="$result"
> get_mysql_option mysqld_safe log-error "/var/log/mariadb/mariadb.log"
> errlogfile="$result"
>+get_mysql_option mysqld socket "$datadir/mysql.sock"
>+socketfile="$result"
> 
> # Absorb configuration settings from the specified systemd service file,
> # or the default "mysqld" service if not specified
>@@ -50,6 +52,16 @@ chown "$myuser:$mygroup" "$errlogfile"
> chmod 0640 "$errlogfile"
> [ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile"
> 
>+# We check if there is already a process using the socket file,
>+# since otherwise this systemd service file could report false
>+# positive result when starting and mysqld_safe could remove
>+# a socket file, which actually uses a different daemon.
>+if fuser "$socketfile" &>/dev/null ; then
>+    echo "Socket file $socketfile exists." >&2
>+    echo "Is another MySQL daemon already running with the same unix socket?" >&2
>+    exit 1
>+fi
>+
> # Make the data directory
> if [ ! -d "$datadir/mysql" ] ; then
>     # First, make sure $datadir is there with correct permissions
>diff -rup /usr/libexec/mariadb-wait-ready /usr/libexec/mariadb-wait-ready
>--- /usr/libexec/mariadb-wait-ready	2013-11-04 13:50:33.000000000 +0100
>+++ /usr/libexec/mariadb-wait-ready	2014-03-06 16:12:48.000000000 +0100
>@@ -27,22 +27,17 @@ get_mysql_option mysqld datadir "/var/li
> datadir="$result"
> get_mysql_option mysqld socket "/var/lib/mysql/mysql.sock"
> socketfile="$result"
>-get_mysql_option mysqld_safe pid-file "/var/run/mysqld/mysqld.pid"
>-mypidfile="$result"
> 
> # Wait for the server to come up or for the mysqld process to disappear
> ret=0
> while /bin/true; do
>-	MYSQLDRUNNING=0
>-	if [ -f "$mypidfile" ]; then
>-	    MYSQLPID=`cat "$mypidfile" 2>/dev/null`
>-	    if [ -n "$MYSQLPID" ] && [ -d "/proc/$MYSQLPID" ] ; then
>-		MYSQLDRUNNING=1
>-	    fi
>+	if ! [ -d "/proc/$daemon_pid" ] ; then
>+            ret=1
>+            break
> 	fi
> 	RESPONSE=`/usr/bin/mysqladmin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
> 	mret=$?
>-	if [ $mret -eq 0 ] && [ $MYSQLDRUNNING -eq 1 ]; then
>+	if [ $mret -eq 0 ]; then
> 	    break
> 	fi
> 	# exit codes 1, 11 (EXIT_CANNOT_CONNECT_TO_SERVICE) are expected,
>@@ -54,11 +49,6 @@ while /bin/true; do
> 	# "Access denied" also means the server is alive
> 	echo "$RESPONSE" | grep -q "Access denied for user" && break
> 
>-	# Check process still exists
>-	if ! /bin/kill -0 $daemon_pid 2>/dev/null; then
>-	    ret=1
>-	    break
>-	fi
> 	sleep 1
> done
>

Actions: View

Attachments on bug 1082018: 882558