Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/reuse.benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,11 @@ jobs:
strategy:
matrix:
include:
- { dataset: hits, size: Small, database: clickbench }
- { dataset: hits, size: Large, database: clickbench }
- { dataset: tpch, size: Small, database: clickbench }
- { dataset: tpch, size: Large, database: clickbench }
- { dataset: tpch1000, size: Large, database: tpch_1000 }
- { dataset: hits, size: Small, database: clickbench, timeout: 10 }
- { dataset: hits, size: Large, database: clickbench, timeout: 10 }
- { dataset: tpch, size: Small, database: clickbench, timeout: 20 }
- { dataset: tpch, size: Large, database: clickbench, timeout: 20 }
- { dataset: tpch1000, size: Large, database: tpch_1000, timeout: 60 }
Comment on lines +140 to +144

Choose a reason for hiding this comment

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

P1 Badge Wire matrix timeouts into cloud benchmark job

The new matrix entries add per-dataset timeout values (lines 140‑144), but the cloud job still hardcodes timeout-minutes: 20 for the benchmark step; the matrix value is never consumed. As a result tpch1000 runs still time out after 20 minutes instead of the intended 60, so the change in this commit has no effect on the longer benchmark.

Useful? React with 👍 / 👎.

fail-fast: true
max-parallel: 1
steps:
Expand Down
4 changes: 2 additions & 2 deletions benchmark/clickbench/benchmark_cloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ def run(
# If not capturing output, print it to stdout/stderr
if not capture_output:
if result.stdout:
print(result.stdout, end="", file=sys.stdout)
print(result.stdout, end="", file=sys.stdout, flush=True)
if result.stderr:
print(result.stderr, end="", file=sys.stderr)
print(result.stderr, end="", file=sys.stderr, flush=True)
return result
except subprocess.CalledProcessError as exc: # pragma: no cover - passthrough
stdout = exc.stdout.strip() if exc.stdout else ""
Expand Down