Attachment 317213 Details for Bug 462910 – Patch

[patch] Patch

postgres.patch (text/plain), 2.79 KB, created by Lon Hohberger on 2008-09-19 17:23:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lon Hohberger

Created: 2008-09-19 17:23:47 UTC

Size: 2.79 KB

patch

obsolete

>diff --git a/rgmanager/src/resources/postgres-8.metadata b/rgmanager/src/resources/postgres-8.metadata
>index 5a61cd1..760e865 100644
>--- a/rgmanager/src/resources/postgres-8.metadata
>+++ b/rgmanager/src/resources/postgres-8.metadata
>@@ -48,7 +48,7 @@
> 		<shortdesc lang="en">
> 			Other command-line options for postmaster
> 		</shortdesc>
>-		<content type="string" />
>+		<content type="string" default="-D /var/lib/pgsql/data"/>
> 	</parameter>
> 
> 	<parameter name="shutdown_wait">
>diff --git a/rgmanager/src/resources/postgres-8.sh b/rgmanager/src/resources/postgres-8.sh
>index b75874e..4f6e8b0 100755
>--- a/rgmanager/src/resources/postgres-8.sh
>+++ b/rgmanager/src/resources/postgres-8.sh
>@@ -103,10 +103,10 @@ generate_config_file()
> 
> 	generate_configTemplate "$generated_file" "$1"
> 	echo "external_pid_file = '$PSQL_pid_file'" >> "$generated_file"
>-	echo "listen_address = '$ip_comma'" >> "$generated_file"
>+	echo "listen_addresses = '$ip_comma'" >> "$generated_file"
> 
> 	echo >> "$generated_file"	
>-	sed 's/^[[:space:]]*external_pid_file/### external_pid_file/i;s/^[[:space:]]*listen_address/### listen_address/i' < "$original_file" >> "$generated_file"
>+	sed 's/^[[:space:]]*external_pid_file/### external_pid_file/i;s/^[[:space:]]*listen_addresses/### listen_addresses/i' < "$original_file" >> "$generated_file"
> 	
>         sha1_addToFile "$generated_file"
> 	clog_generate_config $CLOG_SUCCEED "$original_file" "$generated_file"
>@@ -116,7 +116,8 @@ generate_config_file()
> 
> start()
> {
>-	declare ccs_fd;
>+	declare ccs_fd
>+	declare pguser_group
> 	
> 	clog_service_start $CLOG_INIT
> 
>@@ -130,6 +131,15 @@ start()
> 		return $OCF_ERR_GENERIC
> 	fi
> 
>+	#
>+	# Create an empty PID file for the postgres user and
>+	# change it to be owned by the postgres user so that
>+	# postmaster doesn't complain.
>+	#
>+	pguser_group=`groups $OCF_RESKEY_postmaster_user | cut -f1 -d' '`
>+	touch $PSQL_pid_file
>+	chown $OCF_RESKEY_postmaster_user.$pguser_group $PSQL_pid_file
>+
> 	clog_looking_for $CLOG_INIT "IP Addresses"
> 
>         ccs_fd=$(ccs_connect);
>@@ -151,7 +161,7 @@ start()
> 	generate_config_file "$OCF_RESKEY_config_file" "$PSQL_gen_config_file" "$ip_addresses"
> 
> 	sudo -u "$OCF_RESKEY_postmaster_user" $PSQL_POSTMASTER -c config_file="$PSQL_gen_config_file" \
>-		$OCF_RESKEY_postmaster_options 
>+		$OCF_RESKEY_postmaster_options &> /dev/null &
> 
> 	if [ $? -ne 0 ]; then
> 		clog_service_start $CLOG_FAILED
>diff --git a/rgmanager/src/resources/utils/ra-skelet.sh b/rgmanager/src/resources/utils/ra-skelet.sh
>index 5530ae6..f83378d 100644
>--- a/rgmanager/src/resources/utils/ra-skelet.sh
>+++ b/rgmanager/src/resources/utils/ra-skelet.sh
>@@ -61,6 +61,11 @@ stop_generic()
> 
> 	read pid < "$pid_file"
> 
>+	# @todo: PID file empty -> error?
>+	if [ -z "$pid" ]; then
>+		return 0;
>+	fi
>+
> 	# @todo: PID is not running -> error?
> 	if [ ! -d "/proc/$pid" ]; then
> 		return 0;

Actions: View | Diff

Attachments on bug 462910: 317213 | 325029