summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/reporter_test.cpp
diff options
context:
space:
mode:
authorAndy Schwerin <schwerin@mongodb.com>2017-06-09 14:06:26 -0400
committerAndy Schwerin <schwerin@mongodb.com>2017-06-09 14:06:26 -0400
commitf9c36696a25d3837f512421755952736236bbed0 (patch)
tree9becbcdb1ade14d930d3b2da3c731ebfe20f8a75 /src/mongo/db/repl/reporter_test.cpp
parentdb55e668d87d66b171c310241bdbcabfa790e2cf (diff)
downloadmongo-f9c36696a25d3837f512421755952736236bbed0.tar.gz
SERVER-29493 Make ThreadPoolTaskExecutor's destructor execute shutdown and join.
Diffstat (limited to 'src/mongo/db/repl/reporter_test.cpp')
-rw-r--r--src/mongo/db/repl/reporter_test.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/db/repl/reporter_test.cpp b/src/mongo/db/repl/reporter_test.cpp
index 383b2cf8aca..f0261d64f5f 100644
--- a/src/mongo/db/repl/reporter_test.cpp
+++ b/src/mongo/db/repl/reporter_test.cpp
@@ -182,7 +182,8 @@ void ReporterTest::setUp() {
}
void ReporterTest::tearDown() {
- executor::ThreadPoolExecutorTest::tearDown();
+ getExecutor().shutdown();
+ getExecutor().join();
// Executor may still invoke reporter's callback before shutting down.
reporter.reset();
posUpdater.reset();