Commit24b7cf8

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 parenta9d0a54 commit24b7cf8Copy full SHA for 24b7cf8

File tree

-1

lines changed

-1

lines changed

Lines changed: 3 additions & 1 deletion

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

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -658,6 +658,12 @@ PGSharedMemoryCreate(Size size,`
`658`	`658`	`errmsg("huge pages not supported on this platform")));`
`659`	`659`	`#endif`
`660`	`660`
	`661`	`+/* For now, we don't support huge pages in SysV memory */`
	`662`	`+if (huge_pages==HUGE_PAGES_ON&&shared_memory_type!=SHMEM_TYPE_MMAP)`
	`663`	`+ereport(ERROR,`
	`664`	`+(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
	`665`	`+errmsg("huge pages not supported with the current shared_memory_type setting")));`
	`666`	`+`
`661`	`667`	`/* Room for a header? */`
`662`	`668`	`Assert(size>MAXALIGN(sizeof(PGShmemHeader)));`
`663`	`669`

Comments

(0)