Check that global_snapshot_defer_time early instead of falling on assert.

arssher · arssher · commit 27d349623a96 · 2018-07-18T13:33:41.000+03:00
Also set default value to 30 secs.
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,
-		0, 0, INT_MAX,
+		30, 0, INT_MAX,
 		NULL, NULL, NULL
 	},
 
diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c
@@ -2255,6 +2255,13 @@ ImportGlobalSnapshot(GlobalCSN snap_global_csn)
 			 errhint("Make sure the configuration parameter \"%s\" is enabled.",
 					 "track_global_snapshots")));
 
+	if (global_snapshot_defer_time <= 0)
+		ereport(ERROR,
+			(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+			 errmsg("could not import global snapshot"),
+			 errhint("Make sure the configuration parameter \"%s\" is positive.",
+					 "global_snapshot_defer_time")));
+
 	/*
 	 * Call GlobalSnapshotToXmin under ProcArrayLock to avoid situation that
 	 * resulting xmin will be evicted from map before we will set it into our
@@ -2288,5 +2295,3 @@ pg_global_snaphot_import(PG_FUNCTION_ARGS)
 	ImportGlobalSnapshot(global_csn);
 	PG_RETURN_VOID();
 }
-
-
