Add feature flag for draining incoming connections

Author: Joshua T Corbin

clients/index.js

@@ -365,6 +365,7 @@ ApplicationClients.prototype.onRemoteConfigUpdate = function onRemoteConfigUpdat
     self.updateReservoir();
     self.updateReapPeersPeriod();
     self.updatePrunePeersPeriod();
+    self.updateDrainIncomingConnections();
     self.updatePartialAffinityEnabled();
     self.setMaximumRelayTTL();
     self.updatePeerHeapEnabled();
@@ -444,6 +445,12 @@ function updatePrunePeersPeriod() {
     self.serviceProxy.setPrunePeersPeriod(period);
 };
 
+ApplicationClients.prototype.updateDrainIncomingConnections = function updateDrainIncomingConnections() {
+    var self = this;
+    var enabled = self.remoteConfig.get('drainIncomingConnections.enabled', false);
+    self.serviceProxy.setDrainIncomingConnections(enabled);
+};
+
 ApplicationClients.prototype.updatePartialAffinityEnabled = function updatePartialAffinityEnabled() {
     var self = this;
     var enabled = self.remoteConfig.get('partialAffinity.enabled', false);

service-proxy.js

@@ -89,6 +89,7 @@ function ServiceDispatchHandler(options) {
     });
     self.rateLimiterEnabled = options.rateLimiterEnabled;
 
+    self.drainIncomingConnections = !!options.drainIncomingConnections;
     self.partialAffinityEnabled = !!options.partialAffinityEnabled;
     self.minPeersPerWorker = options.minPeersPerWorker || DEFAULT_MIN_PEERS_PER_WORKER;
     self.minPeersPerRelay = options.minPeersPerRelay || DEFAULT_MIN_PEERS_PER_RELAY;
@@ -636,7 +637,9 @@ function ensurePeerConnected(serviceName, peer, reason, now) {
     }
 
     var conn = peer.connectTo();
-    self.drainInOnceConnected(peer, conn, reason);
+    if (self.drainIncomingConnections) {
+        self.drainInOnceConnected(peer, conn, reason);
+    }
 };
 
 ServiceDispatchHandler.prototype.drainInOnceConnected =
@@ -1604,6 +1607,12 @@ function disableRateLimiter() {
     self.rateLimiterEnabled = false;
 };
 
+ServiceDispatchHandler.prototype.setDrainIncomingConnections =
+function setDrainIncomingConnections(enabled) {
+    var self = this;
+    self.drainIncomingConnections = !!enabled;
+};
+
 ServiceDispatchHandler.prototype.setPartialAffinityEnabled =
 function enablePartialAffinity(enabled) {
     var self = this;