Import wiredtiger: 7374df6c344587d433853d01f0c6241428ab7a80 from branch mongodb-4.4

ref: bae0c1c914..7374df6c34
for: 4.4.7

WT-6230       Sanitize python test suite directory naming
WT-6436       Fix not resetting the key when retrying to search the history store
WT-6555       Fix memory error in test_txn13
WT-7135       Additional checks to detect when writing corrupted metadata
WT-7267       Compare entire history store key when inferring cursor position in `search_near`
WT-7348       Complete CMake POSIX support
WT-7379       Disable column store tests in compatibility test
WT-7440       Integrate file cursor with tiered storage
WT-7452       Improve logging when recovery (and RTS) is taking a long time
WT-7469       Fix potential hot backup read lock never unlocked
WT-7493       Add a new connection config to control the page eviction with update restore eviction
WT-7498       Implement tiered storage internal thread operations
WT-7504       Fix test_hs21 cache stuck dirty
WT-7510       Disable import when direct I/O is enabled in test/format
WT-7532       Hold schema lock when tiered manager calls flush_tier_once
WT-7541       Updated evergreen command to parse folder names with undesirable characters
WT-7542       Add a Python test to reconfigure zstd compression level after restart
WT-7545       Limit upgrade/downgrade testing to timestamp transactions at snapshot isolation
WT-7548       Create macro to identify dhandles directly associated with a Btree
WT-7549       clean up block manager identifiers to use object id naming
WT-7550       Properly check pinned page and fix not resetting cursor if error
WT-7565       Update invalid backup configurations
WT-7566       Resolve write after free for dead dhandle
WT-7567       Rework tiered storage reconfigure
WT-7569       Fix wrongly squash an out of order timestamp update
WT-7573       Print an error message and exit for invalid backup configurations in wtperf tests
WT-7574       disable compact tests for OS/X
WT-7581       Make wt_cache_config args consistent with other config functions
WT-7595       Add flag to history store cursor to track whether underlying table insertion was successful
WT-7602       Fix MacOS CMake Compilation Issues

Reverted ticket(s):
WT-7503       Change default compressor for WT HS to Zstandard

1 files changed, 5 insertions, 5 deletions

diff --git a/src/third_party/wiredtiger/src/conn/conn_cache.c b/src/third_party/wiredtiger/src/conn/conn_cache.c
index 53c4d4b1cc1..81fca88fe09 100644
--- a/src/third_party/wiredtiger/src/conn/conn_cache.c
+++ b/src/third_party/wiredtiger/src/conn/conn_cache.c
@@ -163,7 +163,7 @@ __cache_config_local(WT_SESSION_IMPL *session, bool shared, const char *cfg[])
  *     Configure or reconfigure the current cache and shared cache.
  */
 int
-__wt_cache_config(WT_SESSION_IMPL *session, bool reconfigure, const char *cfg[])
+__wt_cache_config(WT_SESSION_IMPL *session, const char *cfg[], bool reconfig)
 {
     WT_CONFIG_ITEM cval;
     WT_CONNECTION_IMPL *conn;
@@ -178,10 +178,10 @@ __wt_cache_config(WT_SESSION_IMPL *session, bool reconfigure, const char *cfg[])
     was_shared = F_ISSET(conn, WT_CONN_CACHE_POOL);
 
     /* Cleanup if reconfiguring */
-    if (reconfigure && was_shared && !now_shared)
+    if (reconfig && was_shared && !now_shared)
         /* Remove ourselves from the pool if necessary */
         WT_RET(__wt_conn_cache_pool_destroy(session));
-    else if (reconfigure && !was_shared && now_shared)
+    else if (reconfig && !was_shared && now_shared)
         /*
          * Cache size will now be managed by the cache pool - the start size always needs to be zero
          * to allow the pool to manage how much memory is in-use.
@@ -203,7 +203,7 @@ __wt_cache_config(WT_SESSION_IMPL *session, bool reconfigure, const char *cfg[])
      * Resize the thread group if reconfiguring, otherwise the thread group will be initialized as
      * part of creating the cache.
      */
-    if (reconfigure)
+    if (reconfig)
         WT_RET(__wt_thread_group_resize(session, &conn->evict_threads, conn->evict_threads_min,
           conn->evict_threads_max, WT_THREAD_CAN_WAIT | WT_THREAD_PANIC_FAIL));
 
@@ -231,7 +231,7 @@ __wt_cache_create(WT_SESSION_IMPL *session, const char *cfg[])
     cache = conn->cache;
 
     /* Use a common routine for run-time configuration options. */
-    WT_RET(__wt_cache_config(session, false, cfg));
+    WT_RET(__wt_cache_config(session, cfg, false));
 
     /*
      * The lowest possible page read-generation has a special meaning, it marks a page for forcible