diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2016-11-07 16:41:41 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@mongodb.com> | 2016-11-07 16:41:41 +1100 |
| commit | 74430da40c96247c0a0d92f011ccfb2b175f1f32 (patch) | |
| tree | 702d0133d8a807606c8a086583efa23117a6e05f | |
| parent | 432ede044261ae0596c06972f469e7e006086e3f (diff) | |
| parent | 346180e79d0a9dd89644f63cfd8754723b6ecf60 (diff) | |
| download | mongo-74430da40c96247c0a0d92f011ccfb2b175f1f32.tar.gz | |
Merge branch 'develop' into mongodb-3.4mongodb-3.4.0-rc3
| -rw-r--r-- | bench/wtperf/stress/btree-split-stress.wtperf (renamed from bench/wtperf/runners/btree-split-stress.wtperf) | 0 | ||||
| -rw-r--r-- | bench/wtperf/stress/shared-cache-stress.wtperf (renamed from bench/wtperf/runners/shared-cache-stress.wtperf) | 0 | ||||
| -rw-r--r-- | src/schema/schema_util.c | 11 | ||||
| -rw-r--r-- | test/format/wts.c | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/bench/wtperf/runners/btree-split-stress.wtperf b/bench/wtperf/stress/btree-split-stress.wtperf index deb8c70d12f..deb8c70d12f 100644 --- a/bench/wtperf/runners/btree-split-stress.wtperf +++ b/bench/wtperf/stress/btree-split-stress.wtperf diff --git a/bench/wtperf/runners/shared-cache-stress.wtperf b/bench/wtperf/stress/shared-cache-stress.wtperf index 87d14f4f5c1..87d14f4f5c1 100644 --- a/bench/wtperf/runners/shared-cache-stress.wtperf +++ b/bench/wtperf/stress/shared-cache-stress.wtperf diff --git a/src/schema/schema_util.c b/src/schema/schema_util.c index 808a7fc36cf..433224a868e 100644 --- a/src/schema/schema_util.c +++ b/src/schema/schema_util.c @@ -27,12 +27,17 @@ __wt_schema_backup_check(WT_SESSION_IMPL *session, const char *name) if (!conn->hot_backup) return (0); __wt_readlock(session, conn->hot_backup_lock); - if (!conn->hot_backup) { + /* + * There is a window at the end of a backup where the list has been + * cleared from the connection but the flag is still set. It is safe + * to drop at that point. + */ + if (!conn->hot_backup || + (backup_list = conn->hot_backup_list) == NULL) { __wt_readunlock(session, conn->hot_backup_lock); return (0); } - for (i = 0, backup_list = conn->hot_backup_list; - backup_list[i] != NULL; ++i) { + for (i = 0; backup_list[i] != NULL; ++i) { if (strcmp(backup_list[i], name) == 0) { ret = EBUSY; break; diff --git a/test/format/wts.c b/test/format/wts.c index 23fdbce156c..da234ce53c7 100644 --- a/test/format/wts.c +++ b/test/format/wts.c @@ -157,8 +157,7 @@ wts_open(const char *home, bool set_api, WT_CONNECTION **connp) g.c_lsm_worker_threads); if (DATASOURCE("lsm") || g.c_cache < 20) { - p += snprintf(p, REMAIN(p, end), - ",eviction_dirty_target=80,eviction_dirty_trigger=95"); + p += snprintf(p, REMAIN(p, end), ",eviction_dirty_trigger=95"); } /* Eviction worker configuration. */ |