From d6518eca82d6ea2b28c25dffdbc72d83a5cd4c8d Mon Sep 17 00:00:00 2001
From: Dalton Bohning <dalton.bohning@intel.com>
Date: Wed, 28 Aug 2024 19:25:10 +0000
Subject: [PATCH] DAOS-16463 test: remove get_host_log_files

Remove get_host_log_files since it is no longer needed.
Also remove search_log which used get_host_log_files and is unused.
Test-tag: test_basic_coverage
Skip-unit-tests: true
Skip-fault-injection-test: true

Required-githooks: true

Signed-off-by: Dalton Bohning <dalton.bohning@intel.com>
---
 src/tests/ftest/util/apricot/apricot/test.py |  1 -
 src/tests/ftest/util/server_utils.py         | 79 --------------------
 2 files changed, 80 deletions(-)

diff --git a/src/tests/ftest/util/apricot/apricot/test.py b/src/tests/ftest/util/apricot/apricot/test.py
index 0daa30cf1d8..27b6193cf18 100644
--- a/src/tests/ftest/util/apricot/apricot/test.py
+++ b/src/tests/ftest/util/apricot/apricot/test.py
@@ -1324,7 +1324,6 @@ def _list_server_manager_info(self):
         self.log.info("-" * 100)
         self.log.info("--- SERVER INFORMATION ---")
         for manager in self.server_managers:
-            manager.get_host_log_files()
             try:
                 manager.dmg.storage_query_list_devices()
             except CommandFailure:
diff --git a/src/tests/ftest/util/server_utils.py b/src/tests/ftest/util/server_utils.py
index 299103fd577..d7e1efdd58a 100644
--- a/src/tests/ftest/util/server_utils.py
+++ b/src/tests/ftest/util/server_utils.py
@@ -7,9 +7,7 @@
 
 import os
 import random
-import re
 import time
-from collections import defaultdict
 from getpass import getuser
 
 from avocado import fail_on
@@ -1178,80 +1176,3 @@ def get_daos_metrics(self, verbose=False, timeout=60):
                 command="sudo {} -S {} --csv".format(daos_metrics_exe, engine))
             engines.append(results)
         return engines
-
-    def get_host_log_files(self):
-        """Get the active engine log file names on each host.
-
-        Returns:
-            dict: host keys with lists of log files on that host values
-
-        """
-        self.log.debug("Determining the current %s log files", self.manager.job.command)
-
-        # Get a list of engine pids from all of the hosts
-        host_engine_pids = defaultdict(list)
-        result = run_remote(self.log, self.hosts, "pgrep daos_engine", False)
-        for data in result.output:
-            if data.passed:
-                # Search each individual line of output independently to ensure a pid match
-                for line in data.stdout:
-                    match = re.findall(r'(^[0-9]+)', line)
-                    for host in data.hosts:
-                        host_engine_pids[host].extend(match)
-
-        # Find the log files that match the engine pids on each host
-        host_log_files = defaultdict(list)
-        log_files = self.manager.job.get_engine_values("log_file")
-        for host, pid_list in host_engine_pids.items():
-            # Generate a list of all of the possible log files that could exist on this host
-            file_search = []
-            for log_file in log_files:
-                for pid in pid_list:
-                    file_search.append(".".join([log_file, pid]))
-            # Determine which of those log files actually do exist on this host
-            # This matches the engine pid to the engine log file name
-            command = f"ls -1 {' '.join(file_search)} 2>&1 | grep -v 'No such file or directory'"
-            result = run_remote(self.log, host, command, False)
-            for data in result.output:
-                for line in data.stdout:
-                    match = re.findall(fr"^({'|'.join(file_search)})", line)
-                    if match:
-                        host_log_files[host].append(match[0])
-
-        self.log.debug("Engine log files per host")
-        for host in sorted(host_log_files):
-            self.log.debug("  %s:", host)
-            for log_file in sorted(host_log_files[host]):
-                self.log.debug("    %s", log_file)
-
-        return host_log_files
-
-    def search_log(self, pattern):
-        """Search the server log files on the remote hosts for the specified pattern.
-
-        Args:
-            pattern (str): the grep -E pattern to use to search the server log files
-
-        Returns:
-            int: number of patterns found
-
-        """
-        self.log.debug("Searching %s logs for '%s'", self.manager.job.command, pattern)
-        host_log_files = self.get_host_log_files()
-
-        # Search for the pattern in the remote log files
-        matches = 0
-        for host, log_files in host_log_files.items():
-            log_file_matches = 0
-            self.log.debug("Searching for '%s' in %s on %s", pattern, log_files, host)
-            result = run_remote(self.log, host, f"grep -E '{pattern}' {' '.join(log_files)}")
-            for data in result.output:
-                if data.returncode == 0:
-                    matches = re.findall(fr'{pattern}', '\n'.join(data.stdout))
-                    log_file_matches += len(matches)
-            self.log.debug("Found %s matches on %s", log_file_matches, host)
-            matches += log_file_matches
-        self.log.debug(
-            "Found %s total matches for '%s' in the %s logs",
-            matches, pattern, self.manager.job.command)
-        return matches