diff options
-rw-r--r-- | dist/api_data.py | 2 | ||||
-rw-r--r-- | src/config/config_def.c | 127 | ||||
-rw-r--r-- | src/conn/conn_ckpt.c | 33 | ||||
-rw-r--r-- | src/docs/upgrading.dox | 17 | ||||
-rw-r--r-- | src/include/connection.h | 1 | ||||
-rw-r--r-- | src/include/extern.h | 1 | ||||
-rw-r--r-- | src/include/wiredtiger.in | 11 | ||||
-rw-r--r-- | src/txn/txn_ckpt.c | 14 | ||||
-rw-r--r-- | test/format/wts.c | 1 | ||||
-rw-r--r-- | test/suite/test_reconfig01.py | 2 |
10 files changed, 91 insertions, 118 deletions
diff --git a/dist/api_data.py b/dist/api_data.py index 2fb78176ba5..ff46fa35d05 100644 --- a/dist/api_data.py +++ b/dist/api_data.py @@ -373,8 +373,6 @@ connection_runtime_config = [ periodically checkpoint the database. Enabling the checkpoint server uses a session from the configured session_max''', type='category', subconfig=[ - Config('name', '"WiredTigerCheckpoint"', r''' - the checkpoint name'''), Config('log_size', '0', r''' wait for this amount of log record bytes to be written to the log between each checkpoint. A database can configure diff --git a/src/config/config_def.c b/src/config/config_def.c index 352464ee92a..4a090975935 100644 --- a/src/config/config_def.c +++ b/src/config/config_def.c @@ -42,7 +42,6 @@ static const WT_CONFIG_CHECK static const WT_CONFIG_CHECK confchk_wiredtiger_open_checkpoint_subconfigs[] = { { "log_size", "int", NULL, "min=0,max=2GB", NULL, 0 }, - { "name", "string", NULL, NULL, NULL, 0 }, { "wait", "int", NULL, "min=0,max=100000", NULL, 0 }, { NULL, NULL, NULL, NULL, NULL, 0 } }; @@ -109,7 +108,7 @@ static const WT_CONFIG_CHECK confchk_WT_CONNECTION_reconfigure[] = { { "cache_size", "int", NULL, "min=1MB,max=10TB", NULL, 0 }, { "checkpoint", "category", NULL, NULL, - confchk_wiredtiger_open_checkpoint_subconfigs, 3 }, + confchk_wiredtiger_open_checkpoint_subconfigs, 2 }, { "error_prefix", "string", NULL, NULL, NULL, 0 }, { "eviction", "category", NULL, NULL, @@ -643,7 +642,7 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open[] = { { "cache_size", "int", NULL, "min=1MB,max=10TB", NULL, 0 }, { "checkpoint", "category", NULL, NULL, - confchk_wiredtiger_open_checkpoint_subconfigs, 3 }, + confchk_wiredtiger_open_checkpoint_subconfigs, 2 }, { "checkpoint_sync", "boolean", NULL, NULL, NULL, 0 }, { "config_base", "boolean", NULL, NULL, NULL, 0 }, { "create", "boolean", NULL, NULL, NULL, 0 }, @@ -724,7 +723,7 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_all[] = { { "cache_size", "int", NULL, "min=1MB,max=10TB", NULL, 0 }, { "checkpoint", "category", NULL, NULL, - confchk_wiredtiger_open_checkpoint_subconfigs, 3 }, + confchk_wiredtiger_open_checkpoint_subconfigs, 2 }, { "checkpoint_sync", "boolean", NULL, NULL, NULL, 0 }, { "config_base", "boolean", NULL, NULL, NULL, 0 }, { "create", "boolean", NULL, NULL, NULL, 0 }, @@ -806,7 +805,7 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_basecfg[] = { { "cache_size", "int", NULL, "min=1MB,max=10TB", NULL, 0 }, { "checkpoint", "category", NULL, NULL, - confchk_wiredtiger_open_checkpoint_subconfigs, 3 }, + confchk_wiredtiger_open_checkpoint_subconfigs, 2 }, { "checkpoint_sync", "boolean", NULL, NULL, NULL, 0 }, { "direct_io", "list", NULL, "choices=[\"checkpoint\",\"data\",\"log\"]", @@ -882,7 +881,7 @@ static const WT_CONFIG_CHECK confchk_wiredtiger_open_usercfg[] = { { "cache_size", "int", NULL, "min=1MB,max=10TB", NULL, 0 }, { "checkpoint", "category", NULL, NULL, - confchk_wiredtiger_open_checkpoint_subconfigs, 3 }, + confchk_wiredtiger_open_checkpoint_subconfigs, 2 }, { "checkpoint_sync", "boolean", NULL, NULL, NULL, 0 }, { "direct_io", "list", NULL, "choices=[\"checkpoint\",\"data\",\"log\"]", @@ -988,8 +987,7 @@ static const WT_CONFIG_ENTRY config_entries[] = { }, { "WT_CONNECTION.reconfigure", "async=(enabled=0,ops_max=1024,threads=2),cache_overhead=8," - "cache_size=100MB,checkpoint=(log_size=0," - "name=\"WiredTigerCheckpoint\",wait=0),error_prefix=," + "cache_size=100MB,checkpoint=(log_size=0,wait=0),error_prefix=," "eviction=(threads_max=1,threads_min=1),eviction_dirty_target=80," "eviction_dirty_trigger=95,eviction_target=80,eviction_trigger=95" ",file_manager=(close_handle_minimum=250,close_idle_time=30," @@ -1184,56 +1182,14 @@ static const WT_CONFIG_ENTRY config_entries[] = { }, { "wiredtiger_open", "async=(enabled=0,ops_max=1024,threads=2),buffer_alignment=-1," - "cache_overhead=8,cache_size=100MB,checkpoint=(log_size=0," - "name=\"WiredTigerCheckpoint\",wait=0),checkpoint_sync=," - "config_base=,create=0,direct_io=,encryption=(keyid=,name=," - "secretkey=),error_prefix=,eviction=(threads_max=1,threads_min=1)" - ",eviction_dirty_target=80,eviction_dirty_trigger=95," - "eviction_target=80,eviction_trigger=95,exclusive=0,extensions=," - "file_extend=,file_manager=(close_handle_minimum=250," - "close_idle_time=30,close_scan_interval=10),hazard_max=1000," - "in_memory=0,log=(archive=,compressor=,enabled=0,file_max=100MB," - "path=\".\",prealloc=,recover=on,zero_fill=0),lsm_manager=(merge=" - ",worker_thread_max=4),lsm_merge=,mmap=,multiprocess=0,readonly=0" - ",session_max=100,session_scratch_max=2MB," - "shared_cache=(chunk=10MB,name=,quota=0,reserve=0,size=500MB)," - "statistics=none,statistics_log=(json=0,on_close=0,path=\".\"," - "sources=,timestamp=\"%b %d %H:%M:%S\",wait=0)," - "transaction_sync=(enabled=0,method=fsync),use_environment=," - "use_environment_priv=0,verbose=,write_through=", - confchk_wiredtiger_open, 38 - }, - { "wiredtiger_open_all", - "async=(enabled=0,ops_max=1024,threads=2),buffer_alignment=-1," - "cache_overhead=8,cache_size=100MB,checkpoint=(log_size=0," - "name=\"WiredTigerCheckpoint\",wait=0),checkpoint_sync=," - "config_base=,create=0,direct_io=,encryption=(keyid=,name=," - "secretkey=),error_prefix=,eviction=(threads_max=1,threads_min=1)" - ",eviction_dirty_target=80,eviction_dirty_trigger=95," - "eviction_target=80,eviction_trigger=95,exclusive=0,extensions=," - "file_extend=,file_manager=(close_handle_minimum=250," - "close_idle_time=30,close_scan_interval=10),hazard_max=1000," - "in_memory=0,log=(archive=,compressor=,enabled=0,file_max=100MB," - "path=\".\",prealloc=,recover=on,zero_fill=0),lsm_manager=(merge=" - ",worker_thread_max=4),lsm_merge=,mmap=,multiprocess=0,readonly=0" - ",session_max=100,session_scratch_max=2MB," - "shared_cache=(chunk=10MB,name=,quota=0,reserve=0,size=500MB)," - "statistics=none,statistics_log=(json=0,on_close=0,path=\".\"," - "sources=,timestamp=\"%b %d %H:%M:%S\",wait=0)," - "transaction_sync=(enabled=0,method=fsync),use_environment=," - "use_environment_priv=0,verbose=,version=(major=0,minor=0)," - "write_through=", - confchk_wiredtiger_open_all, 39 - }, - { "wiredtiger_open_basecfg", - "async=(enabled=0,ops_max=1024,threads=2),buffer_alignment=-1," - "cache_overhead=8,cache_size=100MB,checkpoint=(log_size=0," - "name=\"WiredTigerCheckpoint\",wait=0),checkpoint_sync=," - "direct_io=,encryption=(keyid=,name=,secretkey=),error_prefix=," + "cache_overhead=8,cache_size=100MB,checkpoint=(log_size=0,wait=0)" + ",checkpoint_sync=,config_base=,create=0,direct_io=," + "encryption=(keyid=,name=,secretkey=),error_prefix=," "eviction=(threads_max=1,threads_min=1),eviction_dirty_target=80," "eviction_dirty_trigger=95,eviction_target=80,eviction_trigger=95" - ",extensions=,file_extend=,file_manager=(close_handle_minimum=250" - ",close_idle_time=30,close_scan_interval=10),hazard_max=1000," + ",exclusive=0,extensions=,file_extend=," + "file_manager=(close_handle_minimum=250,close_idle_time=30," + "close_scan_interval=10),hazard_max=1000,in_memory=0," "log=(archive=,compressor=,enabled=0,file_max=100MB,path=\".\"," "prealloc=,recover=on,zero_fill=0),lsm_manager=(merge=," "worker_thread_max=4),lsm_merge=,mmap=,multiprocess=0,readonly=0," @@ -1241,18 +1197,20 @@ static const WT_CONFIG_ENTRY config_entries[] = { ",name=,quota=0,reserve=0,size=500MB),statistics=none," "statistics_log=(json=0,on_close=0,path=\".\",sources=," "timestamp=\"%b %d %H:%M:%S\",wait=0),transaction_sync=(enabled=0" - ",method=fsync),verbose=,version=(major=0,minor=0),write_through=", - confchk_wiredtiger_open_basecfg, 33 + ",method=fsync),use_environment=,use_environment_priv=0,verbose=," + "write_through=", + confchk_wiredtiger_open, 38 }, - { "wiredtiger_open_usercfg", + { "wiredtiger_open_all", "async=(enabled=0,ops_max=1024,threads=2),buffer_alignment=-1," - "cache_overhead=8,cache_size=100MB,checkpoint=(log_size=0," - "name=\"WiredTigerCheckpoint\",wait=0),checkpoint_sync=," - "direct_io=,encryption=(keyid=,name=,secretkey=),error_prefix=," + "cache_overhead=8,cache_size=100MB,checkpoint=(log_size=0,wait=0)" + ",checkpoint_sync=,config_base=,create=0,direct_io=," + "encryption=(keyid=,name=,secretkey=),error_prefix=," "eviction=(threads_max=1,threads_min=1),eviction_dirty_target=80," "eviction_dirty_trigger=95,eviction_target=80,eviction_trigger=95" - ",extensions=,file_extend=,file_manager=(close_handle_minimum=250" - ",close_idle_time=30,close_scan_interval=10),hazard_max=1000," + ",exclusive=0,extensions=,file_extend=," + "file_manager=(close_handle_minimum=250,close_idle_time=30," + "close_scan_interval=10),hazard_max=1000,in_memory=0," "log=(archive=,compressor=,enabled=0,file_max=100MB,path=\".\"," "prealloc=,recover=on,zero_fill=0),lsm_manager=(merge=," "worker_thread_max=4),lsm_merge=,mmap=,multiprocess=0,readonly=0," @@ -1260,7 +1218,46 @@ static const WT_CONFIG_ENTRY config_entries[] = { ",name=,quota=0,reserve=0,size=500MB),statistics=none," "statistics_log=(json=0,on_close=0,path=\".\",sources=," "timestamp=\"%b %d %H:%M:%S\",wait=0),transaction_sync=(enabled=0" - ",method=fsync),verbose=,write_through=", + ",method=fsync),use_environment=,use_environment_priv=0,verbose=," + "version=(major=0,minor=0),write_through=", + confchk_wiredtiger_open_all, 39 + }, + { "wiredtiger_open_basecfg", + "async=(enabled=0,ops_max=1024,threads=2),buffer_alignment=-1," + "cache_overhead=8,cache_size=100MB,checkpoint=(log_size=0,wait=0)" + ",checkpoint_sync=,direct_io=,encryption=(keyid=,name=," + "secretkey=),error_prefix=,eviction=(threads_max=1,threads_min=1)" + ",eviction_dirty_target=80,eviction_dirty_trigger=95," + "eviction_target=80,eviction_trigger=95,extensions=,file_extend=," + "file_manager=(close_handle_minimum=250,close_idle_time=30," + "close_scan_interval=10),hazard_max=1000,log=(archive=," + "compressor=,enabled=0,file_max=100MB,path=\".\",prealloc=," + "recover=on,zero_fill=0),lsm_manager=(merge=,worker_thread_max=4)" + ",lsm_merge=,mmap=,multiprocess=0,readonly=0,session_max=100," + "session_scratch_max=2MB,shared_cache=(chunk=10MB,name=,quota=0," + "reserve=0,size=500MB),statistics=none,statistics_log=(json=0," + "on_close=0,path=\".\",sources=,timestamp=\"%b %d %H:%M:%S\"," + "wait=0),transaction_sync=(enabled=0,method=fsync),verbose=," + "version=(major=0,minor=0),write_through=", + confchk_wiredtiger_open_basecfg, 33 + }, + { "wiredtiger_open_usercfg", + "async=(enabled=0,ops_max=1024,threads=2),buffer_alignment=-1," + "cache_overhead=8,cache_size=100MB,checkpoint=(log_size=0,wait=0)" + ",checkpoint_sync=,direct_io=,encryption=(keyid=,name=," + "secretkey=),error_prefix=,eviction=(threads_max=1,threads_min=1)" + ",eviction_dirty_target=80,eviction_dirty_trigger=95," + "eviction_target=80,eviction_trigger=95,extensions=,file_extend=," + "file_manager=(close_handle_minimum=250,close_idle_time=30," + "close_scan_interval=10),hazard_max=1000,log=(archive=," + "compressor=,enabled=0,file_max=100MB,path=\".\",prealloc=," + "recover=on,zero_fill=0),lsm_manager=(merge=,worker_thread_max=4)" + ",lsm_merge=,mmap=,multiprocess=0,readonly=0,session_max=100," + "session_scratch_max=2MB,shared_cache=(chunk=10MB,name=,quota=0," + "reserve=0,size=500MB),statistics=none,statistics_log=(json=0," + "on_close=0,path=\".\",sources=,timestamp=\"%b %d %H:%M:%S\"," + "wait=0),transaction_sync=(enabled=0,method=fsync),verbose=," + "write_through=", confchk_wiredtiger_open_usercfg, 32 }, { NULL, NULL, NULL, 0 } diff --git a/src/conn/conn_ckpt.c b/src/conn/conn_ckpt.c index b1d619dc1e8..d54c65c4767 100644 --- a/src/conn/conn_ckpt.c +++ b/src/conn/conn_ckpt.c @@ -19,9 +19,6 @@ __ckpt_server_config(WT_SESSION_IMPL *session, const char **cfg, bool *startp) { WT_CONFIG_ITEM cval; WT_CONNECTION_IMPL *conn; - WT_DECL_ITEM(tmp); - WT_DECL_RET; - char *p; *startp = false; @@ -34,24 +31,6 @@ __ckpt_server_config(WT_SESSION_IMPL *session, const char **cfg, bool *startp) conn->ckpt_logsize = (wt_off_t)cval.val; /* - * The application can specify a checkpoint name, which we ignore if - * it's our default. - */ - WT_RET(__wt_config_gets(session, cfg, "checkpoint.name", &cval)); - if (cval.len != 0 && - !WT_STRING_MATCH(WT_CHECKPOINT, cval.str, cval.len)) { - WT_RET(__wt_checkpoint_name_ok(session, cval.str, cval.len)); - - WT_RET(__wt_scr_alloc(session, cval.len + 20, &tmp)); - WT_ERR(__wt_buf_fmt( - session, tmp, "name=%.*s", (int)cval.len, cval.str)); - WT_ERR(__wt_strdup(session, tmp->data, &p)); - - __wt_free(session, conn->ckpt_config); - conn->ckpt_config = p; - } - - /* * The checkpoint configuration requires a wait time and/or a log size, * if neither is set, we're not running at all. Checkpoints based on log * size also require logging be enabled. @@ -60,9 +39,9 @@ __ckpt_server_config(WT_SESSION_IMPL *session, const char **cfg, bool *startp) (conn->ckpt_logsize != 0 && FLD_ISSET(conn->log_flags, WT_CONN_LOG_ENABLED))) { /* Checkpoints are incompatible with in-memory configuration */ - WT_ERR(__wt_config_gets(session, cfg, "in_memory", &cval)); + WT_RET(__wt_config_gets(session, cfg, "in_memory", &cval)); if (cval.val != 0) - WT_ERR_MSG(session, EINVAL, + WT_RET_MSG(session, EINVAL, "checkpoint configuration incompatible with " "in-memory configuration"); @@ -71,8 +50,7 @@ __ckpt_server_config(WT_SESSION_IMPL *session, const char **cfg, bool *startp) *startp = true; } -err: __wt_scr_free(session, &tmp); - return (ret); + return (0); } /* @@ -102,7 +80,7 @@ __ckpt_server(void *arg) __wt_cond_wait(session, conn->ckpt_cond, conn->ckpt_usecs)); /* Checkpoint the database. */ - WT_ERR(wt_session->checkpoint(wt_session, conn->ckpt_config)); + WT_ERR(wt_session->checkpoint(wt_session, NULL)); /* Reset. */ if (conn->ckpt_logsize) { @@ -219,8 +197,6 @@ __wt_checkpoint_server_destroy(WT_SESSION_IMPL *session) } WT_TRET(__wt_cond_destroy(session, &conn->ckpt_cond)); - __wt_free(session, conn->ckpt_config); - /* Close the server thread's session. */ if (conn->ckpt_session != NULL) { wt_session = &conn->ckpt_session->iface; @@ -234,7 +210,6 @@ __wt_checkpoint_server_destroy(WT_SESSION_IMPL *session) conn->ckpt_session = NULL; conn->ckpt_tid_set = false; conn->ckpt_cond = NULL; - conn->ckpt_config = NULL; conn->ckpt_usecs = 0; return (ret); diff --git a/src/docs/upgrading.dox b/src/docs/upgrading.dox index c5fbc0a86a2..4af8482a635 100644 --- a/src/docs/upgrading.dox +++ b/src/docs/upgrading.dox @@ -2,12 +2,21 @@ @section version_281 Upgrading to Version 2.8.1 <dl> +<dt>Checkpoint server created checkpoint names</dt> +<dd> +The ::wiredtiger_open checkpoint configuration no longer supports the +\c name configuration, and checkpoint server created checkpoints will +always be named the default WiredTiger checkpoint name, +"WiredTigerCheckpoint". Applications depending on the ability to set the +checkpoint name for the checkpoint server will require modification. +</dd> + <dt>Statistics logging path</dt> <dd> -The statistics logging path configuration has been simplified to be only a -path to a directory, and the file name component of the path may no longer -be specified. Applications depending on the ability to set statistics log -file names will require modifications. +The ::wiredtiger_open statistics logging path configuration has been +simplified to be only a path to a directory, and the file name component +of the path may no longer be specified. Applications depending on the +ability to set statistics log file names will require modification. </dd> </dl><hr> diff --git a/src/include/connection.h b/src/include/connection.h index 804498f6869..a9855e42980 100644 --- a/src/include/connection.h +++ b/src/include/connection.h @@ -271,7 +271,6 @@ struct __wt_connection_impl { wt_thread_t ckpt_tid; /* Checkpoint thread */ bool ckpt_tid_set; /* Checkpoint thread set */ WT_CONDVAR *ckpt_cond; /* Checkpoint wait mutex */ - const char *ckpt_config; /* Checkpoint configuration */ #define WT_CKPT_LOGSIZE(conn) ((conn)->ckpt_logsize != 0) wt_off_t ckpt_logsize; /* Checkpoint log size period */ uint32_t ckpt_signalled;/* Checkpoint signalled */ diff --git a/src/include/extern.h b/src/include/extern.h index 881bac505ae..176f0908ffb 100644 --- a/src/include/extern.h +++ b/src/include/extern.h @@ -719,7 +719,6 @@ extern void __wt_txn_stats_update(WT_SESSION_IMPL *session); extern void __wt_txn_destroy(WT_SESSION_IMPL *session); extern int __wt_txn_global_init(WT_SESSION_IMPL *session, const char *cfg[]); extern int __wt_txn_global_destroy(WT_SESSION_IMPL *session); -extern int __wt_checkpoint_name_ok(WT_SESSION_IMPL *session, const char *name, size_t len); extern int __wt_checkpoint_get_handles(WT_SESSION_IMPL *session, const char *cfg[]); extern int __wt_txn_checkpoint(WT_SESSION_IMPL *session, const char *cfg[]); extern int __wt_checkpoint(WT_SESSION_IMPL *session, const char *cfg[]); diff --git a/src/include/wiredtiger.in b/src/include/wiredtiger.in index d15916b3e32..e4a5f516550 100644 --- a/src/include/wiredtiger.in +++ b/src/include/wiredtiger.in @@ -1789,8 +1789,6 @@ struct __wt_connection { * database can configure both log_size and wait to set an upper bound * for checkpoints; setting this value above 0 configures periodic * checkpoints., an integer between 0 and 2GB; default \c 0.} - * @config{ name, the checkpoint name., a string; - * default \c "WiredTigerCheckpoint".} * @config{ wait, seconds to wait between each * checkpoint; setting this value above 0 configures periodic * checkpoints., an integer between 0 and 100000; default \c 0.} @@ -2207,11 +2205,10 @@ struct __wt_connection { * configure both log_size and wait to set an upper bound for checkpoints; * setting this value above 0 configures periodic checkpoints., an integer * between 0 and 2GB; default \c 0.} - * @config{ name, the - * checkpoint name., a string; default \c "WiredTigerCheckpoint".} - * @config{ wait, seconds to wait between each - * checkpoint; setting this value above 0 configures periodic checkpoints., an - * integer between 0 and 100000; default \c 0.} + * @config{ wait, + * seconds to wait between each checkpoint; setting this value above 0 + * configures periodic checkpoints., an integer between 0 and 100000; default \c + * 0.} * @config{ ),,} * @config{checkpoint_sync, flush files to stable storage when closing or * writing checkpoints., a boolean flag; default \c true.} diff --git a/src/txn/txn_ckpt.c b/src/txn/txn_ckpt.c index 3a6e1832f34..661702d7f17 100644 --- a/src/txn/txn_ckpt.c +++ b/src/txn/txn_ckpt.c @@ -13,11 +13,11 @@ static int __checkpoint_lock_tree( static int __checkpoint_tree_helper(WT_SESSION_IMPL *, const char *[]); /* - * __wt_checkpoint_name_ok -- + * __checkpoint_name_ok -- * Complain if the checkpoint name isn't acceptable. */ -int -__wt_checkpoint_name_ok(WT_SESSION_IMPL *session, const char *name, size_t len) +static int +__checkpoint_name_ok(WT_SESSION_IMPL *session, const char *name, size_t len) { /* Check for characters we don't want to see in a metadata file. */ WT_RET(__wt_name_check(session, name, len)); @@ -107,7 +107,7 @@ __checkpoint_apply_all(WT_SESSION_IMPL *session, const char *cfg[], WT_RET(__wt_config_gets(session, cfg, "name", &cval)); named = cval.len != 0; if (named) - WT_RET(__wt_checkpoint_name_ok(session, cval.str, cval.len)); + WT_RET(__checkpoint_name_ok(session, cval.str, cval.len)); /* Step through the targets and optionally operate on each one. */ WT_ERR(__wt_config_gets(session, cfg, "target", &cval)); @@ -839,7 +839,7 @@ __checkpoint_lock_tree(WT_SESSION_IMPL *session, if (cval.len == 0) name = WT_CHECKPOINT; else { - WT_ERR(__wt_checkpoint_name_ok(session, cval.str, cval.len)); + WT_ERR(__checkpoint_name_ok(session, cval.str, cval.len)); WT_ERR(__wt_strndup(session, cval.str, cval.len, &name_alloc)); name = name_alloc; } @@ -854,10 +854,10 @@ __checkpoint_lock_tree(WT_SESSION_IMPL *session, __wt_config_next(&dropconf, &k, &v)) == 0) { /* Disallow unsafe checkpoint names. */ if (v.len == 0) - WT_ERR(__wt_checkpoint_name_ok( + WT_ERR(__checkpoint_name_ok( session, k.str, k.len)); else - WT_ERR(__wt_checkpoint_name_ok( + WT_ERR(__checkpoint_name_ok( session, v.str, v.len)); if (v.len == 0) diff --git a/test/format/wts.c b/test/format/wts.c index 69195abc3d4..5dcac5f5f28 100644 --- a/test/format/wts.c +++ b/test/format/wts.c @@ -139,6 +139,7 @@ wts_open(const char *home, bool set_api, WT_CONNECTION **connp) p += snprintf(p, REMAIN(p, end), "create=true," + "checkpoint=(wait=5)," "cache_size=%" PRIu32 "MB," "checkpoint_sync=false," "error_prefix=\"%s\"", diff --git a/test/suite/test_reconfig01.py b/test/suite/test_reconfig01.py index 419ff876dc2..fb3fb7edac6 100644 --- a/test/suite/test_reconfig01.py +++ b/test/suite/test_reconfig01.py @@ -92,8 +92,6 @@ class test_reconfig01(wttest.WiredTigerTestCase): self.conn.reconfigure("checkpoint=(wait=5)") self.conn.reconfigure("checkpoint=(log_size=0)") self.conn.reconfigure("checkpoint=(log_size=1M)") - self.conn.reconfigure("checkpoint=(wait=0,name=hi)") - self.conn.reconfigure("checkpoint=(wait=5,name=hi)") # Statistics logging: reconfigure the things we can reconfigure. def test_reconfig_statistics_log_ok(self): |