Fixed aws credentials usage on profiler daemon (#241)

* [wip] Fixing aws credentials usage on profiler daemon

* [wip] More verbose error logs

* [fix] Fixed update_ec2_vars_from_request

* [fix] Fixed update_ec2_vars_from_request

* [fix] More verbose profiler stop error handling

* [fix] More verbose profiler stop error handling

* [fix] More verbose profiler stop error handling

* PEP8 clean PR

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.5.17"
+version = "0.5.18"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <[email protected]>","Redis Performance Group <[email protected]>"]
 readme = "README.md"

redisbench_admin/profilers/daemon.py

@@ -8,6 +8,8 @@
 import logging
 
 import argparse
+
+import botocore
 from flask import Flask, request
 import daemonize
 import json
@@ -37,6 +39,7 @@
 app = Flask(__name__)
 app.use_reloader = False
 
+
 class PerfDaemon:
     def __init__(self, user=None, group=None):
         self.user = user
@@ -46,7 +49,8 @@ def __init__(self, user=None, group=None):
         self.create_app_endpoints(app)
 
     def main(self):
-        app.run(host='0.0.0.0', debug=False, port=5000)
+        self.set_app_loggers(app)
+        app.run(host="0.0.0.0", debug=False, port=5000)
 
     def set_app_loggers(self, app):
         print("Writting log to {}".format(LOGNAME))
@@ -57,22 +61,33 @@ def set_app_loggers(self, app):
         app.logger.addHandler(handler)
         self.perf.set_logger(app.logger)
 
-    def update_ec2_vars_from_request(self, request):
+    def update_ec2_vars_from_request(self, request, app):
         aws_access_key_id = None
         aws_secret_access_key = None
         aws_session_token = None
         region_name = "us-east-2"
         if request.is_json:
             data = request.get_json()
             if "aws_access_key_id" in data:
+                app.logger.info("detected aws_access_key_id in request")
                 aws_access_key_id = data["aws_access_key_id"]
             if "aws_secret_access_key" in data:
+                app.logger.info("detected aws_secret_access_key in request")
                 aws_secret_access_key = data["aws_secret_access_key"]
             if "aws_session_token" in data:
+                app.logger.info("detected aws_session_token in request")
                 aws_session_token = data["aws_session_token"]
             if "region_name" in data:
+                app.logger.info("detected region_name in request")
                 region_name = data["region_name"]
 
+        if aws_access_key_id is not None:
+            app.logger.info("aws_access_key_id is properly set")
+        if aws_secret_access_key is not None:
+            app.logger.info("aws_secret_access_key is properly set")
+        if aws_session_token is not None:
+            app.logger.info("aws_session_token is properly set")
+
         return aws_access_key_id, aws_secret_access_key, aws_session_token, region_name
 
     def update_vars_from_request(self, request, app):
@@ -187,7 +202,7 @@ def profile_stop(profiler_name, pid):
                 aws_secret_access_key,
                 aws_session_token,
                 region_name,
-            ) = self.update_ec2_vars_from_request(request)
+            ) = self.update_ec2_vars_from_request(request, app)
             if profile_res is True:
                 # Generate:
                 #  - artifact with Flame Graph SVG
@@ -220,36 +235,43 @@ def profile_stop(profiler_name, pid):
                 self.github_repo_name,
                 "profiles",
             )
-            for (
-                artifact_name,
-                profile_artifact,
-            ) in profile_res_artifacts_map.items():
-                s3_link = None
-                upload_results_s3 = True
-                if upload_results_s3:
-                    logging.info(
-                        "Uploading results to s3. s3 bucket name: {}. s3 bucket path: {}".format(
-                            S3_BUCKET_NAME, s3_bucket_path
+            try:
+                for (
+                    artifact_name,
+                    profile_artifact,
+                ) in profile_res_artifacts_map.items():
+                    s3_link = None
+                    upload_results_s3 = True
+                    if upload_results_s3:
+                        app.logger.info(
+                            "Uploading results to s3. s3 bucket name: {}. s3 bucket path: {}".format(
+                                S3_BUCKET_NAME, s3_bucket_path
+                            )
                         )
+                        url_map = upload_artifacts_to_s3(
+                            [profile_artifact],
+                            S3_BUCKET_NAME,
+                            s3_bucket_path,
+                            aws_access_key_id,
+                            aws_secret_access_key,
+                            aws_session_token,
+                            region_name,
+                        )
+                        s3_link = list(url_map.values())[0]
+                    profilers_artifacts_matrix.append(
+                        {
+                            "test_name": self.test_name,
+                            "profiler_name": profiler_name,
+                            "artifact_name": artifact_name,
+                            "s3_link": s3_link,
+                        }
                     )
-                    url_map = upload_artifacts_to_s3(
-                        [profile_artifact],
-                        S3_BUCKET_NAME,
-                        s3_bucket_path,
-                        aws_access_key_id,
-                        aws_secret_access_key,
-                        aws_session_token,
-                        region_name,
-                    )
-                    s3_link = list(url_map.values())[0]
-                profilers_artifacts_matrix.append(
-                    {
-                        "test_name": self.test_name,
-                        "profiler_name": profiler_name,
-                        "artifact_name": artifact_name,
-                        "s3_link": s3_link,
-                    }
+            except botocore.exceptions.NoCredentialsError:
+                profile_res = False
+                summary_msg = (
+                    "Unable to push profile artifacts to s3. Missing credentials."
                 )
+                app.logger.error(summary_msg)
 
             status_dict = {
                 "result": profile_res,

redisbench_admin/profilers/perf_daemon_caller.py

@@ -3,7 +3,6 @@
 #  Copyright (c) 2021., Redis Labs Modules
 #  All rights reserved.
 #
-
 import logging
 import requests
 from redisbench_admin.utils.remote import extract_git_vars
@@ -60,9 +59,6 @@ def __init__(self, remote_endpoint, **kwargs):
         if "region_name" in kwargs:
             self.region_name = kwargs["region_name"]
 
-    def set_logger(self, logger_app):
-        self.logger = logger_app
-
     def start_profile(self, pid, output="", frequency=99):
         """
         @param pid: profile events on specified process id
@@ -102,19 +98,29 @@ def stop_profile(self, **kwargs):
             )
             data = {}
             if self.aws_access_key_id is not None:
+                logging.info("Sending aws_access_key_id stop request")
                 data["aws_access_key_id"] = self.aws_access_key_id
             if self.aws_secret_access_key is not None:
+                logging.info("Sending aws_secret_access_key stop request")
                 data["aws_secret_access_key"] = self.aws_secret_access_key
             if self.aws_session_token is not None:
+                logging.info("Sending aws_session_token stop request")
                 data["aws_session_token"] = self.aws_session_token
             if self.region_name is not None:
+                logging.info("Sending region_name stop request")
                 data["region_name"] = self.region_name
 
             response = requests.post(url, data=None, json=data)
             if response.status_code == 200:
                 result = True
                 status_dict = response.json()
                 self.outputs = status_dict["profiler_artifacts"]
+            else:
+                logging.error(
+                    "Remote profiler status_code {} != 200. Message: {}".format(
+                        response.status_code, response.content
+                    )
+                )
 
         return result