mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

SERVER-48235 The primary node should use the AsyncDBClient to vote for committing the index build to allow the request to be interrupted by the IndexBuildsCoordinator

Browse Source
This commit is contained in:
Gregory Wlodarek 2020-05-14 22:58:51 -04:00 committed by Evergreen Agent
parent 065d4ab364
commit e4e8a73388
2 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/mongo/db/repl/replication_coordinator_impl.cpp
View File

@ -2355,28 +2355,6 @@ void ReplicationCoordinatorImpl::cancelCbkHandle(CallbackHandle activeHandle) {
_replExecutor->cancel(activeHandle); _replExecutor->cancel(activeHandle);
} }
BSONObj ReplicationCoordinatorImpl::_runCmdOnSelfOnAlternativeClient(OperationContext* opCtx,
const std::string& dbName,
const BSONObj& cmdObj) {
auto client = opCtx->getServiceContext()->makeClient("DBDirectClientCmd");
// We want the command's opCtx that gets executed via DBDirectClient to be interruptible
// so that we don't block state transitions. Callers of this function might run opCtx
// in an uninterruptible mode. To be on safer side, run the command in AlternativeClientRegion,
// to make sure that the command's opCtx is interruptible.
AlternativeClientRegion acr(client);
auto uniqueNewOpCtx = cc().makeOperationContext();
{
stdx::lock_guard<Client> lk(cc());
cc().setSystemOperationKillable(lk);
}
DBDirectClient dbClient(uniqueNewOpCtx.get());
const auto commandResponse = dbClient.runCommand(OpMsgRequest::fromDBAndBody(dbName, cmdObj));
return commandResponse->getCommandReply();
}
BSONObj ReplicationCoordinatorImpl::runCmdOnPrimaryAndAwaitResponse( BSONObj ReplicationCoordinatorImpl::runCmdOnPrimaryAndAwaitResponse(
OperationContext* opCtx, OperationContext* opCtx,
const std::string& dbName, const std::string& dbName,
@ -2386,27 +2364,14 @@ BSONObj ReplicationCoordinatorImpl::runCmdOnPrimaryAndAwaitResponse(
// About to make network and DBDirectClient (recursive) calls, so we should not hold any locks. // About to make network and DBDirectClient (recursive) calls, so we should not hold any locks.
invariant(!opCtx->lockState()->isLocked()); invariant(!opCtx->lockState()->isLocked());
const auto myHostAndPort = getMyHostAndPort();
const auto primaryHostAndPort = getCurrentPrimaryHostAndPort(); const auto primaryHostAndPort = getCurrentPrimaryHostAndPort();
if (myHostAndPort.empty()) {
// Possibly because either rsconfig is uninitialized or the node got removed from config.
uassertStatusOK(Status{ErrorCodes::NodeNotFound, "Address unknown."});
}
if (primaryHostAndPort.empty()) { if (primaryHostAndPort.empty()) {
uassertStatusOK(Status{ErrorCodes::NoConfigMaster, "Primary is unknown/down."}); uassertStatusOK(Status{ErrorCodes::NoConfigMaster, "Primary is unknown/down."});
} }
auto iAmPrimary = (myHostAndPort == primaryHostAndPort) ? true : false; // Run the command via AsyncDBClient which performs a network call. This is also the desired
// behaviour when running this command locally as to avoid using the DBDirectClient which would
if (iAmPrimary) { // provide additional management when trying to cancel the request with differing clients.
// Run command using DBDirectClient to avoid tcp connection.
return _runCmdOnSelfOnAlternativeClient(opCtx, dbName, cmdObj);
}
// Node is not primary, so we will run the remote command via AsyncDBClient. To use
// AsyncDBClient, we will be using repl task executor.
executor::RemoteCommandRequest request(primaryHostAndPort, dbName, cmdObj, nullptr); executor::RemoteCommandRequest request(primaryHostAndPort, dbName, cmdObj, nullptr);
executor::RemoteCommandResponse cbkResponse( executor::RemoteCommandResponse cbkResponse(
Status{ErrorCodes::InternalError, "Uninitialized value"}); Status{ErrorCodes::InternalError, "Uninitialized value"});

8
src/mongo/db/repl/replication_coordinator_impl.h
View File

@ -1434,14 +1434,6 @@ private:
*/ */
int64_t _nextRandomInt64_inlock(int64_t limit); int64_t _nextRandomInt64_inlock(int64_t limit);
/**
* Runs the command using DBDirectClient and returns the response received for that command.
* Callers of this function should not hold any locks.
*/
BSONObj _runCmdOnSelfOnAlternativeClient(OperationContext* opCtx,
const std::string& dbName,
const BSONObj& cmdObj);
/** /**
* This is called by a primary when they become aware that a node has completed initial sync. * This is called by a primary when they become aware that a node has completed initial sync.
* That primary initiates a reconfig to remove the 'newlyAdded' for that node, if it was set. * That primary initiates a reconfig to remove the 'newlyAdded' for that node, if it was set.