Commit181361a

committed

Reject huge_pages=on if shared_memory_type=sysv.

It doesn't work (it could, but hasn't been implemented).Back-patch to 12, where shared_memory_type arrived.Reported-by: Alexander Lakhin <exclusion@gmail.com>Reviewed-by: Alexander Lakhin <exclusion@gmail.com>Discussion:https://postgr.es/m/163271880203.22789.1125998876173795966@wrigleys.postgresql.org

1 parenta5b9a00 commit181361aCopy full SHA for 181361a

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1664,7 +1664,9 @@ include_dir 'conf.d'`
`1664`	`1664`	`<para>`
`1665`	`1665`	`At present, this setting is supported only on Linux and Windows. The`
`1666`	`1666`	`setting is ignored on other systems when set to`
`1667`		`- <literal>try</literal>.`
	`1667`	`+ <literal>try</literal>. On Linux, it is only supported when`
	`1668`	`+ <varname>shared_memory_type</varname> is set to <literal>mmap</literal>`
	`1669`	`+ (the default).`
`1668`	`1670`	`</para>`
`1669`	`1671`
`1670`	`1672`	`<para>`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -686,6 +686,12 @@ PGSharedMemoryCreate(Size size,`
`686`	`686`	`errmsg("huge pages not supported on this platform")));`
`687`	`687`	`#endif`
`688`	`688`
	`689`	`+/* For now, we don't support huge pages in SysV memory */`
	`690`	`+if (huge_pages==HUGE_PAGES_ON&&shared_memory_type!=SHMEM_TYPE_MMAP)`
	`691`	`+ereport(ERROR,`
	`692`	`+(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
	`693`	`+errmsg("huge pages not supported with the current shared_memory_type setting")));`
	`694`	`+`
`689`	`695`	`/* Room for a header? */`
`690`	`696`	`Assert(size>MAXALIGN(sizeof(PGShmemHeader)));`
`691`	`697`

Comments

(0)