Revert "Merge PR #1772 into master"

This reverts commit 082ae7ef4302fa54665ed0a2535e8e254118dcfd, reversing
changes made to 31a356e0c737f1781079045bb8dc366982be8713.

The original ea170935d4b1c78dc6fd6beae6b3fda65b296f57 removed a method that had
been moved to ceph.git but that broke upgrade tests from releases up to Octopus
where get_valgrind_args had not been backported. So a revert was done until all
upgrade paths have the method.

Now that Quincy is EOL, we can revert the revert.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/teuthology/misc.py b/teuthology/misc.py
index eeab7be5bc620cd1ddc0e821b49c2e8f88e4d2fc..93bdc7a4d28e00b24c842bb162680977891a5c0b 100644 (file)
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -1010,64 +1010,6 @@ def deep_merge(a: DeepMerge, b: DeepMerge) -> DeepMerge:
     return b
 
 
-def get_valgrind_args(testdir, name, preamble, v, exit_on_first_error=True):
-    """
-    Build a command line for running valgrind.
-
-    testdir - test results directory
-    name - name of daemon (for naming hte log file)
-    preamble - stuff we should run before valgrind
-    v - valgrind arguments
-    """
-    if v is None:
-        return preamble
-    if not isinstance(v, list):
-        v = [v]
-
-    # https://tracker.ceph.com/issues/44362
-    preamble.extend([
-        'env', 'OPENSSL_ia32cap=~0x1000000000000000',
-    ])
-
-    val_path = '/var/log/ceph/valgrind'
-    if '--tool=memcheck' in v or '--tool=helgrind' in v:
-        extra_args = [
-            'valgrind',
-            '--trace-children=no',
-            '--child-silent-after-fork=yes',
-            '--soname-synonyms=somalloc=*tcmalloc*',
-            '--num-callers=50',
-            '--suppressions={tdir}/valgrind.supp'.format(tdir=testdir),
-            '--xml=yes',
-            '--xml-file={vdir}/{n}.log'.format(vdir=val_path, n=name),
-            '--time-stamp=yes',
-            '--vgdb=yes',
-        ]
-    else:
-        extra_args = [
-            'valgrind',
-            '--trace-children=no',
-            '--child-silent-after-fork=yes',
-            '--soname-synonyms=somalloc=*tcmalloc*',
-            '--suppressions={tdir}/valgrind.supp'.format(tdir=testdir),
-            '--log-file={vdir}/{n}.log'.format(vdir=val_path, n=name),
-            '--time-stamp=yes',
-            '--vgdb=yes',
-        ]
-    if exit_on_first_error:
-        extra_args.extend([
-            # at least Valgrind 3.14 is required
-            '--exit-on-first-error=yes',
-            '--error-exitcode=42',
-        ])
-    args = [
-        'cd', testdir,
-        run.Raw('&&'),
-    ] + preamble + extra_args + v
-    log.debug('running %s under valgrind with args %s', name, args)
-    return args
-
-
 def ssh_keyscan(hostnames, _raise=True):
     """
     Fetch the SSH public key of one or more hosts