Merge pull request #5302 from lukepatrick/master

update db connect mongo connection test
StackStorm · Aug 19, 2021 · 71cb10f · 71cb10f
2 parents 396a8a8 + 19de351
commit 71cb10f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -29,6 +29,10 @@ Changed
 
   Contributed by @ericreeves.
 
+* update db connect mongo connection test - `isMaster` MongoDB command depreciated, switch to `hello` #5302
+
+  Contributed by @lukepatrick
+
 3.5.0 - June 23, 2021
 ---------------------
 

diff --git a/st2common/st2common/models/db/__init__.py b/st2common/st2common/models/db/__init__.py
@@ -199,8 +199,9 @@ def _db_connect(
     # successfully established.
     # See http://api.mongodb.com/python/current/api/pymongo/mongo_client.html for details
     try:
-        # The ismaster command is cheap and does not require auth
-        connection.admin.command("ismaster")
+        # The hello command is cheap and does not require auth
+        # https://docs.mongodb.com/v4.4/reference/command/hello/
+        connection.admin.command("hello")
     except (ConnectionFailure, ServerSelectionTimeoutError) as e:
         # NOTE: ServerSelectionTimeoutError can also be thrown if SSLHandShake fails in the server
         # Sadly the client doesn't include more information about the error so in such scenarios