diff options
author | Gregory Wlodarek <gregory.wlodarek@mongodb.com> | 2019-02-08 14:39:12 -0500 |
---|---|---|
committer | Gregory Wlodarek <gregory.wlodarek@mongodb.com> | 2019-02-13 14:09:27 -0500 |
commit | 9f6ab44d229a40b65e9b0316fb3d72f494504768 (patch) | |
tree | b8bca70ffab059bd1a468c0d4ac12b97839b88d2 /src/mongo | |
parent | 3a8290eef5c5934462b5cb84c9daded1b3073ad9 (diff) | |
download | mongo-9f6ab44d229a40b65e9b0316fb3d72f494504768.tar.gz |
SERVER-38977 Notify the IndexBuildsCoordinator of any changes to the replica set config
Diffstat (limited to 'src/mongo')
-rw-r--r-- | src/mongo/db/index_builds_coordinator.cpp | 4 | ||||
-rw-r--r-- | src/mongo/db/index_builds_coordinator.h | 9 | ||||
-rw-r--r-- | src/mongo/db/repl/SConscript | 1 | ||||
-rw-r--r-- | src/mongo/db/repl/replication_coordinator_impl.cpp | 4 | ||||
-rw-r--r-- | src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp | 4 |
5 files changed, 22 insertions, 0 deletions
diff --git a/src/mongo/db/index_builds_coordinator.cpp b/src/mongo/db/index_builds_coordinator.cpp index c63cc40ecd8..d245cf9620c 100644 --- a/src/mongo/db/index_builds_coordinator.cpp +++ b/src/mongo/db/index_builds_coordinator.cpp @@ -353,6 +353,10 @@ void IndexBuildsCoordinator::awaitNoBgOpInProgForDb(StringData db) const { dbIndexBuildsIt->second->waitUntilNoIndexBuildsRemain(lk); } +void IndexBuildsCoordinator::onReplicaSetReconfig() { + // TODO: not yet implemented. +} + void IndexBuildsCoordinator::sleepIndexBuilds_forTestOnly(bool sleep) { stdx::unique_lock<stdx::mutex> lk(_mutex); _sleepForTest = sleep; diff --git a/src/mongo/db/index_builds_coordinator.h b/src/mongo/db/index_builds_coordinator.h index 458843b4b60..02ca79faa4f 100644 --- a/src/mongo/db/index_builds_coordinator.h +++ b/src/mongo/db/index_builds_coordinator.h @@ -279,6 +279,15 @@ public: */ void awaitNoBgOpInProgForDb(StringData db) const; + /** + * Called by the replication coordinator when a replica set reconfig occurs, which could affect + * any index build to make their commit quorum unachievable. + * + * Checks if the commit quorum is still satisfiable for each index build, if it is no longer + * satisfiable, then those index builds are aborted. + */ + void onReplicaSetReconfig(); + void sleepIndexBuilds_forTestOnly(bool sleep); void verifyNoIndexBuilds_forTestOnly(); diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript index d14ac46e152..6bbbe7ece3e 100644 --- a/src/mongo/db/repl/SConscript +++ b/src/mongo/db/repl/SConscript @@ -850,6 +850,7 @@ env.Library( ], LIBDEPS_PRIVATE=[ '$BUILD_DIR/mongo/db/commands/test_commands_enabled', + '$BUILD_DIR/mongo/db/index_builds_coordinator_interface', ], ) diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp index 0c717af02bf..f128d9c42e6 100644 --- a/src/mongo/db/repl/replication_coordinator_impl.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl.cpp @@ -49,6 +49,7 @@ #include "mongo/db/concurrency/global_lock_acquisition_tracker.h" #include "mongo/db/concurrency/replication_state_transition_lock_guard.h" #include "mongo/db/index/index_descriptor.h" +#include "mongo/db/index_builds_coordinator.h" #include "mongo/db/kill_sessions_local.h" #include "mongo/db/logical_clock.h" #include "mongo/db/logical_time.h" @@ -2553,6 +2554,9 @@ void ReplicationCoordinatorImpl::_finishReplSetReconfig( lk.unlock(); _performPostMemberStateUpdateAction(action); _replExecutor->signalEvent(finishedEvent); + + // Inform the index builds coordinator of the replica set reconfig. + IndexBuildsCoordinator::get(opCtx.get())->onReplicaSetReconfig(); } Status ReplicationCoordinatorImpl::processReplSetInitiate(OperationContext* opCtx, diff --git a/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp b/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp index ece31e5739d..48a476609f1 100644 --- a/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl_heartbeat.cpp @@ -40,6 +40,7 @@ #include "mongo/base/status.h" #include "mongo/db/concurrency/replication_state_transition_lock_guard.h" +#include "mongo/db/index_builds_coordinator.h" #include "mongo/db/kill_sessions_local.h" #include "mongo/db/logical_clock.h" #include "mongo/db/logical_time_validator.h" @@ -628,6 +629,9 @@ void ReplicationCoordinatorImpl::_heartbeatReconfigFinish( _setCurrentRSConfig(lk, opCtx.get(), newConfig, myIndexValue); lk.unlock(); _performPostMemberStateUpdateAction(action); + + // Inform the index builds coordinator of the replica set reconfig. + IndexBuildsCoordinator::get(opCtx.get())->onReplicaSetReconfig(); } void ReplicationCoordinatorImpl::_trackHeartbeatHandle_inlock( |