SERVER-32783 RemoteCommandRetryScheduler releases callback resources on completion

1 files changed, 7 insertions, 0 deletions

diff --git a/src/mongo/client/remote_command_retry_scheduler.cpp b/src/mongo/client/remote_command_retry_scheduler.cpp
index 026f0838718..77735816d10 100644
--- a/src/mongo/client/remote_command_retry_scheduler.cpp
+++ b/src/mongo/client/remote_command_retry_scheduler.cpp
@@ -284,8 +284,15 @@ void RemoteCommandRetryScheduler::_remoteCommandCallback(
 
 void RemoteCommandRetryScheduler::_onComplete(
     const executor::TaskExecutor::RemoteCommandCallbackArgs& rcba) {
+
+    invariant(_callback);
     _callback(rcba);
 
+    // This will release the resources held by the '_callback' function object. To avoid any issues
+    // with destruction logic in the function object's resources accessing this
+    // RemoteCommandRetryScheduler, we release this function object outside the lock.
+    _callback = {};
+
     stdx::lock_guard<stdx::mutex> lock(_mutex);
     invariant(_isActive_inlock());
     _state = State::kComplete;