Commit8fef901

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 parent90eb170 commit8fef901Copy full SHA for 8fef901

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1573,7 +1573,9 @@ include_dir 'conf.d'`
`1573`	`1573`	`<para>`
`1574`	`1574`	`At present, this setting is supported only on Linux and Windows. The`
`1575`	`1575`	`setting is ignored on other systems when set to`
`1576`		`- <literal>try</literal>.`
	`1576`	`+ <literal>try</literal>. On Linux, it is only supported when`
	`1577`	`+ <varname>shared_memory_type</varname> is set to <literal>mmap</literal>`
	`1578`	`+ (the default).`
`1577`	`1579`	`</para>`
`1578`	`1580`
`1579`	`1581`	`<para>`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -649,6 +649,12 @@ PGSharedMemoryCreate(Size size, int port,`
`649`	`649`	`errmsg("huge pages not supported on this platform")));`
`650`	`650`	`#endif`
`651`	`651`
	`652`	`+/* For now, we don't support huge pages in SysV memory */`
	`653`	`+if (huge_pages==HUGE_PAGES_ON&&shared_memory_type!=SHMEM_TYPE_MMAP)`
	`654`	`+ereport(ERROR,`
	`655`	`+(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
	`656`	`+errmsg("huge pages not supported with the current shared_memory_type setting")));`
	`657`	`+`
`652`	`658`	`/* Room for a header? */`
`653`	`659`	`Assert(size>MAXALIGN(sizeof(PGShmemHeader)));`
`654`	`660`

Comments

(0)