diff options
| author | Robert Haas <rhaas@postgresql.org> | 2016-07-07 11:18:51 -0400 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2016-07-07 11:35:08 -0400 |
| commit | d1f822e58597cac5000bf69b893cc236c5ef5fcb (patch) | |
| tree | 4ea70f271626b6477142fde87a59e4969d35851d /src | |
| parent | 62c8421e87b33b2e94f8a7842e1dd9aa1a286ffc (diff) | |
| download | postgresql-d1f822e58597cac5000bf69b893cc236c5ef5fcb.tar.gz postgresql-d1f822e58597cac5000bf69b893cc236c5ef5fcb.zip | |
Clarify resource utilization of parallel query.
temp_file_limit is a per-process limit, not a per-session limit across
all cooperating parallel processes; change wording accordingly, per a
suggestion from Tom Lane.
Also, document under max_parallel_workers_per_gather the fact that each
process involved in a parallel query may use as many resources as a
separate session. Caveat emptor.
Per a complaint from Peter Geoghegan.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 2 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 60148b871b3..6ac5184b374 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -1947,7 +1947,7 @@ static struct config_int ConfigureNamesInt[] = { {"temp_file_limit", PGC_SUSET, RESOURCES_DISK, - gettext_noop("Limits the total size of all temporary files used by each session."), + gettext_noop("Limits the total size of all temporary files used by each process."), gettext_noop("-1 means no limit."), GUC_UNIT_KB }, diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index a0abc2c2e00..5faf22a37a5 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -138,7 +138,7 @@ # - Disk - -#temp_file_limit = -1 # limits per-session temp file space +#temp_file_limit = -1 # limits per-process temp file space # in kB, or -1 for no limit # - Kernel Resource Usage - |