Skip to content

Commit 7974ade

Browse files
committed
box.cfg: make 'Since version' and 'Dynamic: yes' consistent
1 parent 17f9750 commit 7974ade

File tree

9 files changed

+119
-46
lines changed

9 files changed

+119
-46
lines changed

doc/reference/configuration/cfg_basic.rst

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
.. confval:: background
2020

2121
Since version 1.6.2.
22+
2223
Run the server as a background task. The :ref:`log <cfg_logging-log>`
2324
and :ref:`pid_file <cfg_basic-pid_file>` parameters must be non-null for
2425
this to work.
@@ -33,6 +34,7 @@
3334
.. confval:: custom_proc_title
3435

3536
Since version 1.6.7.
37+
3638
Add the given string to the server's process title
3739
(what’s shown in the COMMAND column for
3840
``ps -ef`` and ``top -c`` commands).
@@ -97,6 +99,7 @@
9799
.. confval:: memtx_dir
98100

99101
Since version 1.7.4.
102+
100103
A directory where memtx stores snapshot (.snap) files. Can be relative to
101104
:ref:`work_dir <cfg_basic-work_dir>`. If not specified, defaults to
102105
``work_dir``. See also :ref:`wal_dir <cfg_basic-wal_dir>`.
@@ -111,6 +114,7 @@
111114
.. confval:: pid_file
112115

113116
Since version 1.4.9.
117+
114118
Store the process id in this file. Can be relative to :ref:`work_dir
115119
<cfg_basic-work_dir>`. A typical value is “:file:`tarantool.pid`”.
116120

@@ -124,6 +128,7 @@
124128
.. confval:: read_only
125129

126130
Since version 1.7.1.
131+
127132
Say ``box.cfg{read_only=true...}`` to put the server instance in read-only
128133
mode. After this, any requests that try to change persistent data will fail with error
129134
:errcode:`ER_READONLY`. Read-only mode should be used for master-replica
@@ -160,6 +165,7 @@
160165
.. confval:: sql_cache_size
161166

162167
Since version 2.3.1.
168+
163169
The maximum number of bytes in the cache for
164170
:ref:`SQL prepared statements <box-sql_box_prepare>`.
165171
(The number of bytes that are actually used can be seen with
@@ -175,6 +181,7 @@
175181
.. confval:: vinyl_dir
176182

177183
Since version 1.7.1.
184+
178185
A directory where vinyl files or subdirectories will be stored. Can be
179186
relative to :ref:`work_dir <cfg_basic-work_dir>`. If not specified, defaults
180187
to ``work_dir``.
@@ -189,6 +196,7 @@
189196
.. confval:: vinyl_timeout
190197

191198
Since version 1.7.5.
199+
192200
The vinyl storage engine has a scheduler which does compaction.
193201
When vinyl is low on available memory, the compaction scheduler
194202
may be unable to keep up with incoming update requests.
@@ -207,7 +215,9 @@
207215

208216
.. confval:: username
209217

210-
Since version 1.4.9. UNIX user name to switch to after start.
218+
Since version 1.4.9.
219+
220+
UNIX user name to switch to after start.
211221

212222
| Type: string
213223
| Default: null
@@ -219,6 +229,7 @@
219229
.. confval:: wal_dir
220230

221231
Since version 1.6.2.
232+
222233
A directory where write-ahead log (.xlog) files are stored. Can be relative
223234
to :ref:`work_dir <cfg_basic-work_dir>`. Sometimes ``wal_dir`` and
224235
:ref:`memtx_dir <cfg_basic-memtx_dir>` are specified with different values, so
@@ -235,6 +246,7 @@
235246
.. confval:: work_dir
236247

237248
Since version 1.4.9.
249+
238250
A directory where database working files will be stored. The server instance
239251
switches to ``work_dir`` with :manpage:`chdir(2)` after start. Can be
240252
relative to the current directory. If not specified, defaults to
@@ -263,6 +275,7 @@
263275
.. confval:: worker_pool_threads
264276

265277
Since version 1.7.5.
278+
266279
The maximum number of threads to use during execution
267280
of certain internal processes (currently
268281
:ref:`socket.getaddrinfo() <socket-getaddrinfo>` and
@@ -277,7 +290,9 @@
277290

278291
.. confval:: strip_core
279292

280-
Since version 2.2.2. Whether coredump files should include memory allocated for tuples.
293+
Since version 2.2.2.
294+
295+
Whether coredump files should include memory allocated for tuples.
281296
(This can be large if Tarantool runs under heavy load.)
282297
Setting to ``true`` means "do not include".
283298
In an older version of Tarantool the default value of this parameter was ``false``.
@@ -292,6 +307,7 @@
292307
.. confval:: memtx_use_mvcc_engine
293308

294309
Since version :doc:`2.6.1 </release/2.6.1>`.
310+
295311
Enables :ref:`transactional manager <txn_mode_transaction-manager>` if set to ``true``.
296312

297313
| Type: boolean

doc/reference/configuration/cfg_binary_logging_snapshots.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
| Type: float
6464
| Default: null
6565
| Environment variable: TT_SNAP_IO_RATE_LIMIT
66-
| Dynamic: **yes**
66+
| Dynamic: yes
6767
6868
.. _cfg_binary_logging_snapshots-wal_mode:
6969

@@ -120,7 +120,7 @@
120120
| Type: number
121121
| Default: 16777216 bytes
122122
| Environment variable: TT_WAL_QUEUE_MAX_SIZE
123-
| Dynamic: **yes**
123+
| Dynamic: yes
124124
125125
.. _cfg_binary_logging_snapshots-wal_cleanup_delay:
126126

@@ -146,7 +146,7 @@
146146
| Type: number
147147
| Default: 14400 seconds
148148
| Environment variable: TT_WAL_CLEANUP_DELAY
149-
| Dynamic: **yes**
149+
| Dynamic: yes
150150
151151

152152
.. _cfg_binary_logging_snapshots-wal_ext:
@@ -195,7 +195,7 @@
195195
| Type: map
196196
| Default: nil
197197
| Environment variable: TT_WAL_EXT
198-
| Dynamic: **yes**
198+
| Dynamic: yes
199199
200200

201201
.. _cfg_binary_logging_secure_erasing:
@@ -210,4 +210,4 @@
210210
| Type: boolean
211211
| Default: false
212212
| Environment variable: TT_SECURE_ERASING
213-
| Dynamic: **yes**
213+
| Dynamic: yes

doc/reference/configuration/cfg_feedback.rst

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,35 +15,41 @@ adjust or turn off this feature.
1515

1616
.. confval:: feedback_enabled
1717

18-
Since version 1.10.1. Whether to send feedback.
18+
Since version 1.10.1.
19+
20+
Whether to send feedback.
1921

2022
If this is set to ``true``, feedback will be sent as described above.
2123
If this is set to ``false``, no feedback will be sent.
2224

2325
| Type: boolean
2426
| Default: true
2527
| Environment variable: TT_FEEDBACK_ENABLED
26-
| Dynamic: **yes**
28+
| Dynamic: yes
2729
2830
.. _cfg_logging-feedback_host:
2931

3032
.. confval:: feedback_host
3133

32-
Since version 1.10.1. The address to which the packet is sent.
34+
Since version 1.10.1.
35+
36+
The address to which the packet is sent.
3337
Usually the recipient is Tarantool, but it can be any URL.
3438

3539
| Type: string
3640
| Default: ``https://feedback.tarantool.io``
3741
| Environment variable: TT_FEEDBACK_HOST
38-
| Dynamic: **yes**
42+
| Dynamic: yes
3943
4044
.. _cfg_logging-feedback_interval:
4145

4246
.. confval:: feedback_interval
4347

44-
Since version 1.10.1. The number of seconds between sendings, usually 3600 (1 hour).
48+
Since version 1.10.1.
49+
50+
The number of seconds between sendings, usually 3600 (1 hour).
4551

4652
| Type: float
4753
| Default: 3600
4854
| Environment variable: TT_FEEDBACK_INTERVAL
49-
| Dynamic: **yes**
55+
| Dynamic: yes

doc/reference/configuration/cfg_hot_standby.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
.. confval:: hot_standby
22

3-
Since version 1.7.4. Whether to start the server in **hot standby** mode.
3+
Since version 1.7.4.
4+
5+
Whether to start the server in **hot standby** mode.
46

57
Hot standby is a feature which provides a simple form of failover without
68
:ref:`replication <replication>`.

doc/reference/configuration/cfg_logging.rst

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ application.
1616
.. confval:: log_level
1717

1818
Since version 1.6.2.
19+
1920
Specifies the level of detail the :ref:`log <admin-logs>` has. There are seven levels:
2021

2122
* 1 – ``SYSERROR``
@@ -34,7 +35,7 @@ application.
3435
| Type: integer
3536
| Default: 5
3637
| Environment variable: TT_LOG_LEVEL
37-
| Dynamic: **yes**
38+
| Dynamic: yes
3839
3940
.. note::
4041
Prior to Tarantool 1.7.5 there were only six levels and ``DEBUG`` was
@@ -47,6 +48,7 @@ application.
4748
.. confval:: log
4849

4950
Since version 1.7.4.
51+
5052
By default, Tarantool sends the log to the standard error stream
5153
(``stderr``). If ``log`` is specified, Tarantool can send the log to a:
5254

@@ -130,6 +132,7 @@ application.
130132
.. confval:: log_nonblock
131133

132134
Since version 1.7.4.
135+
133136
If ``log_nonblock`` equals **true**, Tarantool does not block during logging
134137
when the system is not ready for writing, and drops the message
135138
instead. If :ref:`log_level <cfg_logging-log_level>` is high, and many
@@ -158,20 +161,23 @@ application.
158161
.. confval:: too_long_threshold
159162

160163
Since version 1.6.2.
164+
161165
If processing a request takes longer than the given value (in seconds),
162166
warn about it in the log. Has effect only if :ref:`log_level
163167
<cfg_logging-log_level>` is greater than or equal to 4 (WARNING).
164168

165169
| Type: float
166170
| Default: 0.5
167171
| Environment variable: TT_TOO_LONG_THRESHOLD
168-
| Dynamic: **yes**
172+
| Dynamic: yes
169173
170174
.. _cfg_logging-log_format:
171175

172176
.. confval:: log_format
173177

174-
Since version 1.7.6. Log entries have two possible formats:
178+
Since version 1.7.6.
179+
180+
Log entries have two possible formats:
175181

176182
* 'plain' (the default), or
177183
* 'json' (with more detail and with JSON labels).
@@ -207,14 +213,15 @@ application.
207213
| Type: string
208214
| Default: 'plain'
209215
| Environment variable: TT_LOG_FORMAT
210-
| Dynamic: **yes**
216+
| Dynamic: yes
211217
212218

213219
.. _cfg_logging-log_modules:
214220

215221
.. confval:: log_modules
216222

217223
Since version :doc:`2.11.0 </release/2.11.0>`.
224+
218225
Configure the specified log levels (:ref:`log_level <cfg_logging-log_level>`) for different modules.
219226

220227
You can specify a logging level for the following module types:
@@ -231,7 +238,7 @@ application.
231238
| Type: table
232239
| Default: blank
233240
| Environment variable: TT_LOG_MODULES
234-
| Dynamic: **yes**
241+
| Dynamic: yes
235242
|
236243
237244

doc/reference/configuration/cfg_networking.rst

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
.. confval:: io_collect_interval
99

1010
Since version 1.4.9.
11+
1112
The instance will sleep for io_collect_interval seconds between iterations
1213
of the event loop. Can be used to reduce CPU load in deployments in which
1314
the number of client connections is large, but requests are not so frequent
@@ -16,13 +17,15 @@
1617
| Type: float
1718
| Default: null
1819
| Environment variable: TT_IO_COLLECT_INTERVAL
19-
| Dynamic: **yes**
20+
| Dynamic: yes
2021
2122
.. _cfg_networking-net_msg_max:
2223

2324
.. confval:: net_msg_max
2425

25-
Since version 1.10.1. To handle messages, Tarantool allocates fibers.
26+
Since version 1.10.1.
27+
28+
To handle messages, Tarantool allocates fibers.
2629
To prevent fiber overhead from affecting the whole system,
2730
Tarantool restricts how many messages the fibers handle,
2831
so that some pending requests are blocked.
@@ -53,13 +56,14 @@
5356
| Type: integer
5457
| Default: 768
5558
| Environment variable: TT_NET_MSG_MAX
56-
| Dynamic: **yes**
59+
| Dynamic: yes
5760
5861
.. _cfg_networking-readahead:
5962

6063
.. confval:: readahead
6164

6265
Since version 1.6.2.
66+
6367
The size of the read-ahead buffer associated with a client connection. The
6468
larger the buffer, the more memory an active connection consumes and the
6569
more requests can be read from the operating system buffer in a single
@@ -72,13 +76,14 @@
7276
| Type: integer
7377
| Default: 16320
7478
| Environment variable: TT_READAHEAD
75-
| Dynamic: **yes**
79+
| Dynamic: yes
7680
7781
.. _cfg_networking-iproto_threads:
7882

7983
.. confval:: iproto_threads
8084

8185
Since version :doc:`2.8.1 </release/2.8.1>`.
86+
8287
The number of :ref:`network threads <thread_model>`.
8388
There can be unusual workloads where the network thread
8489
is 100% loaded and the transaction processor thread is not, so the network

0 commit comments

Comments
 (0)