SERVER-43579 Make AWS KMS support robust to KMS availability

1 files changed, 7 insertions, 1 deletions

diff --git a/src/mongo/shell/kms_aws.cpp b/src/mongo/shell/kms_aws.cpp
index 1417b847781..34b185a4f62 100644
--- a/src/mongo/shell/kms_aws.cpp
+++ b/src/mongo/shell/kms_aws.cpp
@@ -342,9 +342,15 @@ void AWSConnection::connect(const HostAndPort& host) {
             str::stream() << "AWS KMS server address " << host.host() << " is invalid.",
             server.isValid());
 
+    int attempt = 0;
+    bool connected = false;
+    while ((connected == false) && (attempt < 3)) {
+        connected = _socket->connect(server);
+        attempt++;
+    }
     uassert(51137,
             str::stream() << "Could not connect to AWS KMS server " << server.toString(),
-            _socket->connect(server));
+            connected);
 
     uassert(51138,
             str::stream() << "Failed to perform SSL handshake with the AWS KMS server "