OSN-826. Enabling debug logging for resource-discovery in etcd

Author: nk-hystax

docker_images/resource_discovery/scheduler.py

@@ -91,7 +91,7 @@ def process(config_cl):
         'with_connected_accounts': True, 'disabled': False})
     tasks_map = defaultdict(list)
     now = utcnow_timestamp()
-    _, _, _, observe_timeout = config_cl.resource_discovery_params()
+    _, _, _, observe_timeout, _ = config_cl.resource_discovery_params()
     for organization in response['organizations']:
         try:
             _, ca_resp = rest_cl.cloud_account_list(organization['id'])

docker_images/resource_discovery/worker.py

@@ -161,10 +161,15 @@ def process_resource_obj(self, resources):
     def save_bulk_resources(self, resources):
         payload = []
         resources = self.process_resource_obj(resources)
+        cloud_acc_id = None
         for rss in resources:
             obj, cloud_acc_id = self.build_payload(rss)
             payload.append(obj)
         if payload:
+            LOG.info('Creating %s resources for cloud account %s', len(payload),
+                     cloud_acc_id)
+            LOG.debug('Payload build for cloud account %s resources: %s',
+                      cloud_acc_id, [x['cloud_resource_id'] for x in payload])
             _, response = self.rest_cl.cloud_resource_create_bulk(
                 cloud_acc_id, {'resources': payload},
                 behavior='update_existing', return_resources=True)
@@ -221,7 +226,8 @@ def res_saving(self):
         return self._res_saving
 
     def set_discover_settings(self):
-        discover_size, timeout, writing_timeout, _ = self.config_cl.resource_discovery_params()
+        (discover_size, timeout, writing_timeout,
+         _, _) = self.config_cl.resource_discovery_params()
         self.discover_size = discover_size if (
             discover_size) else DEFAULT_DISCOVER_SIZE
         self.timeout = timeout
@@ -329,6 +335,8 @@ def _discover_resources(self, cloud_acc_id, resource_type):
                     res, gen = f.result()
                     if isinstance(res, Exception):
                         if self.is_404(res):
+                            LOG.debug("Got 404 exception: %s, skipping it",
+                                      str(res))
                             continue
                         LOG.error("Exception: %s %s", str(res),
                                   traceback.print_tb(res.__traceback__))
@@ -402,15 +410,16 @@ def heartbeat(self):
 
 if __name__ == '__main__':
     urllib3.disable_warnings(category=urllib3.exceptions.InsecureRequestWarning)
-    debug = os.environ.get('DEBUG', False)
-    log_level = 'INFO' if not debug else 'DEBUG'
-    setup_logging(loglevel=log_level, loggers=[''])
+    setup_logging(loglevel='INFO', loggers=[''])
 
     config_cl = ConfigClient(
         host=os.environ.get('HX_ETCD_HOST'),
         port=int(os.environ.get('HX_ETCD_PORT')),
     )
     config_cl.wait_configured()
+    params = config_cl.resource_discovery_params()
+    log_level = 'INFO' if not params[-1] else 'DEBUG'
+    setup_logging(loglevel=log_level, loggers=[''])
     conn_str = 'amqp://{user}:{pass}@{host}:{port}'.format(
         **config_cl.read_branch('/rabbit'))
     with Connection(conn_str) as conn:

optscale-deploy/optscale/templates/tpl/_config.tpl

@@ -235,6 +235,7 @@ etcd:
     timeout: {{ .Values.resource_discovery_settings.timeout }}
     writing_timeout: {{ .Values.resource_discovery_settings.writing_timeout }}
     observe_timeout: {{ .Values.resource_discovery_settings.observe_timeout }}
+    debug: {{ .Values.resource_discovery_settings.debug }}
   bi_settings:
     exporter_run_period: {{ .Values.bi_settings.exporter_run_period }}
     encryption_key: {{ .Values.bi_settings.encryption_key }}

optscale-deploy/optscale/values.yaml

@@ -1056,6 +1056,7 @@ resource_discovery_settings:
   timeout:
   writing_timeout: 60
   observe_timeout: 7200
+  debug:
 
 encryption_salt:
 encryption_salt_auth:

optscale_client/config_client/client.py

@@ -463,7 +463,7 @@ def resource_discovery_params(self):
         try:
             params = self.read_branch('/resource_discovery_settings')
         except etcd.EtcdKeyNotFound:
-            return None, None, None, OBSERVE_TIMEOUT
+            return None, None, None, OBSERVE_TIMEOUT, None
         try:
             discover_size = int(params['discover_size'])
         except (KeyError, ValueError):
@@ -480,7 +480,8 @@ def resource_discovery_params(self):
             observe_timeout = int(params['observe_timeout'])
         except (KeyError, ValueError):
             observe_timeout = OBSERVE_TIMEOUT
-        return discover_size, timeout, writing_timeout, observe_timeout
+        debug = params['debug'] == 'True'
+        return discover_size, timeout, writing_timeout, observe_timeout, debug
 
     def domains_blacklist(self, blacklist_key='registration'):
         """

tools/cloud_adapter/clouds/aws.py

@@ -493,6 +493,7 @@ def bucket_discovery_calls(self):
         for page in page_iterator:
             for bucket in page['Buckets']:
                 result.append((self.discover_bucket_info, (bucket['Name'],)))
+        LOG.debug("Detected buckets: %s", [x[1][0] for x in result])
         return result
 
     @staticmethod