Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 1 insertions, 6 deletions

diff --git a/src/mongo/s/service_entry_point_mongos.cpp b/src/mongo/s/service_entry_point_mongos.cpp
index d704c3c1354..12ebf1299bd 100644
--- a/src/mongo/s/service_entry_point_mongos.cpp
+++ b/src/mongo/s/service_entry_point_mongos.cpp
@@ -219,7 +219,7 @@ void ServiceEntryPointMongos::onClientConnect(Client* client) {
     }
 }
 
-void ServiceEntryPointMongos::onClientDisconnect(Client* client) try {
+void ServiceEntryPointMongos::onClientDisconnect(Client* client) {
     if (load_balancer_support::isFromLoadBalancer(client)) {
         _loadBalancedConnections.decrement();
 
@@ -259,11 +259,6 @@ void ServiceEntryPointMongos::onClientDisconnect(Client* client) try {
                  "aborting in-progress transaction because load-balanced client disconnected"});
         }
     }
-} catch (const DBException& ex) {
-    LOGV2_DEBUG(8969800,
-                2,
-                "Encountered error while performing client connection cleanup",
-                "error"_attr = ex.toStatus());
 }
 
 void ServiceEntryPointMongos::appendStats(BSONObjBuilder* bob) const {