Fix initdb failure with non-zero global_snapshot_defer_time.

arssher · arssher · commit d545692bc611 · 2018-07-20T12:17:28.000+03:00
And set its default value to 5.

Also fix one warning (damned 'void' instead of true void).
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
@@ -1767,7 +1767,7 @@ GetSnapshotData(Snapshot snapshot)
 	 * Take GlobalCSN under ProcArrayLock so the local/global snapshot stays
 	 * synchronized.
 	 */
-	if (track_global_snapshots || global_snapshot_defer_time > 0)
+	if (track_global_snapshots)
 		global_csn = GlobalSnapshotGenerate(false);
 
 	LWLockRelease(ProcArrayLock);
@@ -1846,7 +1846,8 @@ GetSnapshotData(Snapshot snapshot)
 
 	snapshot->imported_global_csn = false;
 	snapshot->global_csn = global_csn;
-	if (global_snapshot_defer_time > 0)
+	/* if (global_snapshot_defer_time > 0 && IsNormalProcessingMode()) */
+	if (global_snapshot_defer_time > 0 && IsUnderPostmaster)
 		GlobalSnapshotMapXmin(snapshot->global_csn);
 
 	return snapshot;
@@ -3091,7 +3092,7 @@ ProcArraySetGlobalSnapshotXmin(TransactionId xmin)
  * ProcArrayGetGlobalSnapshotXmin
  */
 TransactionId
-ProcArrayGetGlobalSnapshotXmin()
+ProcArrayGetGlobalSnapshotXmin(void)
 {
 	return procArray->global_snapshot_xmin;
 }
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -2349,7 +2349,7 @@ static struct config_int ConfigureNamesInt[] =
 			NULL
 		},
 		&global_snapshot_defer_time,
-		30, 0, INT_MAX,
+		5, 0, INT_MAX,
 		NULL, NULL, NULL
 	},
 
diff --git a/src/include/storage/procarray.h b/src/include/storage/procarray.h
@@ -130,6 +130,6 @@ extern void ProcArrayGetReplicationSlotXmin(TransactionId *xmin,
 
 extern void ProcArraySetGlobalSnapshotXmin(TransactionId xmin);
 
-extern TransactionId ProcArrayGetGlobalSnapshotXmin();
+extern TransactionId ProcArrayGetGlobalSnapshotXmin(void);
 
 #endif							/* PROCARRAY_H */
