diff options
author | Jason Chan <jason.chan@10gen.com> | 2020-04-09 20:59:30 -0400 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-04-23 19:26:49 +0000 |
commit | 3064008dd3830bee2c18cea531fff565e26d47e5 (patch) | |
tree | 4288e9377b2455855b032035b3a262e74da6d296 /src/mongo/embedded | |
parent | ad478267c27b2b5f36cb39ad8c150081eaec9644 (diff) | |
download | mongo-3064008dd3830bee2c18cea531fff565e26d47e5.tar.gz |
SERVER-46893 Allow streamable isMaster to wait on removed/uninitialized nodes
(cherry picked from commit 2bad13a63315132a2793194d8d89f28dd7534928)
SERVER-47638 Ensure isMaster is waiting before calling replSetInitiate in AwaitableIsMasterOnNodeWithUninitializedConfigInvalidHorizon
(cherry picked from commit 523b9c9f92db20062ad6e3f42ceb80292e1a23f3)
Diffstat (limited to 'src/mongo/embedded')
-rw-r--r-- | src/mongo/embedded/replication_coordinator_embedded.cpp | 4 | ||||
-rw-r--r-- | src/mongo/embedded/replication_coordinator_embedded.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/embedded/replication_coordinator_embedded.cpp b/src/mongo/embedded/replication_coordinator_embedded.cpp index 1f569487739..cee4e8a51f3 100644 --- a/src/mongo/embedded/replication_coordinator_embedded.cpp +++ b/src/mongo/embedded/replication_coordinator_embedded.cpp @@ -515,14 +515,14 @@ std::shared_ptr<const repl::IsMasterResponse> ReplicationCoordinatorEmbedded::aw OperationContext* opCtx, const repl::SplitHorizon::Parameters& horizonParams, boost::optional<TopologyVersion> previous, - boost::optional<Date_t> deadline) const { + boost::optional<Date_t> deadline) { UASSERT_NOT_IMPLEMENTED; }; SharedSemiFuture<std::shared_ptr<const IsMasterResponse>> ReplicationCoordinatorEmbedded::getIsMasterResponseFuture( const SplitHorizon::Parameters& horizonParams, - boost::optional<TopologyVersion> clientTopologyVersion) const { + boost::optional<TopologyVersion> clientTopologyVersion) { UASSERT_NOT_IMPLEMENTED; } diff --git a/src/mongo/embedded/replication_coordinator_embedded.h b/src/mongo/embedded/replication_coordinator_embedded.h index 862e3da1fc4..ff32320a720 100644 --- a/src/mongo/embedded/replication_coordinator_embedded.h +++ b/src/mongo/embedded/replication_coordinator_embedded.h @@ -279,11 +279,11 @@ public: OperationContext* opCtx, const repl::SplitHorizon::Parameters& horizonParams, boost::optional<TopologyVersion> previous, - boost::optional<Date_t> deadline) const override; + boost::optional<Date_t> deadline) override; virtual SharedSemiFuture<std::shared_ptr<const repl::IsMasterResponse>> getIsMasterResponseFuture(const repl::SplitHorizon::Parameters& horizonParams, - boost::optional<TopologyVersion> clientTopologyVersion) const; + boost::optional<TopologyVersion> clientTopologyVersion); repl::OpTime getLatestWriteOpTime(OperationContext* opCtx) const override; |