summaryrefslogtreecommitdiff
path: root/src/third_party/wiredtiger/src/config
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@mongodb.com>2015-09-18 17:17:34 +1000
committerMichael Cahill <michael.cahill@mongodb.com>2015-09-18 17:17:34 +1000
commit881f00984ce2692b81154d5ea3d5fb589b484c70 (patch)
tree5a9b5aeaf3c6023457dd08dbb9e26150b45a7f14 /src/third_party/wiredtiger/src/config
parent250b05a6184b559dc5c2e3ee53c3183a70f47fd2 (diff)
downloadmongo-881f00984ce2692b81154d5ea3d5fb589b484c70.tar.gz
Import wiredtiger-wiredtiger-2.6.1-1119-g16e3e48.tar.gz from wiredtiger branch mongodb-3.2
Diffstat (limited to 'src/third_party/wiredtiger/src/config')
-rw-r--r--src/third_party/wiredtiger/src/config/config_def.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/third_party/wiredtiger/src/config/config_def.c b/src/third_party/wiredtiger/src/config/config_def.c
index 91cfcedfcaf..a3dc24fafc4 100644
--- a/src/third_party/wiredtiger/src/config/config_def.c
+++ b/src/third_party/wiredtiger/src/config/config_def.c
@@ -277,6 +277,13 @@ static const WT_CONFIG_CHECK confchk_WT_SESSION_drop[] = {
{ NULL, NULL, NULL, NULL, NULL, 0 }
};
+static const WT_CONFIG_CHECK confchk_WT_SESSION_log_flush[] = {
+ { "sync", "string",
+ NULL, "choices=[\"background\",\"off\",\"on\"]",
+ NULL, 0 },
+ { NULL, NULL, NULL, NULL, NULL, 0 }
+};
+
static const WT_CONFIG_CHECK confchk_WT_SESSION_open_cursor[] = {
{ "append", "boolean", NULL, NULL, NULL, 0 },
{ "bulk", "string", NULL, NULL, NULL, 0 },
@@ -864,6 +871,10 @@ static const WT_CONFIG_ENTRY config_entries[] = {
"force=0,remove_files=",
confchk_WT_SESSION_drop, 2
},
+ { "WT_SESSION.log_flush",
+ "sync=on",
+ confchk_WT_SESSION_log_flush, 1
+ },
{ "WT_SESSION.log_printf",
"",
NULL, 0
@@ -902,7 +913,7 @@ static const WT_CONFIG_ENTRY config_entries[] = {
NULL, 0
},
{ "WT_SESSION.transaction_sync",
- "timeout_ms=",
+ "timeout_ms=1200000",
confchk_WT_SESSION_transaction_sync, 1
},
{ "WT_SESSION.truncate",