[fix] Avoid error on rts already exists (was causing a leak on TSDB) (#278)

* Reduced the ammount of collected data on server stats and commandstats

* [fix] Avoid error on rts already exists (was causing a leak on TSDB)

* [fix] Avoid error on rts already exists (was causing a leak on TSDB)

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.6.15"
+version = "0.6.16"
 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/utils/remote.py

@@ -550,28 +550,18 @@ def push_data_to_redistimeseries(rts, time_series_dict: dict, expire_msecs=0):
 
 def exporter_create_ts(rts, time_series, timeseries_name):
     try:
-        logging.debug(
-            "Creating timeseries named {} with labels {}".format(
-                timeseries_name, time_series["labels"]
-            )
-        )
-        rts.create(timeseries_name, labels=time_series["labels"], chunk_size=128)
-    except redis.exceptions.ResponseError as e:
-        if "already exists" in e.__str__():
+        if rts.redis.exists(timeseries_name) is False:
             logging.debug(
-                "Timeseries named {} already exists. Checking that the labels match.".format(
-                    timeseries_name
+                "Creating timeseries named {} with labels {}".format(
+                    timeseries_name, time_series["labels"]
                 )
             )
-            set1 = set(time_series["labels"].items())
-            set2 = set(rts.info(timeseries_name).labels.items())
-            if len(set1 - set2) > 0 or len(set2 - set1) > 0:
-                logging.info(
-                    "Given the labels don't match using TS.ALTER on {} to update labels to {}".format(
-                        timeseries_name, time_series["labels"]
-                    )
-                )
-                rts.alter(timeseries_name, labels=time_series["labels"])
+            rts.create(timeseries_name, labels=time_series["labels"], chunk_size=128)
+        else:
+            check_rts_labels(rts, time_series, timeseries_name)
+    except redis.exceptions.ResponseError as e:
+        if "already exists" in e.__str__():
+            check_rts_labels(rts, time_series, timeseries_name)
             pass
         else:
             logging.error(
@@ -582,6 +572,23 @@ def exporter_create_ts(rts, time_series, timeseries_name):
             raise
 
 
+def check_rts_labels(rts, time_series, timeseries_name):
+    logging.debug(
+        "Timeseries named {} already exists. Checking that the labels match.".format(
+            timeseries_name
+        )
+    )
+    set1 = set(time_series["labels"].items())
+    set2 = set(rts.info(timeseries_name).labels.items())
+    if len(set1 - set2) > 0 or len(set2 - set1) > 0:
+        logging.info(
+            "Given the labels don't match using TS.ALTER on {} to update labels to {}".format(
+                timeseries_name, time_series["labels"]
+            )
+        )
+        rts.alter(timeseries_name, labels=time_series["labels"])
+
+
 def extract_redisgraph_version_from_resultdict(results_dict: dict):
     version = None
     if "DBSpecificConfigs" in results_dict: