CXX-334 fix shutdown in tests that manually call ReplicaSetMonitor::shutdown()

Author: amidvidy

src/mongo/client/init.cpp

@@ -25,6 +25,7 @@
 #include "mongo/platform/atomic_word.h"
 #include "mongo/stdx/functional.h"
 #include "mongo/util/background.h"
+#include "mongo/util/log.h"
 #include "mongo/util/net/sock.h"
 
 namespace mongo {
@@ -115,7 +116,12 @@ namespace client {
 
             Status result = ReplicaSetMonitor::shutdown(Options::current().autoShutdownGracePeriodMillis());
             if (!result.isOK()) {
-                return result;
+                if (result == ErrorCodes::ExceededTimeLimit) {
+                    return result;
+                }
+                warning() << "The ReplicaSetMonitor was shutdown prior to driver termination. "
+                          << "This is a non-fatal error that can occur if you are calling "
+                          << "ReplicaSetMonitor::shutdown() manually." << std::endl;
             }
             shutdownNetworking();
             return Status::OK();

src/mongo/client/replica_set_monitor.cpp

@@ -441,7 +441,7 @@ namespace {
     Status ReplicaSetMonitor::initialize() {
         boost::lock_guard<boost::mutex> lock(watcherLifetimeLock);
         if (replicaSetMonitorWatcher) {
-            return Status(ErrorCodes::IllegalOperation,
+            return Status(ErrorCodes::AlreadyInitialized,
                           "ReplicaSetMonitorWatcher has already been initialized");
         }
         replicaSetMonitorWatcher.reset(new ReplicaSetMonitorWatcher());
@@ -451,15 +451,15 @@ namespace {
     Status ReplicaSetMonitor::shutdown(int gracePeriodMillis) {
         boost::lock_guard<boost::mutex> lock(watcherLifetimeLock);
         if (!replicaSetMonitorWatcher) {
-            return Status(ErrorCodes::IllegalOperation,
+            return Status(ErrorCodes::InternalError,
                           "ReplicaSetMonitorWatcher has not been initialized");
         }
         // Call cancel first, in case the RSMW was never started.
         replicaSetMonitorWatcher->cancel();
         replicaSetMonitorWatcher->stop();
         bool success = replicaSetMonitorWatcher->wait(gracePeriodMillis);
         if (!success) {
-            return Status(ErrorCodes::InternalError,
+            return Status(ErrorCodes::ExceededTimeLimit,
                           "Timed out waiting for ReplicaSetMonitorWatcher to shutdown");
         }
         replicaSetMonitorWatcher.reset();