diff --git a/cfg/tarantool_box_cfg.cfg b/cfg/tarantool_box_cfg.cfg
index a10736571f9c87a9997d274882114f300b4cbe02..462ff3f3b3bf262f1c1f77c77cdde94bc2e68f34 100644
--- a/cfg/tarantool_box_cfg.cfg
+++ b/cfg/tarantool_box_cfg.cfg
@@ -3,6 +3,7 @@
username = NULL
# save core on abort/assert
+# deprecated; use ulimit instead
coredump = 0
# admin port
@@ -12,13 +13,13 @@ admin_port = 0
# Log verbosity, possible values: ERROR=1, CRIT=2, WARN=3, INFO=4(default), DEBUG=5
log_level = 4
-# Size of slab arena in GiBs
+# Size of slab arena in GB
slab_alloc_arena = 1
# Size of minimal allocation unit
slab_alloc_minimal = 64
-# Growth factor, each subsecuent unit size is factor * prev unit size
+# Growth factor, each subsequent unit size is factor * prev unit size
slab_alloc_factor = 2
# working directory (daemon will chdir(2) to it)
@@ -28,15 +29,15 @@ work_dir = NULL
pid_file = "tarantool.pid"
# logger command will be executed via /bin/sh -c {}
-# example: 'exec cronolog /var/log/taranul/%Y-%m/%Y-%m-%d/tarantool.log'
-# example: 'exec extra/logger.pl /var/log/taranul/tarantool.log'
+# example: 'exec cronolog /var/log/tarantool/%Y-%m/%Y-%m-%d/tarantool.log'
+# example: 'exec extra/logger.pl /var/log/tarantool/tarantool.log'
# when logger is not configured all logging going to STDERR
logger = NULL
-# make logging nonblocking, this potentially can loss some logging data
+# make logging nonblocking, this potentially can lose some logging data
logger_nonblock = 1
-# delay between loop iteraions
+# delay between loop iterations
io_collect_interval = 0
# size of listen backlog
@@ -49,7 +50,7 @@ readahead = 16320
# Snapshot directory (where snapshots get saved/read)
snap_dir = "."
-# WAL directory (where WAL get saved/read)
+# WAL directory (where WALs get saved/read)
wal_dir = "."
# Primary port (where updates are accepted)
@@ -58,10 +59,11 @@ primary_port = 0
# Secondary port (where only selects are accepted)
secondary_port = 0
-# warn about requests which take longer to process
+# Warn about requests which take longer to process, in seconds.
too_long_threshold = 0.5
-# custom proc title is appended after normal
+# A custom process list (ps) title string, appended after the standard
+# program title.
custom_proc_title = NULL
# Memcached emulation is enabled if memcached == 1
@@ -73,35 +75,38 @@ memcached_namespace = 23
# maximum rows to consider per expire loop iteration
memcached_expire_per_loop = 1024
-# tarantool will try iterate all rows within this time
+# tarantool will try to iterate over all rows within this time
memcached_expire_full_sweep = 3600
-# do not write snapshot faster then snap_io_rate_limit MBytes/sec
+# Do not write into snapshot faster than snap_io_rate_limit MB/sec
snap_io_rate_limit = 0
# Write no more rows in WAL
rows_per_wal = 500000
-# fsync WAL delay, only issue fsync if last fsync was wal_fsync_delay seconds ago
-# WARNING: actually, several last requsts may stall for much longer
+# fsync WAL delay, only issue fsync if last fsync was wal_fsync_delay
+# seconds ago.
+# WARNING: actually, several last requests may stall fsync for much longer
wal_fsync_delay = 0
-# size of WAL writer requests buffer
+# size of WAL writer request buffer
wal_writer_inbox_size = 128
-# Local hot standby (if enabled server will run in locale hot standby mode
-# continuously fetching WAL records from shared local directory
+# Local hot standby (if enabled, the server will run in local hot standby
+# mode, continuously fetching WAL records from shared local directory).
local_hot_standby = 0
-# delay in fractional seconds between successive re-readings of wal_dir
+# Delay, in seconds, between successive re-readings of wal_dir.
+# The re-scan is necessary to discover new WAL files or snapshots.
wal_dir_rescan_delay = 0.1
-# panic if where is error reading snap or wal
-# be default panic any snapshot reading error and ignore errors then reading wals
+# Panic if there is an error reading a snapshot or WAL.
+# By default, panic on any snapshot reading error and ignore errors
+# when reading WALs.
panic_on_snap_error = 1
panic_on_wal_error = 0
-# Remote hot standby (if enabled server will run in hot standby mode
+# Remote hot standby (if enabled, the server will run in hot standby mode
# continuously fetching WAL records from wal_feeder_ipaddr:wal_feeder_port
remote_hot_standby = 0
wal_feeder_ipaddr = NULL
diff --git a/cfg/tarantool_box_cfg.h b/cfg/tarantool_box_cfg.h
index 44a9c4a1b27f16485073d5a9eb7534deb31dfb5b..65449d4d31cd281ff2db81cbfe218c63d890ff7b 100644
--- a/cfg/tarantool_box_cfg.h
+++ b/cfg/tarantool_box_cfg.h
@@ -39,7 +39,10 @@ typedef struct tarantool_cfg {
/* username to switch to */
char* username;
- /* save core on abort/assert */
+ /*
+ * save core on abort/assert
+ * deprecated; use ulimit instead
+ */
int32_t coredump;
/*
@@ -51,13 +54,13 @@ typedef struct tarantool_cfg {
/* Log verbosity, possible values: ERROR=1, CRIT=2, WARN=3, INFO=4(default), DEBUG=5 */
int32_t log_level;
- /* Size of slab arena in GiBs */
+ /* Size of slab arena in GB */
double slab_alloc_arena;
/* Size of minimal allocation unit */
int32_t slab_alloc_minimal;
- /* Growth factor, each subsecuent unit size is factor * prev unit size */
+ /* Growth factor, each subsequent unit size is factor * prev unit size */
double slab_alloc_factor;
/* working directory (daemon will chdir(2) to it) */
@@ -68,16 +71,16 @@ typedef struct tarantool_cfg {
/*
* logger command will be executed via /bin/sh -c {}
- * example: 'exec cronolog /var/log/taranul/%Y-%m/%Y-%m-%d/tarantool.log'
- * example: 'exec extra/logger.pl /var/log/taranul/tarantool.log'
+ * example: 'exec cronolog /var/log/tarantool/%Y-%m/%Y-%m-%d/tarantool.log'
+ * example: 'exec extra/logger.pl /var/log/tarantool/tarantool.log'
* when logger is not configured all logging going to STDERR
*/
char* logger;
- /* make logging nonblocking, this potentially can loss some logging data */
+ /* make logging nonblocking, this potentially can lose some logging data */
int32_t logger_nonblock;
- /* delay between loop iteraions */
+ /* delay between loop iterations */
double io_collect_interval;
/* size of listen backlog */
@@ -92,7 +95,7 @@ typedef struct tarantool_cfg {
*/
char* snap_dir;
- /* WAL directory (where WAL get saved/read) */
+ /* WAL directory (where WALs get saved/read) */
char* wal_dir;
/* Primary port (where updates are accepted) */
@@ -101,10 +104,13 @@ typedef struct tarantool_cfg {
/* Secondary port (where only selects are accepted) */
int32_t secondary_port;
- /* warn about requests which take longer to process */
+ /* Warn about requests which take longer to process, in seconds. */
double too_long_threshold;
- /* custom proc title is appended after normal */
+ /*
+ * A custom process list (ps) title string, appended after the standard
+ * program title.
+ */
char* custom_proc_title;
/* Memcached emulation is enabled if memcached == 1 */
@@ -116,42 +122,47 @@ typedef struct tarantool_cfg {
/* maximum rows to consider per expire loop iteration */
int32_t memcached_expire_per_loop;
- /* tarantool will try iterate all rows within this time */
+ /* tarantool will try to iterate over all rows within this time */
int32_t memcached_expire_full_sweep;
- /* do not write snapshot faster then snap_io_rate_limit MBytes/sec */
+ /* Do not write into snapshot faster than snap_io_rate_limit MB/sec */
double snap_io_rate_limit;
/* Write no more rows in WAL */
int32_t rows_per_wal;
/*
- * fsync WAL delay, only issue fsync if last fsync was wal_fsync_delay seconds ago
- * WARNING: actually, several last requsts may stall for much longer
+ * fsync WAL delay, only issue fsync if last fsync was wal_fsync_delay
+ * seconds ago.
+ * WARNING: actually, several last requests may stall fsync for much longer
*/
int32_t wal_fsync_delay;
- /* size of WAL writer requests buffer */
+ /* size of WAL writer request buffer */
int32_t wal_writer_inbox_size;
/*
- * Local hot standby (if enabled server will run in locale hot standby mode
- * continuously fetching WAL records from shared local directory
+ * Local hot standby (if enabled, the server will run in local hot standby
+ * mode, continuously fetching WAL records from shared local directory).
*/
int32_t local_hot_standby;
- /* delay in fractional seconds between successive re-readings of wal_dir */
+ /*
+ * Delay, in seconds, between successive re-readings of wal_dir.
+ * The re-scan is necessary to discover new WAL files or snapshots.
+ */
double wal_dir_rescan_delay;
/*
- * panic if where is error reading snap or wal
- * be default panic any snapshot reading error and ignore errors then reading wals
+ * Panic if there is an error reading a snapshot or WAL.
+ * By default, panic on any snapshot reading error and ignore errors
+ * when reading WALs.
*/
int32_t panic_on_snap_error;
int32_t panic_on_wal_error;
/*
- * Remote hot standby (if enabled server will run in hot standby mode
+ * Remote hot standby (if enabled, the server will run in hot standby mode
* continuously fetching WAL records from wal_feeder_ipaddr:wal_feeder_port
*/
int32_t remote_hot_standby;
diff --git a/core/admin.m b/core/admin.m
index 73fb1654141c479ed998b3001e82aa3092658865..6ffc97035e7caef54fd337bb2d44e6639f721751 100644
--- a/core/admin.m
+++ b/core/admin.m
@@ -61,7 +61,7 @@ static const char *help =
static const char *unknown_command = "unknown command. try typing help." CRLF;
-#line 65 "core/admin.c"
+#line 65 "core/admin.m"
static const int admin_start = 1;
static const int admin_first_final = 108;
static const int admin_error = 0;
@@ -119,12 +119,12 @@ admin_dispatch(void)
p = fiber->rbuf->data;
-#line 123 "core/admin.c"
+#line 123 "core/admin.m"
{
cs = admin_start;
}
-#line 128 "core/admin.c"
+#line 128 "core/admin.m"
{
if ( p == pe )
goto _test_eof;
@@ -283,7 +283,7 @@ st108:
if ( ++p == pe )
goto _test_eof108;
case 108:
-#line 287 "core/admin.c"
+#line 287 "core/admin.m"
goto st0;
tr13:
#line 193 "core/admin.rl"
@@ -383,7 +383,7 @@ st7:
if ( ++p == pe )
goto _test_eof7;
case 7:
-#line 387 "core/admin.c"
+#line 387 "core/admin.m"
if ( (*p) == 10 )
goto st108;
goto st0;
@@ -471,7 +471,7 @@ st16:
if ( ++p == pe )
goto _test_eof16;
case 16:
-#line 475 "core/admin.c"
+#line 475 "core/admin.m"
switch( (*p) ) {
case 10: goto tr28;
case 13: goto tr29;
@@ -485,7 +485,7 @@ st17:
if ( ++p == pe )
goto _test_eof17;
case 17:
-#line 489 "core/admin.c"
+#line 489 "core/admin.m"
switch( (*p) ) {
case 10: goto tr28;
case 13: goto tr29;