From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 11 Mar 2011 03:04:00 +0000 (-0500)
Subject: When a smart pg_ctl shutdown fails, mention -m fast as a tip.
X-Git-Tag: REL9_1_ALPHA5~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f9cf6b336fb93f4e13943d9e873f5a4a167177a;p=thirdparty%2Fpostgresql.git

When a smart pg_ctl shutdown fails, mention -m fast as a tip.
---

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 2fab5c98fdc..4b9fb84c39f 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -865,6 +865,9 @@ do_stop(void)
 			print_msg(_(" failed\n"));
 
 			write_stderr(_("%s: server does not shut down\n"), progname);
+			if (shutdown_mode == SMART_MODE)
+				write_stderr(_("TIP: the \"-m fast\" option immediately disconnects sessions rather than\n"
+							"waiting for session-initiated disconnection.\n"));
 			exit(1);
 		}
 		print_msg(_(" done\n"));
@@ -952,6 +955,9 @@ do_restart(void)
 			print_msg(_(" failed\n"));
 
 			write_stderr(_("%s: server does not shut down\n"), progname);
+			if (shutdown_mode == SMART_MODE)
+				write_stderr(_("TIP: the \"-m fast\" option immediately disconnects sessions rather than\n"
+							"waiting for session-initiated disconnection.\n"));
 			exit(1);
 		}