chore(helmbroker): add debug config

Author: jianxiaoguo

rootfs/helmbroker/broker.py

@@ -43,6 +43,7 @@ def provision(self,
                   details: ProvisionDetails,
                   async_allowed: bool,
                   **kwargs) -> ProvisionedServiceSpec:
+        logger.debug(f"*** provision instance {instance_id}")
         instance_path = get_instance_path(instance_id)
         if os.path.exists(instance_path):
             raise ErrInstanceAlreadyExists()
@@ -83,6 +84,7 @@ def bind(self,
              async_allowed: bool,
              **kwargs
              ) -> Binding:
+        logger.debug(f"*** bind instance {instance_id}")
         is_addon_bindable = get_addon_bindable(details.service_id)
         if not is_addon_bindable:
             raise ErrBadRequest(
@@ -110,7 +112,7 @@ def unbind(self,
                async_allowed: bool,
                **kwargs
                ) -> UnbindSpec:
-        logger.debug(f"unbind instance {instance_id}")
+        logger.debug(f"*** unbind instance {instance_id}")
         unbind.delay(instance_id)
         return UnbindSpec(is_async=True)
 
@@ -120,6 +122,7 @@ def update(self,
                async_allowed: bool,
                **kwargs
                ) -> UpdateServiceSpec:
+        logger.debug(f"*** update instance {instance_id}")
         instance_path = get_instance_path(instance_id)
         if not os.path.exists(instance_path):
             raise ErrBadRequest(msg="Instance %s does not exist" % instance_id)
@@ -156,6 +159,7 @@ def deprovision(self,
                     details: DeprovisionDetails,
                     async_allowed: bool,
                     **kwargs) -> DeprovisionServiceSpec:
+        logger.debug(f"*** deprovision instance {instance_id}")
         if not os.path.exists(get_instance_path(instance_id)):
             raise ErrInstanceDoesNotExist()
         with new_instance_lock(instance_id):
@@ -175,6 +179,7 @@ def last_operation(self,
                        operation_data: Optional[str],
                        **kwargs
                        ) -> LastOperation:
+        logger.debug(f"*** last_operation instance {instance_id}")
         if os.path.exists(get_instance_file(instance_id)):
             data = load_instance_meta(instance_id)
             return LastOperation(
@@ -189,6 +194,7 @@ def last_binding_operation(self,
                                operation_data: Optional[str],
                                **kwargs
                                ) -> LastOperation:
+        logger.debug(f"*** last_binding_operation instance {instance_id}")
         if os.path.exists(get_binding_file(instance_id)):
             data = load_binding_meta(instance_id)
             return LastOperation(

rootfs/helmbroker/config.py

@@ -14,4 +14,4 @@
 
 
 class Config:
-    DEBUG = bool(os.environ.get('HELMBROKER_DEBUG', True))
+    DEBUG = bool(os.environ.get('HELMBROKER_DEBUG', False))

rootfs/helmbroker/gunicorn/logging.py

@@ -1,12 +1,12 @@
-import os
 from gunicorn.glogging import Logger
+from helmbroker.config import Config
 
 
 class Logging(Logger):
     def access(self, resp, req, environ, request_time):
         # health check endpoints are only logged in debug mode
         if (
-            not os.environ.get('DEBUG', False) and
+            not Config.DEBUG and
             req.path in ['/readiness', '/healthz']
         ):
             return

rootfs/helmbroker/tasks.py

@@ -20,10 +20,12 @@
 
 @app.task(serializer='pickle')
 def provision(instance_id: str, details: ProvisionDetails):
+    logger.debug(f"*** task provision instance: {instance_id}, before lock")
     with (
         new_instance_lock(instance_id),
         run_instance_hooks(instance_id, "provision") as (status, output)
     ):
+        logger.debug(f"*** task provision instance: {instance_id}")
         backup_instance(instance_id)
         # create instance.json
         data = {
@@ -78,10 +80,12 @@ def provision(instance_id: str, details: ProvisionDetails):
 
 @app.task(serializer='pickle')
 def update(instance_id: str, details: UpdateDetails):
+    logger.debug(f"*** task update instance: {instance_id}, before lock")
     with (
         new_instance_lock(instance_id),
         run_instance_hooks(instance_id, "update") as (status, output)
     ):
+        logger.debug(f"*** task update instance: {instance_id}")
         backup_instance(instance_id)
         data = load_instance_meta(instance_id)
         if details.service_id:
@@ -133,10 +137,12 @@ def bind(instance_id: str,
          details: BindDetails,
          async_allowed: bool,
          **kwargs):
+    logger.debug(f"*** task bind instance: {instance_id}, before lock")
     with (
         new_instance_lock(instance_id),
         run_instance_hooks(instance_id, "bind") as (status, output)
     ):
+        logger.debug(f"*** task bind instance: {instance_id}")
         backup_instance(instance_id)
         data = {"binding_id": binding_id, "credentials": {}, "last_operation": {}}
         if status != 0:
@@ -199,10 +205,12 @@ def bind(instance_id: str,
 
 @app.task(serializer='pickle')
 def unbind(instance_id):
+    logger.debug(f"*** task unbind instance: {instance_id}, before lock")
     with (
         new_instance_lock(instance_id),
-        run_instance_hooks(instance_id, "deprovision") as (status, output)
+        run_instance_hooks(instance_id, "unbind") as (status, output)
     ):
+        logger.debug(f"*** task unbind instance: {instance_id}")
         backup_instance(instance_id)
         data = load_binding_meta(instance_id)
         if status != 0:
@@ -220,10 +228,12 @@ def unbind(instance_id):
 
 @app.task(serializer='pickle')
 def deprovision(instance_id: str):
+    logger.debug(f"*** task deprovision instance: {instance_id}, before lock")
     with (
         new_instance_lock(instance_id),
         run_instance_hooks(instance_id, "deprovision") as (status, output)
     ):
+        logger.debug(f"*** task deprovision instance: {instance_id}")
         backup_instance(instance_id)
         data = load_instance_meta(instance_id)
         if status != 0:

rootfs/helmbroker/wsgi.py

@@ -1,4 +1,5 @@
 import os
+import logging
 from flask import Flask, make_response
 from openbrokerapi import api, log_util
 from helmbroker.broker import HelmServiceBroker
@@ -27,5 +28,5 @@ def readiness():
 catalog_api = api.get_blueprint(
     HelmServiceBroker(),
     api.BrokerCredentials(USERNAME, PASSWORD),
-    log_util.basic_config())
+    log_util.basic_config(level=logging.DEBUG if Config.DEBUG else logging.INFO))
 application.register_blueprint(catalog_api)