Fix issue #14. Watcher got exception if starting with dead Elastic

Author: Alexander Maretskiy

availability/storage.py

@@ -29,19 +29,18 @@ def get_elasticsearch(check_availability=False):
     """Return Elasticsearch instance.
 
     :param check_availability: check if nodes are available
-    :returns: Elasticsearch or None on failure
-    :rtype: elasticsearch.Elasticsearch
+    :returns: elasticsearch.Elasticsearch
+    :returns: None on failure
     """
     nodes = config.get_config()["backend"]["connection"]
     try:
         es = elasticsearch.Elasticsearch(nodes)
         if check_availability:
                 es.info()
     except Exception as e:
-        LOG.warning(
-            "Failed to query Elasticsearch nodes %s: %s"
-            % (nodes, str(e)))
-        raise
+        LOG.error("Failed to query Elasticsearch nodes %s: %s"
+                  % (nodes, str(e)))
+        return None
     return es
 
 

tests/unit/test_storage.py

@@ -62,16 +62,14 @@ def test_ensure_es_index_exists(
     @mock.patch("availability.storage.LOG")
     def test_get_elasticsearch(self, mock_log, mock_config, mock_elastic):
         mock_es = mock.Mock()
-        mock_es.indices.exists.side_effect = ValueError
         mock_elastic.return_value = mock_es
         mock_config.get_config.return_value = (
             {"backend": {"connection": "nodes"}})
-        self.assertFalse(mock_es.info.called)
         self.assertEqual(mock_es, storage.get_elasticsearch())
+        self.assertFalse(mock_es.info.called)
 
-        mock_es.indices.exists.side_effect = None
         mock_elastic.reset_mock()
-        self.assertEqual(mock_es, storage.get_elasticsearch(
-            check_availability=True))
+        mock_es.info.side_effect = ValueError
+        self.assertIsNone(storage.get_elasticsearch(check_availability=True))
         mock_elastic.assert_called_once_with("nodes")
         mock_es.info.assert_called_once_with()