From 70cad79f07302344892894a4b9c997c6a50267b7 Mon Sep 17 00:00:00 2001 From: Bryan Call Date: Wed, 15 Jul 2020 15:48:34 -0700 Subject: [PATCH] Updates to thread scale factor --- configs/records.config.default.in | 2 +- doc/admin-guide/files/records.config.en.rst | 4 ++-- doc/admin-guide/performance/index.en.rst | 2 +- doc/locale/ja/LC_MESSAGES/admin-guide/performance/index.en.po | 2 +- mgmt/RecordsConfig.cc | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/records.config.default.in b/configs/records.config.default.in index 8f1638289bb..23be6ce818b 100644 --- a/configs/records.config.default.in +++ b/configs/records.config.default.in @@ -9,7 +9,7 @@ # https://docs.trafficserver.apache.org/records.config#thread-variables ############################################################################## CONFIG proxy.config.exec_thread.autoconfig INT 1 -CONFIG proxy.config.exec_thread.autoconfig.scale FLOAT 1.5 +CONFIG proxy.config.exec_thread.autoconfig.scale FLOAT 1.0 CONFIG proxy.config.exec_thread.limit INT 2 CONFIG proxy.config.accept_threads INT 1 CONFIG proxy.config.task_threads INT 2 diff --git a/doc/admin-guide/files/records.config.en.rst b/doc/admin-guide/files/records.config.en.rst index 9c24300c04f..1568ec919fe 100644 --- a/doc/admin-guide/files/records.config.en.rst +++ b/doc/admin-guide/files/records.config.en.rst @@ -282,11 +282,11 @@ Thread Variables When enabled (the default, ``1``), |TS| scales threads according to the available CPU cores. See the config option below. -.. ts:cv:: CONFIG proxy.config.exec_thread.autoconfig.scale FLOAT 1.5 +.. ts:cv:: CONFIG proxy.config.exec_thread.autoconfig.scale FLOAT 1.0 Factor by which |TS| scales the number of threads. The multiplier is usually the number of available CPU cores. By default this is scaling factor is - ``1.5``. + ``1.0``. .. ts:cv:: CONFIG proxy.config.exec_thread.limit INT 2 diff --git a/doc/admin-guide/performance/index.en.rst b/doc/admin-guide/performance/index.en.rst index 5a239e6b641..7227bbf7db7 100644 --- a/doc/admin-guide/performance/index.en.rst +++ b/doc/admin-guide/performance/index.en.rst @@ -182,7 +182,7 @@ CPU and Thread Optimization Thread Scaling ~~~~~~~~~~~~~~ -By default, |TS| creates 1.5 threads per CPU core on the host system. This may +By default, |TS| creates one thread per CPU core on the host system. This may be adjusted with the following settings in :file:`records.config`: * :ts:cv:`proxy.config.exec_thread.autoconfig` diff --git a/doc/locale/ja/LC_MESSAGES/admin-guide/performance/index.en.po b/doc/locale/ja/LC_MESSAGES/admin-guide/performance/index.en.po index 6cb4bad1ff6..3e7de8b13a9 100644 --- a/doc/locale/ja/LC_MESSAGES/admin-guide/performance/index.en.po +++ b/doc/locale/ja/LC_MESSAGES/admin-guide/performance/index.en.po @@ -231,7 +231,7 @@ msgstr "" #: ../../../admin-guide/performance/index.en.rst:185 msgid "" -"By default, |TS| creates 1.5 threads per CPU core on the host system. This " +"By default, |TS| creates one thread per CPU core on the host system. This " "may be adjusted with the following settings in :file:`records.config`:" msgstr "" diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc index 557c3e67eff..30515e2010d 100644 --- a/mgmt/RecordsConfig.cc +++ b/mgmt/RecordsConfig.cc @@ -111,7 +111,7 @@ static const RecordElement RecordsConfig[] = // By default Traffic Server set number of execution threads equal to total CPUs {RECT_CONFIG, "proxy.config.exec_thread.autoconfig", RECD_INT, "1", RECU_RESTART_TS, RR_NULL, RECC_INT, "[0-1]", RECA_READ_ONLY} , - {RECT_CONFIG, "proxy.config.exec_thread.autoconfig.scale", RECD_FLOAT, "1", RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_READ_ONLY} + {RECT_CONFIG, "proxy.config.exec_thread.autoconfig.scale", RECD_FLOAT, "1.0", RECU_RESTART_TS, RR_NULL, RECC_NULL, nullptr, RECA_READ_ONLY} , {RECT_CONFIG, "proxy.config.exec_thread.limit", RECD_INT, "2", RECU_RESTART_TS, RR_NULL, RECC_INT, "[1-" TS_STR(TS_MAX_NUMBER_EVENT_THREADS) "]", RECA_READ_ONLY} ,