Skip to content

multi-server: one profiling run index per make invocation #5919

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marc-casavant wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −6
Open

multi-server: one profiling run index per make invocation #5919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/tests/multi-server/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,10 @@ make test.multi-server.profiling.ci # CI subset
```

Profiling results land under
`prof-results/<suite>/<test>/<branch>/<commit>/<run-index>/`. Set
`prof-results/<branch>/<commit>/<run-index>/<suite>/<test>/`. One make
invocation is one run index, so every suite and test of a single run sits
under the same one; in CI that index is the workflow run number, locally it
is the highest run index already present plus one. Set
`PROFILING_RESULT_MODE=dev` to use a flat per-suite layout that overwrites
each run.

Expand Down
19 changes: 14 additions & 5 deletions src/tests/multi-server/all.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# PROFILING_RESULT_PATH.
# - PROFILING_RESULT_MODE=<ci|dev> Profiling output layout (only meaningful when
# MODE=profiling). Default `ci`.
# ci: PROFILING_RESULT_ROOT/<suite>/<test>/<branch>/<commit>/<run-index>
# ci: PROFILING_RESULT_ROOT/<branch>/<commit>/<run-index>/<suite>/<test>

@arr2036 arr2036 Aug 21, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should just be <suite>/<test>

# dev: PROFILING_RESULT_ROOT/<suite>/<test> (flat)
#
# Usage:
Expand Down Expand Up @@ -46,6 +46,18 @@ GIT_COMMIT := $(or $(shell git -C $(top_srcdir) rev-parse --short HEAD 2
PROFILING_RESULT_ROOT := $(abspath $(top_srcdir)/prof-results)
PROFILING_RESULT_MODE ?= ci

#
# One run index for the whole invocation, so every suite/test of a run lands
# under the same one. ':=' is evaluated once at parse time, before any recipe
# runs, so parallel recipes cannot each allocate their own index.
# CI uses the workflow run number; locally, the next number after the run
# dirs already under <branch>/<commit>.
#
PROFILING_RUN_BASE := $(PROFILING_RESULT_ROOT)/$(GIT_BRANCH)/$(GIT_COMMIT)
PROFILING_LAST_RUN = $(shell find "$(PROFILING_RUN_BASE)" -mindepth 1 -maxdepth 1 -type d 2>/dev/null | \
sed 's|.*/||' | grep -xE '[0-9]+' | sort -n | tail -1)
PROFILING_RUN_INDEX := $(or $(GITHUB_RUN_NUMBER),$(shell expr $(or $(PROFILING_LAST_RUN),0) + 1))

#
# Image plumbing.
#
Expand Down Expand Up @@ -192,10 +204,7 @@ test.multi-server.${1}.${2}: $$(TEST_MULTI_SERVER_RENDERED.${1}.${2}) ${4}/start
if [ "$(PROFILING_RESULT_MODE)" = "dev" ]; then \
PROFILING_RESULT_PATH="$(PROFILING_RESULT_ROOT)/${1}/${2}"; \
else \
RUN_BASE="$(PROFILING_RESULT_ROOT)/$(GIT_BRANCH)/$(GIT_COMMIT)"; \
EXISTING=$$$$( find "$$$$RUN_BASE" -mindepth 1 -maxdepth 1 -type d 2>/dev/null | wc -l | tr -d ' ' ); \
RUN_INDEX=$$$$((EXISTING + 1)); \
PROFILING_RESULT_PATH="$$$$RUN_BASE/$$$$RUN_INDEX/${1}/${2}"; \
PROFILING_RESULT_PATH="$(PROFILING_RUN_BASE)/$(PROFILING_RUN_INDEX)/${1}/${2}"; \
fi; \
mkdir -p "$$$$PROFILING_RESULT_PATH"; \
echo "PROFILING_RESULT_PATH: $$$$PROFILING_RESULT_PATH"; \
Expand Down
Loading