Merge pull request #18 from Ultimaker/k8s

Ignoring empty responses from MongoDB

mongoOperator/helpers/MongoResources.py

@@ -2,6 +2,7 @@
 # !/usr/bin/env python
 # -*- coding: utf-8 -*-
 import json
+import logging
 from json import JSONDecodeError
 
 import re
@@ -119,7 +120,9 @@ def parseMongoResponse(cls, exec_response: str) -> Dict[str, any]:
         if error_search:
             raise ValueError(error_search.group(1).strip(": "))
 
-        raise ValueError("Cannot parse MongoDB status response: {}".format(repr(exec_response)))
+        # MongoDB often returns an empty status when it's starting up.
+        logging.info("Cannot find any JSON or error in the MongoDB response: %s", repr(exec_response))
+        return {}
 
     @classmethod
     def _createReplicaConfig(cls, cluster_object: V1MongoClusterConfiguration) -> Dict[str, any]:

mongoOperator/services/MongoService.py

@@ -47,10 +47,9 @@ def _execInPod(self, pod_index: int, name: str, namespace: str, mongo_command: s
             try:
                 exec_response = self.kubernetes_service.execInPod(self.CONTAINER, pod_name, namespace, exec_command)
                 response = MongoResources.parseMongoResponse(exec_response)
-                if response.get("ok") == 0 and response.get("codeName") == "NodeNotFound":
-                    logging.info("Waiting for replica set members for %s @ ns/%s: %s", pod_name, namespace, response)
-                else:
+                if response and response.get("codeName") != "NodeNotFound":
                     return response
+                logging.info("Waiting for replica set members for %s @ ns/%s: %s", pod_name, namespace, response)
 
             except ValueError as e:
                 if str(e) not in ("connection attempt failed", "connect failed"):

tests/helpers/TestMongoResources.py

@@ -101,9 +101,17 @@ def test_parseMongoResponse_error(self):
         self.assertEqual("connect failed", str(context.exception))
 
     def test_parseMongoResponse_empty(self):
-        with self.assertRaises(ValueError) as context:
-            MongoResources.parseMongoResponse("")
-        self.assertEqual("Cannot parse MongoDB status response: ''", str(context.exception))
+        self.assertEqual({}, MongoResources.parseMongoResponse(''))
+
+    def test_parseMongoResponse_only_version(self):
+        self.assertEqual({}, MongoResources.parseMongoResponse("MongoDB shell version v3.6.4\n"))
+
+    def test_parseMongoResponse_version_twice(self):
+        self.assertEqual({}, MongoResources.parseMongoResponse(
+            "MongoDB shell version v3.6.4\n"
+            "connecting to: mongodb://localhost:27017/admin\n"
+            "MongoDB server version: 3.6.4\n"
+        ))
 
     def test_parseMongoResponse_bad_json(self):
         with open("tests/fixtures/mongo_responses/replica-status-ok.txt") as f: