diff options
| author | Chenhao Qu <chenhao.qu@mongodb.com> | 2021-06-16 05:46:40 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-06-16 06:08:31 +0000 |
| commit | 3bc6e00615ac526630b33380c76d982706865d24 (patch) | |
| tree | 20839e6e7fc2602e80d19436b181d4b4695a4c1e | |
| parent | fa5fb112aa7690954e547aa9ea994533c18c40c7 (diff) | |
| download | mongo-3bc6e00615ac526630b33380c76d982706865d24.tar.gz | |
Import wiredtiger: 916a7defd830a64d57bdaad4b1f8522d77fe3e0c from branch mongodb-5.0
ref: 3ef954b29f..916a7defd8
for: 5.0.0-rc2
WT-7686 Fix config call, allowing "sync" option to work for flush_tier
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/conn/conn_tiered.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 5f403fe7b0b..285b1611f83 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-5.0", - "commit": "3ef954b29f131cb835c5b4cb81adcfc603dc072d" + "commit": "916a7defd830a64d57bdaad4b1f8522d77fe3e0c" } diff --git a/src/third_party/wiredtiger/src/conn/conn_tiered.c b/src/third_party/wiredtiger/src/conn/conn_tiered.c index a443802197c..e24e44dc03c 100644 --- a/src/third_party/wiredtiger/src/conn/conn_tiered.c +++ b/src/third_party/wiredtiger/src/conn/conn_tiered.c @@ -369,7 +369,7 @@ __wt_flush_tier(WT_SESSION_IMPL *session, const char *config) WT_RET(__wt_config_gets(session, cfg, "force", &cval)); if (cval.val) LF_SET(WT_FLUSH_TIER_FORCE); - WT_RET(__wt_config_gets_def(session, cfg, "sync", 0, &cval)); + WT_RET(__wt_config_gets(session, cfg, "sync", &cval)); if (WT_STRING_MATCH("off", cval.str, cval.len)) LF_SET(WT_FLUSH_TIER_OFF); else if (WT_STRING_MATCH("on", cval.str, cval.len)) |