Merge branch 'PGPROEE9_6' into PGPROEE9_6_scheduler

vbwagner · vbwagner · commit a2c16bda1435 · 2017-02-22T19:20:47.000+03:00
diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml
@@ -369,6 +369,45 @@ doc/src/sgml/ref/initdb.sgml
     </variablelist>
    </para>
 
+   <para>
+    Other options for testing 64-bit XID:
+
+    <variablelist>
+     <varlistentry>
+      <term><option>-m <replaceable class="parameter">START_MX_ID</replaceable></option></term>
+      <term><option>--multixact-id=<replaceable class="parameter">START_MX_ID</replaceable></option></term>
+      <listitem>
+       <para>
+        Specifies a start multixact id value in the hex format for new db instance to test 64-bit xids,
+        default value is <literal>0</literal>.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
+      <term><option>-o <replaceable class="parameter">START_MX_OFFSET</replaceable></option></term>
+      <term><option>--multixact-offset=<replaceable class="parameter">START_MX_OFFSET</replaceable></option></term>
+      <listitem>
+       <para>
+        Specifies a start multixact offset value in the decimal format for new db instance to test 64-bit xids,
+        default value is <literal>0</literal>.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
+      <term><option>-x <replaceable class="parameter">START_XID</replaceable></option></term>
+      <term><option>--xid=<replaceable class="parameter">START_XID</replaceable></option></term>
+      <listitem>
+       <para>
+        Specifies a start xid value in the hex format for new db instance to test 64-bit xids,
+        default value is <literal>0</literal>.
+       </para>
+      </listitem>
+     </varlistentry>
+    </variablelist>
+   </para>
+
    <para>
     Other options:
 
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
@@ -3895,6 +3895,7 @@ BackendStartup(Port *port)
 	 */
 	if (!pg_strong_random(&MyCancelKey, sizeof(MyCancelKey)))
 	{
+		free(bn);
 		ereport(LOG,
 				(errmsg("could not generate random query cancel key")));
 		return STATUS_ERROR;
@@ -5549,6 +5550,7 @@ assign_backendlist_entry(RegisteredBgWorker *rw)
 	 */
 	if (!pg_strong_random(&MyCancelKey, sizeof(MyCancelKey)))
 	{
+		free(bn);
 		rw->rw_crashed_at = GetCurrentTimestamp();
 		return false;
 	}

Original file line number	Diff line number	Diff line change
`@@ -3895,6 +3895,7 @@ BackendStartup(Port *port)`
`3895`	`3895`	`*/`
`3896`	`3896`	`if (!pg_strong_random(&MyCancelKey, sizeof(MyCancelKey)))`
`3897`	`3897`	`{`
	`3898`	`+ free(bn);`
`3898`	`3899`	`ereport(LOG,`
`3899`	`3900`	`(errmsg("could not generate random query cancel key")));`
`3900`	`3901`	`return STATUS_ERROR;`
`@@ -5549,6 +5550,7 @@ assign_backendlist_entry(RegisteredBgWorker *rw)`
`5549`	`5550`	`*/`
`5550`	`5551`	`if (!pg_strong_random(&MyCancelKey, sizeof(MyCancelKey)))`
`5551`	`5552`	`{`
	`5553`	`+ free(bn);`
`5552`	`5554`	`rw->rw_crashed_at = GetCurrentTimestamp();`
`5553`	`5555`	`return false;`
`5554`	`5556`	`}`