fOn Mon, Jan 18, 2016 at 01:54:02PM -0800, Joe Conway wrote: > On 01/18/2016 01:47 PM, Bruce Momjian wrote: > > On Sun, Jan 17, 2016 at 02:24:46PM -0800, Joe Conway wrote: > >> On 01/16/2016 06:02 AM, Michael Paquier wrote: > >>> On Wed, Dec 30, 2015 at 9:08 AM, Joe Conway <m...@joeconway.com> wrote: > >>>> 1) Change NextXID output format from "%u/%u" to "%u:%u" > >>>> (see recent hackers thread) > >>> > >>> ! printf(_("Latest checkpoint's NextXID: %u/%u\n"), > >>> ControlFile.checkPointCopy.nextXidEpoch, > >>> ControlFile.checkPointCopy.nextXid); > >>> printf(_("Latest checkpoint's NextOID: %u\n"), > >>> --- 646,652 ---- > >>> ControlFile.checkPointCopy.ThisTimeLineID); > >>> printf(_("Latest checkpoint's full_page_writes: %s\n"), > >>> ControlFile.checkPointCopy.fullPageWrites ? _("on") : > >>> _("off")); > >>> ! printf(_("Latest checkpoint's NextXID: %u:%u\n"), > >>> This should be definitely a separate patch. > >> > >> Ok. Notwithstanding Simon's reply, there seems to be consensus that this > >> is the way to go. Will commit it this way unless some additional > >> objections surface in the next day or so. > > > > FYI, this slash-colon change will break pg_upgrade unless it is patched. > > Dp you want a patch from me? > > Didn't realize that -- yes please.
Sure, attached, and it would be applied only to head, where you change pg_controldata. pg_upgrade has to read the old and new cluster's pg_controldata. We could get more sophisticated by checking the catalog version number where the format was changed, but that doesn't seem worth it, and is overly complex because we get the catalog version number from pg_controldata, so you would be adding a dependency in ordering of the pg_controldata entries. I can test all suppored Postgres versions with pg_upgrade once you apply the patch, but I think it will be fine. -- Bruce Momjian <br...@momjian.us> http://momjian.us EnterpriseDB http://enterprisedb.com + As you are, so once was I. As I am, so you will be. + + Roman grave inscription +
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c new file mode 100644 index 1f7b65e..aaaea7b *** a/src/bin/pg_upgrade/controldata.c --- b/src/bin/pg_upgrade/controldata.c *************** get_control_data(ClusterInfo *cluster, b *** 198,203 **** --- 198,206 ---- cluster->controldata.chkpnt_nxtepoch = str2uint(p); p = strchr(p, '/'); + /* delimiter changed from '/' to ':' in 9.6 */ + if (p == NULL && GET_MAJOR_VERSION(cluster->major_version) >= 906) + p = strchr(p, ':'); if (p == NULL || strlen(p) <= 1) pg_fatal("%d: controldata retrieval problem\n", __LINE__);
-- Sent via pgsql-hackers mailing list (email@example.com) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers