Enabled keeping local env up via KEEP_ENV var; Fixed profilers always on (#248)

* [add] Added target tables grafana logic

* [fix] Fixes based on beelit94/python-terraform#108

* Bumping version from 0.5.21 to 0.5.22

* [add] Enabled keeping local env up via KEEP_ENV var

* [fix] Fixed profilers always on

* Bumping version from 0.5.22 to 0.5.23

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.5.22"
+version = "0.5.23"
 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/run/args.py

@@ -26,13 +26,21 @@
 S3_BUCKET_NAME = os.getenv("S3_BUCKET_NAME", "ci.benchmarks.redislabs")
 PUSH_S3 = bool(os.getenv("PUSH_S3", False))
 PROFILERS_DSO = os.getenv("PROFILERS_DSO", None)
-PROFILERS_ENABLED = bool(os.getenv("PROFILE", 0))
+PROFILERS_ENABLED = bool(int(os.getenv("PROFILE", 0)))
 PROFILERS = os.getenv("PROFILERS", PROFILERS_DEFAULT)
 MAX_PROFILERS_PER_TYPE = int(os.getenv("MAX_PROFILERS", 1))
 PROFILE_FREQ = os.getenv("PROFILE_FREQ", PROFILE_FREQ_DEFAULT)
+KEEP_ENV = bool(os.getenv("KEEP_ENV", False))
 
 
 def common_run_args(parser):
+    parser.add_argument(
+        "--keep_env_and_topo",
+        required=False,
+        default=KEEP_ENV,
+        action="store_true",
+        help="Keep environment and topology up after benchmark.",
+    )
     parser.add_argument(
         "--dbdir_folder",
         type=str,

redisbench_admin/run_local/run_local.py

@@ -340,8 +340,14 @@ def run_local_command_logic(args, project_name, project_version):
                                         benchmark_config, results_dict, return_code
                                     )
                                 if setup_details["env"] is None:
-                                    for conn in redis_conns:
-                                        conn.shutdown(save=False)
+                                    if args.keep_env_and_topo is False:
+                                        for conn in redis_conns:
+                                            conn.shutdown(save=False)
+                                    else:
+                                        logging.info(
+                                            "Keeping environment and topology active upon request."
+                                        )
+
                             except:
                                 return_code |= 1
                                 logging.critical(
@@ -356,9 +362,14 @@ def run_local_command_logic(args, project_name, project_version):
 
                             # tear-down
                             if setup_details["env"] is None:
-                                teardown_local_setup(
-                                    redis_conns, redis_processes, setup_name
-                                )
+                                if args.keep_env_and_topo is False:
+                                    teardown_local_setup(
+                                        redis_conns, redis_processes, setup_name
+                                    )
+                                else:
+                                    logging.info(
+                                        "Keeping environment and topology active upon request."
+                                    )
 
                         else:
                             logging.info(
@@ -367,8 +378,13 @@ def run_local_command_logic(args, project_name, project_version):
                                 )
                             )
                 if setup_details["env"] is not None:
-                    teardown_local_setup(redis_conns, redis_processes, setup_name)
-                    setup_details["env"] = None
+                    if args.keep_env_and_topo is False:
+                        teardown_local_setup(redis_conns, redis_processes, setup_name)
+                        setup_details["env"] = None
+                    else:
+                        logging.info(
+                            "Keeping environment and topology active upon request."
+                        )
 
     if profilers_enabled:
         local_profilers_print_artifacts_table(profilers_artifacts_matrix)

redisbench_admin/run_remote/args.py

@@ -18,7 +18,6 @@
 
 REMOTE_INVENTORY = os.getenv("INVENTORY", None)
 REMOTE_USER = os.getenv("REMOTE_USER", "ubuntu")
-KEEP_ENV = bool(os.getenv("KEEP_ENV", False))
 
 
 def create_run_remote_arguments(parser):
@@ -42,13 +41,6 @@ def create_run_remote_arguments(parser):
         type=str,
         help="connect as this user.",
     )
-    parser.add_argument(
-        "--keep_env_and_topo",
-        required=False,
-        default=KEEP_ENV,
-        action="store_true",
-        help="Keep environment and topology up after benchmark.",
-    )
     parser.add_argument(
         "--db_ssh_port",
         required=False,