Merge branch 'PGPRO9_6_TASK941' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPRO9_6_TASK941

vbwagner · vbwagner · commit 3f62e631dee5 · 2017-08-30T18:35:43.000+03:00
diff --git a/doc/src/sgml/release-pro-9.6.sgml b/doc/src/sgml/release-pro-9.6.sgml
@@ -51,41 +51,41 @@
     <para>To upgrade from a <productname>Postgres Pro</productname> version based on
       any previous <productname>PostgreSQL</productname> major release, you can perform a dump/restore using
       <xref linkend="app-pg-dumpall">, or use the <xref linkend="pgupgrade"> utility.
-      The first option is safer, while the second is faster and can
+      The first option is safer, while the second is faster and can significantly
       speed up the upgrade process for large databases.
     </para>
     <para>To upgrade from a <productname>Postgres Pro</productname> version
       based on the same <productname>PostgreSQL</productname> major release,
-      the <literal>pgpro_upgrade</literal> script provided
-      in this distribution is required:
-      <itemizedlist>
-        <listitem>
-          <para>If you are upgrading your <productname>Postgres Pro</productname>
-          installation from a binary package, the <literal>pgpro_upgrade</literal> script
-          is run automatically, or you are prompted to run it manually.
-          </para>
-        </listitem>
-        <listitem>
-          <para>If you have compiled <productname>Postgres Pro</productname>
-          from source code or created your database in a non-default location,
-          you must always run the <literal>pgpro_upgrade</literal> script manually.
-          Before running the script, you should stop postgres service.
-          Script should be run on behalf of the user owning the database
-          (typically postgres) and PGDATA environment variable should be
-          set to the directory where database resides.
-          </para>
-        </listitem>
-      </itemizedlist>
+      a dump/restore is not required. Instead of the <literal>pg_upgrade</literal>,
+      you must use the <literal>pgpro_upgrade</literal> script provided
+      in this distribution. This script updates metadata information to
+      handle catalog number format change introduced in 
+      <productname>Postgres Pro</productname> 9.6.4.1. If you are upgrading your
+      <productname>Postgres Pro</productname> installation from a binary package, the
+      <literal>pgpro_upgrade</literal> script is run automatically, or you
+      are prompted to run it manually.
+      </para>
+      <important>
+        <para>
+      If you run <literal>pgpro_upgrade</literal> manually,
+      you must stop postgres service.
+      The script must be run on behalf of the user owning the database
+      (typically postgres) and PGDATA environment variable should be
+      set to the directory where database resides. Running <literal>pgpro_upgrade</literal>
+      as root will result in an error.
+        </para>
+      </important>
+      <para>If you have compiled <productname>Postgres Pro</productname>
+      from source code or created your database in a non-default location,
+      you must run the <literal>pgpro_upgrade</literal> script manually.
+      </para>
       <note>
         <para>On RPM-based Linux distributions, if you are upgrading from
         version 9.6.2.1 or lower, make sure to move the data directory from
         <filename>pgsql</filename> to the <filename>pgpro</filename>
         directory before running the <literal>pgpro_upgrade</literal> script.
-        Besides, after you upgrade to a newer version, you will have to use
-        the <literal>systemd</literal> service manager.
         </para>
       </note>
-    </para>
     <para>To migrate from vanilla PostgreSQL 9.6.x, perform a dump/restore using
       <xref linkend="app-pg-dumpall">.
     </para>
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
@@ -18,7 +18,10 @@
 
 #include "postgres.h"
 
+#include <sys/stat.h>
+#include <sys/time.h>
 #include <time.h>
+#include <unistd.h>
 
 #include "access/xlog.h"
 #include "access/xlog_internal.h"
