-
Type:
Task
-
Resolution: Fixed
-
Priority:
Major - P3
-
Affects Version/s: None
-
Component/s: Sharding
-
Labels:
-
Fully Compatible
-
Sharding 2020-12-28
-
45
-
1
ReshardingOplogApplierTest fixture's way of shutting down ThreadPool inexplicably throws a std::exception (EDEADLK) when attempting to reacquire _mutex after having successfully joined all of the threads. As another way of illustrating this issue, the second of the invariants in the diff below fails sometimes when ReshardingOplogApplierTest::tearDown() is called.
Unable to find source-code formatter for language: diff. Available languages are: actionscript, ada, applescript, bash, c, c#, c++, cpp, css, erlang, go, groovy, haskell, html, java, javascript, js, json, lua, none, nyan, objc, perl, php, python, r, rainbow, ruby, scala, sh, sql, swift, visualbasic, xml, yaml
diff --git a/src/mongo/util/concurrency/thread_pool.cpp b/src/mongo/util/concurrency/thread_pool.cpp
index d333a82d12..b115b33033 100644
--- a/src/mongo/util/concurrency/thread_pool.cpp
+++ b/src/mongo/util/concurrency/thread_pool.cpp
@@ -307,9 +307,11 @@ void ThreadPool::Impl::_join_inlock(stdx::unique_lock<Latch>* lk) {
_joinRetired_inlock();
auto threadsToJoin = std::exchange(_threads, {});
lk->unlock();
+ invariant(!lk->owns_lock());
for (auto& t : threadsToJoin) {
t.join();
}
+ invariant(!lk->owns_lock());
lk->lock();
invariant(_state == joining);
_setState_inlock(shutdownComplete);
- is related to
-
SERVER-53011 ReshardingOplogApplierTest should gracefully tearDown test resources that it creates
-
- Closed
-