ceph-perf: run stop.sh from build dir after CBT

Calling src/stop.sh from the source tree leaves CEPH_BIN empty and
errors as /ceph-conf. Match run-cbt.sh by stopping from build/, and
use pkill -x so cleanup does not match itself.

Signed-off-by: Kautilya Tripathi <kautilya.tripathi@ibm.com>

diff --git a/ceph-perf-pull-requests/README.rst b/ceph-perf-pull-requests/README.rst
index 2c35d276630bfb1e16f1ae49c0563adcb70888d1..f0ed183c065072887b431c754e6c3f5bb1979c59 100644 (file)
--- a/ceph-perf-pull-requests/README.rst
+++ b/ceph-perf-pull-requests/README.rst
@@ -29,8 +29,8 @@ On a ``ceph/ceph`` pull request, comment (required; case-insensitive)::
     jenkins test classic perf
     jenkins test crimson perf
 
-Builds are comment-only (``only-trigger-phrase: true``). The ``performance``
-label is not used as an auto-trigger. See an explicit comment for each flavor.
+Builds are comment-only (``only-trigger-phrase: true``). You do **not** need the
+``performance`` label — just post the comment above (one flavor per comment).
 Each CBT run is bounded to 1 hour and the whole job to 8 hours so a hung
 ``radosbench`` cannot hold a performance node indefinitely.
 

diff --git a/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml b/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml
index 69b5539d0f1cc6bee1c80671e9adfdf90d74f3dc..76123e7722f5f1d2e508d2569c1e7414f2207a2b 100644 (file)
--- a/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml
+++ b/ceph-perf-pull-requests/config/definitions/ceph-perf-pull-requests.yml
@@ -69,16 +69,26 @@
           timeout 7200 src/script/run-make.sh \
             --cmake-args "$cmake_args" \
             vstart-base crimson-osd
+          # stop.sh must run from the build dir (sets CEPH_BIN=bin, conf=$PWD/ceph.conf).
+          # Calling it from the source tree yields: /ceph-conf: No such file or directory.
+          # pkill -x avoids matching this script (a -f 'rados bench' pattern self-kills).
+          # Double braces: JJB str.format() on macro params like {{src-dir}}.
+          cleanup_vstart() {{
+              if test -f build/ceph.conf ; then
+                  ( cd build && ../src/stop.sh --crimson ) || true
+                  ( cd build && ../src/stop.sh ) || true
+              fi
+              for p in crimson-osd ceph-osd ceph-mon ceph-mgr rados ; do
+                  sudo pkill -9 -x "$p" || true
+              done
+          }}
           # Leftover daemons from a previous hung run can wedge radosbench forever.
-          if test -x build/../src/stop.sh || test -x src/stop.sh ; then
-              src/stop.sh --crimson || true
-              src/stop.sh || true
-          fi
-          sudo pkill -9 -f '(crimson-osd|ceph-osd|ceph-mon|ceph-mgr|rados bench)' || true
+          cleanup_vstart
           sleep 2
           . ${{WORKSPACE}}/gh-venv/bin/activate
           # CBT itself has no set -e / timeout; radosbench prefill has hung for days on
           # bath01. Bound the whole run-cbt.sh (vstart + bench + stop) to 1h.
+          # SIGKILL means run-cbt.sh cannot run its own stop.sh, so we clean up after.
           set +e
           if test {osd-flavor} = "classic" ; then
               timeout --foreground --signal=KILL 3600 \
@@ -92,10 +102,7 @@
               cbt_rc=$?
           fi
           set -e
-          # Always try to tear down; ignore failures so we still report the CBT status.
-          src/stop.sh --crimson || true
-          src/stop.sh || true
-          sudo pkill -9 -f '(crimson-osd|ceph-osd|ceph-mon|ceph-mgr|rados bench)' || true
+          cleanup_vstart
           if test "$cbt_rc" -eq 124 -o "$cbt_rc" -eq 137 ; then
               echo "ERROR: run-cbt.sh timed out after 3600s (rc=$cbt_rc); likely hung radosbench/Crimson on this node" >&2
               exit 1
@@ -246,7 +253,9 @@
           esac
           # Clear leftover cluster processes from a previous hung/aborted run on
           # this performance node before we spend hours rebuilding.
-          sudo pkill -9 -f '(crimson-osd|ceph-osd|ceph-mon|ceph-mgr|rados bench)' || true
+          for p in crimson-osd ceph-osd ceph-mon ceph-mgr rados ; do
+              sudo pkill -9 -x "$p" || true
+          done
           virtualenv -q --python python3 ${{WORKSPACE}}/gh-venv
           . ${{WORKSPACE}}/gh-venv/bin/activate
           pip install setuptools
@@ -308,7 +317,10 @@
                     #!/bin/bash
                     # Kill hung CBT/Ceph first so reboot is not the only recovery path
                     # when the agent is still responsive enough to run this step.
-                    sudo pkill -9 -f '(crimson-osd|ceph-osd|ceph-mon|ceph-mgr|rados bench|cbt\.py|run-cbt\.sh)' || true
+                    # Use -x so pkill does not match this script line.
+                    for p in crimson-osd ceph-osd ceph-mon ceph-mgr rados ; do
+                        sudo pkill -9 -x "$p" || true
+                    done
                     sudo reboot
 
     wrappers: