Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hElJF-0004Ha-PY for pgsql-docs@arkaria.postgresql.org; Fri, 12 Apr 2019 01:48:53 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1hElJE-0000sv-CY for pgsql-docs@arkaria.postgresql.org; Fri, 12 Apr 2019 01:48:52 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hElJE-0000ms-4F for pgsql-docs@lists.postgresql.org; Fri, 12 Apr 2019 01:48:52 +0000 Received: from momjian.us ([72.94.173.45]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hElJB-0005wg-AA for pgsql-docs@lists.postgresql.org; Fri, 12 Apr 2019 01:48:51 +0000 Received: from bruce by momjian.us with local (Exim 4.89) (envelope-from ) id 1hElJ8-0001Nh-84; Thu, 11 Apr 2019 21:48:46 -0400 Date: Thu, 11 Apr 2019 21:48:46 -0400 From: Bruce Momjian To: Daniel Gustafsson Cc: Magnus Hagander , "pgsql-docs@lists.postgresql.org" Subject: Re: Clarification to pg_upgrade docs on reverting to old cluster Message-ID: <20190412014846.w4vcdhnmitry4yep@momjian.us> References: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="7k5r3c4n7rlscjyz" Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20170113 (1.7.2) List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --7k5r3c4n7rlscjyz Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Apr 5, 2019 at 02:23:22PM +0000, Daniel Gustafsson wrote: > On Friday, April 5, 2019 2:26 PM, Magnus Hagander wrote: > but wouldn't it sound better with "in this case" than "at this point"? And > as a really small nitpick, restore from backup, rather than backups? > > > Agreed. > > > The third bulletpoint also seems quite complicated really. If we're > tweaking these, wouldn't it be better if we split that one in two -- one > for "if you ran it without --link", that should reallyi be listed above any > of the other options? > > > Looking at it closer I tend to agree, and updated the patch to split this up in > an attempt to make it a bit clearer for newcomers to pg_upgrade. How about the > attached version? I agree that current paragraph is terrible --- it is too dense and confusing. I liked your sub-bullets. I adjusted your patch to tighten the language, and reordered the entries to appear in the order the actions would be performed. Updated patch attached. -- Bruce Momjian http://momjian.us EnterpriseDB http://enterprisedb.com + As you are, so once was I. As I am, so you will be. + + Ancient Roman grave inscription + --7k5r3c4n7rlscjyz Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="pg_upgrade.diff" diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml index f6d423ee13..0c4b16d32c 100644 --- a/doc/src/sgml/ref/pgupgrade.sgml +++ b/doc/src/sgml/ref/pgupgrade.sgml @@ -678,32 +678,52 @@ psql --username=postgres --file=script.sql postgres - If you ran pg_upgrade - with , no modifications were made to the old - cluster and you can re-use it anytime. + If the option was used, the old cluster + was unmodified; it can be restarted. - If you ran pg_upgrade - with , the data files are shared between the - old and new cluster. If you started the new cluster, the new - server has written to those shared files and it is unsafe to - use the old cluster. + If the option was not + used, the old cluster was unmodified; it can be restarted. - If you ran pg_upgrade without - or did not start the new server, the - old cluster was not modified except that, if linking - started, a .old suffix was appended to - $PGDATA/global/pg_control. To reuse the old - cluster, possibly remove the .old suffix from - $PGDATA/global/pg_control; you can then restart the - old cluster. + If the option was used, the data + files might be shared between the old and new cluster: + + + + + If pg_upgrade aborted before linking started, + the old cluster was unmodified; it can be restarted. + + + + + + If you did not start the new cluster, the old + cluster was unmodified except that, when linking started, a + .old suffix was appended to + $PGDATA/global/pg_control. To reuse the old + cluster, remove the .old suffix from + $PGDATA/global/pg_control; you can then restart + the old cluster. + + + + + + If you did start the new cluster, it has written to shared files + and it is unsafe to use the old cluster. The old cluster will + need to be restored from backup in this case. + + + + --7k5r3c4n7rlscjyz--