From: Kamoltat Sirivadhna <ksirivad@redhat.com>
Date: Wed, 6 Sep 2023 15:16:37 +0000 (-0400)
Subject: teuthology/scrape.py: Remove empty string and space in _get_service_types
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1889%2Fhead;p=teuthology.git

teuthology/scrape.py: Remove empty string and space in _get_service_types

Problem:

the function grep returns a list contianing empty string which
results in scrape.py throwing the warning "Misunderstood line: ".

Solution:

filter out empty strings, blank space and None
before getting match with regex.

Fixes: https://tracker.ceph.com/issues/62534

Signed-off-by: Kamoltat Sirivadhna <ksirivad@redhat.com>
---

diff --git a/teuthology/scrape.py b/teuthology/scrape.py
index 92e52f322..42caf3a4a 100644
--- a/teuthology/scrape.py
+++ b/teuthology/scrape.py
@@ -410,7 +410,10 @@ class ValgrindReason(Reason):
         result = defaultdict(list)
         # Lines like:
         # 2014-08-22T20:07:18.668 ERROR:tasks.ceph:saw valgrind issue   <kind>Leak_DefinitelyLost</kind> in /var/log/ceph/valgrind/osd.3.log.gz
-        for line in grep(os.path.join(job.path, "teuthology.log"), "</kind> in "):
+        valgrind_err_line = grep(os.path.join(job.path, "teuthology.log"), "</kind> in ")
+        # removes blank space, empty string and None
+        valgrind_err_line = [line for line in valgrind_err_line if line and line.strip()]
+        for line in valgrind_err_line:
             match = re.search("<kind>(.+)</kind> in .+/(.+)", line)
             if not match:
                 log.warning("Misunderstood line: {0}".format(line))