Commit27d3496

committed

Check that global_snapshot_defer_time early instead of falling on assert.

Also set default value to 30 secs.

1 parent19d715c commit27d3496Copy full SHA for 27d3496

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2349,7 +2349,7 @@ static struct config_int ConfigureNamesInt[] =`
`2349`	`2349`	`NULL`
`2350`	`2350`	`},`
`2351`	`2351`	`&global_snapshot_defer_time,`
`2352`		`-0,0,INT_MAX,`
	`2352`	`+30,0,INT_MAX,`
`2353`	`2353`	`NULL,NULL,NULL`
`2354`	`2354`	`},`
`2355`	`2355`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2255,6 +2255,13 @@ ImportGlobalSnapshot(GlobalCSN snap_global_csn)`
`2255`	`2255`	`errhint("Make sure the configuration parameter \"%s\" is enabled.",`
`2256`	`2256`	`"track_global_snapshots")));`
`2257`	`2257`
	`2258`	`+if (global_snapshot_defer_time <=0)`
	`2259`	`+ereport(ERROR,`
	`2260`	`+(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),`
	`2261`	`+errmsg("could not import global snapshot"),`
	`2262`	`+errhint("Make sure the configuration parameter \"%s\" is positive.",`
	`2263`	`+"global_snapshot_defer_time")));`
	`2264`	`+`
`2258`	`2265`	`/*`
`2259`	`2266`	`* Call GlobalSnapshotToXmin under ProcArrayLock to avoid situation that`
`2260`	`2267`	`* 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)`
`2288`	`2295`	`ImportGlobalSnapshot(global_csn);`
`2289`	`2296`	`PG_RETURN_VOID();`
`2290`	`2297`	`}`
`2291`		`-`
`2292`		`-`

Comments

(0)