From af6194e4f45c12c16c204971a6e3f6cbba692660 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Thu, 12 Dec 2013 20:01:35 +0400
Subject: [PATCH] Remove a dead option from the configuration file.
---
doc/user/configuration-reference.xml | 9 ------
test/box/admin.result | 15 +++++-----
test/box/configuration.result | 15 +++++-----
test/box/lua.result | 41 +++++++++++++---------------
4 files changed, 33 insertions(+), 47 deletions(-)
diff --git a/doc/user/configuration-reference.xml b/doc/user/configuration-reference.xml
index a705f3a2f4..038a0e7831 100644
--- a/doc/user/configuration-reference.xml
+++ b/doc/user/configuration-reference.xml
@@ -682,15 +682,6 @@ tarantool_box: primary@sessions pri: 33013 sec: 33014 adm: 33015</programlisting
default.</entry>
</row>
- <row>
- <entry>backlog</entry>
- <entry>integer</entry>
- <entry>1024</entry>
- <entry>no</entry>
- <entry>no</entry>
- <entry>The size of the listen backlog.</entry>
- </row>
-
</tbody>
</tgroup>
</table>
diff --git a/test/box/admin.result b/test/box/admin.result
index 57342d9f11..e20eacb6bb 100644
--- a/test/box/admin.result
+++ b/test/box/admin.result
@@ -51,26 +51,25 @@ box.cfg()
logger: cat - >> tarantool.log
slab_alloc_arena: 0.1
log_level: 4
- snap_io_rate_limit: 0
- backlog: 1024
- secondary_port: 33014
+ primary_port: 33013
+ readahead: 16320
too_long_threshold: 0.5
logger_nonblock: true
- wal_dir: .
+ rows_per_wal: 50
snap_dir: .
coredump: false
replication_protocol: 1.6
- readahead: 16320
- local_hot_standby: false
+ wal_dir: .
+ snap_io_rate_limit: 0
wal_mode: fsync_delay
- rows_per_wal: 50
+ local_hot_standby: false
panic_on_snap_error: true
panic_on_wal_error: false
script_dir: .
replication_port: 0
bind_ipaddr: INADDR_ANY
wal_fsync_delay: 0
- primary_port: 33013
+ secondary_port: 33014
wal_dir_rescan_delay: 0.1
...
box.stat()
diff --git a/test/box/configuration.result b/test/box/configuration.result
index a01e113286..eadbbb65e4 100644
--- a/test/box/configuration.result
+++ b/test/box/configuration.result
@@ -17,26 +17,25 @@ print_config()
logger: cat - >> tarantool.log
slab_alloc_arena: 0.1
log_level: 4
- snap_io_rate_limit: 0
- backlog: 1024
- secondary_port: 33014
+ primary_port: 33013
+ readahead: 16320
too_long_threshold: 0.5
logger_nonblock: true
- wal_dir: .
+ rows_per_wal: 50
snap_dir: .
coredump: false
replication_protocol: 1.6
- readahead: 16320
- local_hot_standby: false
+ wal_dir: .
+ snap_io_rate_limit: 0
wal_mode: fsync_delay
- rows_per_wal: 50
+ local_hot_standby: false
panic_on_snap_error: true
panic_on_wal_error: false
script_dir: script_dir
replication_port: 0
bind_ipaddr: INADDR_ANY
wal_fsync_delay: 0
- primary_port: 33013
+ secondary_port: 33014
wal_dir_rescan_delay: 0.1
...
string.gmatch(package_path, '([^;]*)')()
diff --git a/test/box/lua.result b/test/box/lua.result
index 14d952043c..95f3b5d464 100644
--- a/test/box/lua.result
+++ b/test/box/lua.result
@@ -473,29 +473,28 @@ t
- 'slab_alloc_minimal: 64'
- 'admin_port: 33015'
- 'logger: cat - >> tarantool.log'
- - 'reload: function_ptr'
- 'slab_alloc_arena: 0.1'
- 'log_level: 4'
- - 'snap_io_rate_limit: 0'
+ - 'reload: function_ptr'
+ - 'panic_on_wal_error: false'
- 'too_long_threshold: 0.5'
- 'secondary_port: 33014'
- - 'primary_port: 33013'
- 'logger_nonblock: true'
- - 'panic_on_wal_error: false'
+ - 'primary_port: 33013'
- 'snap_dir: .'
- 'coredump: false'
- 'replication_protocol: 1.6'
+ - 'rows_per_wal: 50'
- 'wal_dir: .'
- - 'readahead: 16320'
- 'wal_mode: fsync_delay'
- - 'rows_per_wal: 50'
+ - 'snap_io_rate_limit: 0'
- 'panic_on_snap_error: true'
- 'local_hot_standby: false'
- 'script_dir: .'
- 'replication_port: 0'
- 'bind_ipaddr: INADDR_ANY'
- 'wal_fsync_delay: 0'
- - 'backlog: 1024'
+ - 'readahead: 16320'
- 'wal_dir_rescan_delay: 0.1'
...
t = {} for k,v in pairs(box.space[0]) do if type(v) ~= 'table' and type(v) ~= 'function' then table.insert(t, k..': '..tostring(v)) end end
@@ -524,29 +523,28 @@ t
- 'slab_alloc_minimal: 64'
- 'admin_port: 33015'
- 'logger: cat - >> tarantool.log'
- - 'reload: function_ptr'
- 'slab_alloc_arena: 0.1'
- 'log_level: 4'
- - 'snap_io_rate_limit: 0'
+ - 'reload: function_ptr'
+ - 'panic_on_wal_error: false'
- 'too_long_threshold: 0.5'
- 'secondary_port: 33014'
- - 'primary_port: 33013'
- 'logger_nonblock: true'
- - 'panic_on_wal_error: false'
+ - 'primary_port: 33013'
- 'snap_dir: .'
- 'coredump: false'
- 'replication_protocol: 1.6'
+ - 'rows_per_wal: 50'
- 'wal_dir: .'
- - 'readahead: 16320'
- 'wal_mode: fsync_delay'
- - 'rows_per_wal: 50'
+ - 'snap_io_rate_limit: 0'
- 'panic_on_snap_error: true'
- 'local_hot_standby: false'
- 'script_dir: .'
- 'replication_port: 0'
- 'bind_ipaddr: INADDR_ANY'
- 'wal_fsync_delay: 0'
- - 'backlog: 1024'
+ - 'readahead: 16320'
- 'wal_dir_rescan_delay: 0.1'
...
t = {} for k,v in pairs(box.space[0]) do if type(v) ~= 'table' and type(v) ~= 'function' then table.insert(t, k..': '..tostring(v)) end end
@@ -1478,26 +1476,25 @@ print_config()
logger: cat - >> tarantool.log
slab_alloc_arena: 0.1
log_level: 4
- snap_io_rate_limit: 0
- backlog: 1024
- secondary_port: 33014
+ primary_port: 33013
+ readahead: 16320
too_long_threshold: 0.5
logger_nonblock: true
- wal_dir: .
+ rows_per_wal: 50
snap_dir: .
coredump: false
replication_protocol: 1.6
- readahead: 16320
- local_hot_standby: false
+ wal_dir: .
+ snap_io_rate_limit: 0
wal_mode: fsync_delay
- rows_per_wal: 50
+ local_hot_standby: false
panic_on_snap_error: true
panic_on_wal_error: false
script_dir: .
replication_port: 0
bind_ipaddr: INADDR_ANY
wal_fsync_delay: 0
- primary_port: 33013
+ secondary_port: 33014
wal_dir_rescan_delay: 0.1
...
--
GitLab