SERVER-28972 match return key by keyId in KeysCollectionManager::getKeyForValidation

1 files changed, 2 insertions, 13 deletions

diff --git a/src/mongo/db/keys_collection_manager.cpp b/src/mongo/db/keys_collection_manager.cpp
index 5dea71eb123..425a69e9f5a 100644
--- a/src/mongo/db/keys_collection_manager.cpp
+++ b/src/mongo/db/keys_collection_manager.cpp
@@ -102,24 +102,13 @@ StatusWith<KeysCollectionDocument> KeysCollectionManager::getKeyForSigning(
 
 StatusWith<KeysCollectionDocument> KeysCollectionManager::_getKeyWithKeyIdCheck(
     long long keyId, const LogicalTime& forThisTime) {
-    auto keyStatus = _getKey(forThisTime);
+    auto keyStatus = _keysCache.getKeyById(keyId, forThisTime);
 
     if (!keyStatus.isOK()) {
         return keyStatus;
     }
 
-    auto key = keyStatus.getValue();
-
-    if (keyId == key.getKeyId()) {
-        return key;
-    }
-
-    // Key not expired but keyId does not match!
-    return {ErrorCodes::KeyNotFound,
-            str::stream() << "No keys found for " << _purpose << " that is valid for time: "
-                          << forThisTime.toString()
-                          << " with id: "
-                          << keyId};
+    return keyStatus.getValue();
 }
 
 StatusWith<KeysCollectionDocument> KeysCollectionManager::_getKey(const LogicalTime& forThisTime) {