diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-02-16 17:16:26 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2015-02-16 17:16:26 +1100 |
| commit | 3b2313c177609c6174ddca2ed945a898731644f9 (patch) | |
| tree | bca25d2251cda19989122176f5475e682b98d0bf /dist | |
| parent | dc396e1cd64871219b9e5a1b6558707feb70706e (diff) | |
| parent | 2108f0f3edd5be1251f9a7878f2c8f3e62bd64fe (diff) | |
| download | mongo-3b2313c177609c6174ddca2ed945a898731644f9.tar.gz | |
Merge pull request #1666 from wiredtiger/wt-recover
Allow 'wt' command to run with or without recovery. #1651
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/api_data.py | 4 | ||||
| -rw-r--r-- | dist/api_err.py | 4 | ||||
| -rw-r--r-- | dist/s_string.ok | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/dist/api_data.py b/dist/api_data.py index 2c28fce8daf..def83717210 100644 --- a/dist/api_data.py +++ b/dist/api_data.py @@ -550,6 +550,10 @@ common_wiredtiger_open = [ Config('prealloc', 'true', r''' pre-allocate log files.''', type='boolean'), + Config('recover', 'on', r''' + run recovery or error if recovery needs to run after an + unclean shutdown.''', + choices=['error','on']), ]), Config('mmap', 'true', r''' Use memory mapping to access files when possible''', diff --git a/dist/api_err.py b/dist/api_err.py index 6c893c9af82..a1f5593abd4 100644 --- a/dist/api_err.py +++ b/dist/api_err.py @@ -47,6 +47,10 @@ errors = [ interface, no further WiredTiger calls are required.'''), Error('WT_RESTART', -31805, 'restart the operation (internal)', undoc=True), + Error('WT_RUN_RECOVERY', -31806, + 'recovery must be run to continue', ''' + This error is generated when wiredtiger_open is configured + to return an error if recovery is required to use the database.'''), ] # Update the #defines in the wiredtiger.in file. diff --git a/dist/s_string.ok b/dist/s_string.ok index 1658684313c..66439faf161 100644 --- a/dist/s_string.ok +++ b/dist/s_string.ok @@ -283,6 +283,7 @@ RNG ROCKSDB RPC RUNDIR +RVv Radu Recno Recurse @@ -1073,6 +1074,7 @@ treplacement trk trk's troot +trun trunc trylock trywrlock |