diff options
| author | Etienne Petrel <etienne.petrel@mongodb.com> | 2022-03-29 01:02:41 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-03-29 01:29:17 +0000 |
| commit | 09a2837376dfb7ffda8ffcd8c4aaf13dcef6ca27 (patch) | |
| tree | f7c65cf9e81c2e727beb4938f042863c6025c2d1 /src/third_party/wiredtiger/src/conn/conn_tiered.c | |
| parent | 6bfde2b76777665f2f7196dda846fe5c4685efda (diff) | |
| download | mongo-09a2837376dfb7ffda8ffcd8c4aaf13dcef6ca27.tar.gz | |
Import wiredtiger: eec5d0bae8d92d211056eb1447efc629b65a125e from branch mongodb-master
ref: 07627d4b3e..eec5d0bae8
for: 6.0.0
WT-9012 Don't sleep when shutting down tiered storage server thread
Diffstat (limited to 'src/third_party/wiredtiger/src/conn/conn_tiered.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/conn/conn_tiered.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/third_party/wiredtiger/src/conn/conn_tiered.c b/src/third_party/wiredtiger/src/conn/conn_tiered.c index 6080bab0b30..27cc2cbdab8 100644 --- a/src/third_party/wiredtiger/src/conn/conn_tiered.c +++ b/src/third_party/wiredtiger/src/conn/conn_tiered.c @@ -815,14 +815,12 @@ __wt_tiered_storage_destroy(WT_SESSION_IMPL *session) conn->tiered_mgr_tid_set = false; } - /* Stop the internal server thread. */ + /* + * Stop the internal server thread. If there is unfinished work, we will recover it on startup + * just as if there had been a system failure. + */ if (conn->flush_cond != NULL) __wt_cond_signal(session, conn->flush_cond); - if (conn->tiered_cond != NULL) { - __wt_cond_signal(session, conn->tiered_cond); - /* Give thread time to drain the work. */ - __wt_sleep(1, 0); - } FLD_CLR(conn->server_flags, WT_CONN_SERVER_TIERED); if (conn->tiered_tid_set) { WT_ASSERT(session, conn->tiered_cond != NULL); |