SERVER-29164 Ensure CatalogCache::getCollectionRoutingInfo does not throw

(cherry picked from commit ff3177abf366f0699629afb1b20fb72c6c79a6e4)

1 files changed, 8 insertions, 1 deletions

diff --git a/src/mongo/s/catalog_cache.cpp b/src/mongo/s/catalog_cache.cpp
index 36d5e82ac49..103a69550a2 100644
--- a/src/mongo/s/catalog_cache.cpp
+++ b/src/mongo/s/catalog_cache.cpp
@@ -212,7 +212,14 @@ StatusWith<CachedCollectionRoutingInfo> CatalogCache::getCollectionRoutingInfo(
             // Wait on the notification outside of the mutex
             ul.unlock();
 
-            auto refreshStatus = refreshNotification->get(opCtx);
+            auto refreshStatus = [&]() {
+                try {
+                    return refreshNotification->get(opCtx);
+                } catch (const DBException& ex) {
+                    return ex.toStatus();
+                }
+            }();
+
             if (!refreshStatus.isOK()) {
                 return refreshStatus;
             }