summaryrefslogtreecommitdiff
path: root/src/mongo/transport
diff options
context:
space:
mode:
authorBilly Donahue <billy.donahue@mongodb.com>2019-09-10 19:03:36 +0000
committerevergreen <evergreen@mongodb.com>2019-09-10 19:03:36 +0000
commit5a0f718e1309a4484580d8038016d043ef3b887f (patch)
tree7a331d57ba6e33e61f96ed69b2aa387003a039ab /src/mongo/transport
parentb9e29cd56ebc9aca06f68eeeda7c523d3dfd6d41 (diff)
downloadmongo-5a0f718e1309a4484580d8038016d043ef3b887f.tar.gz
SERVER-43119 FailPoint cleanup
- Don't use MONGO_INITIALIZER to declare each fail point. We only need one init task in total: freeze and iterate the registry. - remove MONGO_FAIL_POINT_DECLARE macro (extern) - remove MONGO_FAIL_POINT_SHOULD_FAIL macro (FailPoint::shouldFail) - remove MONGO_FAIL_POINT_BLOCK_IF (FailPoint::executeIf) - remove MONGO_FAIL_POINT_BLOCK (FailPoint::execute) - clean up FailPointRegistry and fail_point_service implementation.
Diffstat (limited to 'src/mongo/transport')
-rw-r--r--src/mongo/transport/session_asio.h4
-rw-r--r--src/mongo/transport/transport_layer_asio.cpp2
-rw-r--r--src/mongo/transport/transport_layer_asio.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/transport/session_asio.h b/src/mongo/transport/session_asio.h
index 484b11f3331..434371863e5 100644
--- a/src/mongo/transport/session_asio.h
+++ b/src/mongo/transport/session_asio.h
@@ -446,7 +446,7 @@ private:
std::error_code ec;
size_t size;
- if (MONGO_FAIL_POINT(transportLayerASIOshortOpportunisticReadWrite) &&
+ if (MONGO_unlikely(transportLayerASIOshortOpportunisticReadWrite.shouldFail()) &&
_blockingMode == Async) {
asio::mutable_buffer localBuffer = buffers;
@@ -529,7 +529,7 @@ private:
std::error_code ec;
std::size_t size;
- if (MONGO_FAIL_POINT(transportLayerASIOshortOpportunisticReadWrite) &&
+ if (MONGO_unlikely(transportLayerASIOshortOpportunisticReadWrite.shouldFail()) &&
_blockingMode == Async) {
asio::const_buffer localBuffer = buffers;
diff --git a/src/mongo/transport/transport_layer_asio.cpp b/src/mongo/transport/transport_layer_asio.cpp
index cad586f38d6..58153a870e4 100644
--- a/src/mongo/transport/transport_layer_asio.cpp
+++ b/src/mongo/transport/transport_layer_asio.cpp
@@ -621,7 +621,7 @@ Future<SessionHandle> TransportLayerASIO::asyncConnect(HostAndPort peer,
return makeConnectError(status, connector->peer, connector->resolvedEndpoint);
})
.getAsync([connector](Status connectResult) {
- if (MONGO_FAIL_POINT(transportLayerASIOasyncConnectTimesOut)) {
+ if (MONGO_unlikely(transportLayerASIOasyncConnectTimesOut.shouldFail())) {
log() << "asyncConnectTimesOut fail point is active. simulating timeout.";
return;
}
diff --git a/src/mongo/transport/transport_layer_asio.h b/src/mongo/transport/transport_layer_asio.h
index c0e14452adf..90008fe3c89 100644
--- a/src/mongo/transport/transport_layer_asio.h
+++ b/src/mongo/transport/transport_layer_asio.h
@@ -69,11 +69,11 @@ class ServiceEntryPoint;
namespace transport {
// This fail point simulates reads and writes that always return 1 byte and fail with EAGAIN
-MONGO_FAIL_POINT_DECLARE(transportLayerASIOshortOpportunisticReadWrite);
+extern FailPoint transportLayerASIOshortOpportunisticReadWrite;
// This fail point will cause an asyncConnect to timeout after it's successfully connected
// to the remote peer
-MONGO_FAIL_POINT_DECLARE(transportLayerASIOasyncConnectTimesOut);
+extern FailPoint transportLayerASIOasyncConnectTimesOut;
/**
* A TransportLayer implementation based on ASIO networking primitives.