Merge pull request #45 from GaneshManal/PNDA-2282

PNDA-2282: Pass more specific reason back in case of bad health for deployment manager - Added exception handling changes.

Author: trsmith2

api/src/main/resources/app.py

@@ -37,7 +37,7 @@
 import application_summary_registrar
 import deployment_manager
 from deployer_system_test import DeployerRestClientTester
-from exceptiondef import NotFound, ConflictingState, FailedValidation, FailedCreation
+from exceptiondef import NotFound, ConflictingState, FailedValidation, FailedCreation, FailedConnection
 from async_dispatcher import AsyncDispatcher
 from package_repo_rest_client import PackageRepoRestClient
 
@@ -82,6 +82,10 @@ def finish():
                 logging.info(ex.msg)
                 self.set_status(500)
                 self.finish(ex.msg)
+            elif isinstance(ex, FailedConnection):
+                logging.info(ex.msg)
+                self.set_status(503)
+                self.finish(ex.msg)
             else:
                 self.set_status(500)
                 if "information" in str(ex):

api/src/main/resources/exceptiondef.py

@@ -31,6 +31,7 @@ def __init__(self, arg):
     def __str__(self):
         return str(self.msg)
 
+
 class NotFound(DmException):
 
     def __init__(self, arg):
@@ -57,3 +58,12 @@ class FailedCreation(DmException):
     def __init__(self, arg):
         super(FailedCreation, self).__init__(arg)
         self.msg = arg
+
+
+class FailedConnection(DmException):
+
+    def __init__(self, arg):
+        super(FailedConnection, self).__init__(arg)
+        self.msg = arg
+
+

api/src/main/resources/package_registrar.py

@@ -29,6 +29,9 @@
 from package_parser import PackageParser
 from deployer_utils import HDFS
 
+from exceptiondef import FailedConnection
+
+
 class HbasePackageRegistrar(object):
     COLUMN_DEPLOY_STATUS = "cf:deploy_status"
 
@@ -130,20 +133,25 @@ def get_package_deploy_status(self, package_name):
     def list_packages(self):
         logging.debug("List all packages")
 
-        connection = happybase.Connection(self._hbase_host)
+        connection = None
         try:
+            connection = happybase.Connection(self._hbase_host)
             table = connection.table(self._table_name)
             result = [key for key, _ in table.scan(columns=['cf:name'])]
+        except Exception as e:
+            logging.debug(str(e))
+            raise FailedConnection('Unable to connect to the HBase master')
         finally:
-            connection.close()
+            if connection:
+                connection.close()
         return result
 
     def generate_record(self, metadata):
         return metadata["package_name"], {
             'cf:name': '-'.join(metadata["package_name"].split("-")[:-1]),
             'cf:version': metadata["package_name"].split("-")[-1],
             'cf:metadata': json.dumps(metadata),
-            'cf:package_data': "%s/%s" %  (self._package_hdfs_dir_path, metadata["package_name"])
+            'cf:package_data': "%s/%s" % (self._package_hdfs_dir_path, metadata["package_name"])
         }
 
     def _read_from_db(self, key, columns):

api/src/main/resources/package_repo_rest_client.py

@@ -21,7 +21,9 @@
 import json
 import logging
 import requests
-from  exceptiondef import NotFound
+import re
+from exceptiondef import FailedConnection
+from requests.exceptions import RequestException
 
 
 class PackageRepoRestClient(object):
@@ -69,14 +71,33 @@ def get_package_list(self, recency=None):
         response = self.make_rest_get_request(url)
         return json.loads(response.content)
 
+    @staticmethod
+    def parse_error_msg_from_html_response(html_str):
+        title_tag = re.search('<title>(.+?)<.*/title>', html_str)
+        if title_tag:
+            cause_msg = re.sub('<[A-Za-z\/][^>]*>', '', title_tag.group())
+            return cause_msg
+        return html_str
+
     def make_rest_get_request(self, path, expected_codes=None):
         if not expected_codes:
             expected_codes = [200]
         url = self.api_url + path
         logging.debug("GET: " + url)
-        response = requests.get(url, timeout=120)
+
+        try:
+            response = requests.get(url, timeout=120)
+        except RequestException as e:
+            logging.debug("Request error: " + str(e))
+            error_msg = 'Unable to connect to the Package Repository Manager'
+            raise FailedConnection(error_msg)
+
         logging.debug("response code: " + str(response.status_code))
-        if (404 not in expected_codes) and (response.status_code == 404):
-            raise NotFound(path)
-        assert response.status_code in expected_codes
+
+        if response.status_code not in expected_codes:
+            error_msg = PackageRepoRestClient.parse_error_msg_from_html_response(response.text)
+            error_msg = "Package Repository Manager - {} (request path = {})".format(error_msg, path)
+            logging.debug("Server error: " + str(error_msg))
+        assert response.status_code in expected_codes, error_msg
+
         return response