summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaley Chen <waleycz@gmail.com>2016-04-01 11:24:48 -0400
committerWaley Chen <waleycz@gmail.com>2016-04-01 11:25:55 -0400
commit66f642d25709132cb2840a42aa6adf45844c5f30 (patch)
treed8e59d1a9219456c713557f154858a566ecec037
parent95166a0d000f3b830f5094ea891e1c1d25b428c7 (diff)
downloadmongo-66f642d25709132cb2840a42aa6adf45844c5f30.tar.gz
Revert "SERVER-21170 NetworkInterface::startCommand should be able to reject requests due to shutdown"
This reverts commit ada50f9f409afdccb40038b3ba182bf4e81e0490.
-rw-r--r--src/mongo/executor/network_interface_impl.h2
-rw-r--r--src/mongo/executor/network_interface_mock.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/executor/network_interface_impl.h b/src/mongo/executor/network_interface_impl.h
index b2f64c6a971..55c25fe8e57 100644
--- a/src/mongo/executor/network_interface_impl.h
+++ b/src/mongo/executor/network_interface_impl.h
@@ -160,7 +160,7 @@ private:
bool _isExecutorRunnable = false;
// Flag indicating when this interface is being shut down (because shutdown() has executed).
- AtomicWord<bool> _inShutdown;
+ std::atomic<bool> _inShutdown;
// Interface for running remote commands
RemoteCommandRunnerImpl _commandRunner;
diff --git a/src/mongo/executor/network_interface_mock.h b/src/mongo/executor/network_interface_mock.h
index 4a9173f1954..b785ece5a97 100644
--- a/src/mongo/executor/network_interface_mock.h
+++ b/src/mongo/executor/network_interface_mock.h
@@ -291,7 +291,7 @@ private:
bool _hasStarted; // (M)
// Set to true by "shutDown()".
- AtomicWord<bool> _inShutdown; // (M)
+ std::atomic<bool> _inShutdown; // (M)
// Next date that the executor expects to wake up at (due to a scheduleWorkAt() call).
Date_t _executorNextWakeupDate; // (M)