refactor(replset): support passing callback to destroy

Author: mbroadst

lib/topologies/replset.js

@@ -948,19 +948,29 @@ ReplSet.prototype.auth = function(credentials, callback) {
  * @param {boolean} [options.force=false] Force destroy the pool
  * @method
  */
-ReplSet.prototype.destroy = function(options) {
+ReplSet.prototype.destroy = function(options, callback) {
   options = options || {};
-  // Transition state
-  stateTransition(this, DESTROYED);
+
+  let destroyCount = this.s.connectingServers.length + 1; // +1 for the callback from `replicaSetState.destroy`
+  const serverDestroyed = () => {
+    destroyCount--;
+    if (destroyCount > 0) {
+      return;
+    }
+
+    // Emit toplogy closing event
+    emitSDAMEvent(this, 'topologyClosed', { topologyId: this.id });
+
+    // Transition state
+    stateTransition(this, DESTROYED);
+
+    if (typeof callback === 'function') {
+      callback(null, null);
+    }
+  };
+
   // Clear out any monitoring process
   if (this.haTimeoutId) clearTimeout(this.haTimeoutId);
-  // Destroy the replicaset
-  this.s.replicaSetState.destroy(options);
-
-  // Destroy all connecting servers
-  this.s.connectingServers.forEach(function(x) {
-    x.destroy(options);
-  });
 
   // Clear out all monitoring
   for (var i = 0; i < this.intervalIds.length; i++) {
@@ -970,8 +980,18 @@ ReplSet.prototype.destroy = function(options) {
   // Reset list of intervalIds
   this.intervalIds = [];
 
-  // Emit toplogy closing event
-  emitSDAMEvent(this, 'topologyClosed', { topologyId: this.id });
+  if (destroyCount === 0) {
+    serverDestroyed();
+    return;
+  }
+
+  // Destroy the replicaset
+  this.s.replicaSetState.destroy(options, serverDestroyed);
+
+  // Destroy all connecting servers
+  this.s.connectingServers.forEach(function(x) {
+    x.destroy(options, serverDestroyed);
+  });
 };
 
 /**

lib/topologies/replset_state.js

@@ -116,31 +116,43 @@ ReplSetState.prototype.allServers = function(options) {
   return servers;
 };
 
-ReplSetState.prototype.destroy = function(options) {
-  // Destroy all sockets
-  if (this.primary) this.primary.destroy(options);
-  this.secondaries.forEach(function(x) {
-    x.destroy(options);
-  });
-  this.arbiters.forEach(function(x) {
-    x.destroy(options);
-  });
-  this.passives.forEach(function(x) {
-    x.destroy(options);
-  });
-  this.ghosts.forEach(function(x) {
-    x.destroy(options);
-  });
-  // Clear out the complete state
-  this.secondaries = [];
-  this.arbiters = [];
-  this.passives = [];
-  this.ghosts = [];
-  this.unknownServers = [];
-  this.set = {};
-  this.primary = null;
-  // Emit the topology changed
-  emitTopologyDescriptionChanged(this);
+ReplSetState.prototype.destroy = function(options, callback) {
+  const serversToDestroy = this.secondaries
+    .concat(this.arbiters)
+    .concat(this.passives)
+    .concat(this.ghosts);
+  if (this.primary) serversToDestroy.push(this.primary);
+
+  let serverCount = serversToDestroy.length;
+  const serverDestroyed = () => {
+    serverCount--;
+    if (serverCount > 0) {
+      return;
+    }
+
+    // Clear out the complete state
+    this.secondaries = [];
+    this.arbiters = [];
+    this.passives = [];
+    this.ghosts = [];
+    this.unknownServers = [];
+    this.set = {};
+    this.primary = null;
+
+    // Emit the topology changed
+    emitTopologyDescriptionChanged(this);
+
+    if (typeof callback === 'function') {
+      callback(null, null);
+    }
+  };
+
+  if (serverCount === 0) {
+    serverDestroyed();
+    return;
+  }
+
+  serversToDestroy.forEach(server => server.destroy(options, serverDestroyed));
 };
 
 ReplSetState.prototype.remove = function(server, options) {