diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2015-03-17 04:30:11 +0000 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2015-03-17 04:30:11 +0000 |
| commit | f38e325f87d94f178c932328632857361fc3c92c (patch) | |
| tree | 4087c0663d4d037041b474a5831f5d5476026188 /src/conn | |
| parent | b423b0a02a159c76232e38666c3ad28d7dd0b8f1 (diff) | |
| download | mongo-f38e325f87d94f178c932328632857361fc3c92c.tar.gz | |
Implement review feedback. The new configuration strings are:
file_manager=(close_idle_time=30,close_scan_interval=10)
Update the sweep test to take advantage of new configurations and
shorten the runtime.
Diffstat (limited to 'src/conn')
| -rw-r--r-- | src/conn/conn_api.c | 2 | ||||
| -rw-r--r-- | src/conn/conn_sweep.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/conn/conn_api.c b/src/conn/conn_api.c index 4c32b89edb1..36df2a4684d 100644 --- a/src/conn/conn_api.c +++ b/src/conn/conn_api.c @@ -1624,9 +1624,9 @@ wiredtiger_open(const char *home, WT_EVENT_HANDLER *event_handler, WT_ERR(__wt_config_gets(session, cfg, "mmap", &cval)); conn->mmap = cval.val == 0 ? 0 : 1; - WT_ERR(__wt_sweep_config(session, cfg)); WT_ERR(__conn_statistics_config(session, cfg)); WT_ERR(__wt_lsm_manager_config(session, cfg)); + WT_ERR(__wt_sweep_config(session, cfg)); WT_ERR(__wt_verbose_config(session, cfg)); /* Now that we know if verbose is configured, output the version. */ diff --git a/src/conn/conn_sweep.c b/src/conn/conn_sweep.c index 4fb4d022bc4..50812ccfa95 100644 --- a/src/conn/conn_sweep.c +++ b/src/conn/conn_sweep.c @@ -146,12 +146,13 @@ __wt_sweep_config(WT_SESSION_IMPL *session, const char *cfg[]) /* Pull out the sweep configurations. */ WT_RET(__wt_config_gets(session, - cfg, "file_close.interval", &cval)); - conn->sweep_interval = (time_t)cval.val; - WT_RET(__wt_config_gets(session, - cfg, "file_close.idle_time", &cval)); + cfg, "file_manager.close_idle_time", &cval)); conn->sweep_idle_time = (time_t)cval.val; + WT_RET(__wt_config_gets(session, + cfg, "file_manager.close_scan_interval", &cval)); + conn->sweep_interval = (time_t)cval.val; + return (0); } |