summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Benvenuto <mark.benvenuto@mongodb.com>2015-04-20 18:32:22 -0400
committerMark Benvenuto <mark.benvenuto@mongodb.com>2015-04-20 18:32:22 -0400
commit8c1851771a772ee69d5aa1b7e43375c5a951cb92 (patch)
treee53630886e23b4a65c460a107a11781d374b3bda
parenta966cea74fc5454f4a03691ffe59ab62162c88f7 (diff)
downloadmongo-8c1851771a772ee69d5aa1b7e43375c5a951cb92.tar.gz
SERVER-17820: Handle long running exitCleanly in Service Stop
-rw-r--r--src/mongo/util/ntservice.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/util/ntservice.cpp b/src/mongo/util/ntservice.cpp
index 7aafb2681fb..3da55f41214 100644
--- a/src/mongo/util/ntservice.cpp
+++ b/src/mongo/util/ntservice.cpp
@@ -535,8 +535,8 @@ namespace {
// We periodically check if we are done exiting by polling at half of each wait interval
//
- while (!serviceWorkerThread.try_join_for(
- boost::chrono::milliseconds(kStopWaitHintMillis / 2))) {
+ while (!serviceWorkerThread.timed_join(
+ boost::get_system_time() + boost::posix_time::millisec(kStopWaitHintMillis / 2))) {
reportStatus(SERVICE_STOP_PENDING, kStopWaitHintMillis);
log() << "Service Stop is waiting for storage engine to finish shutdown";
}