-
Notifications
You must be signed in to change notification settings - Fork 1.8k
feat(storage): add run_benchmark_tests.sh for automated time-based GC… #18138
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.
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
Draft
shradhakatyal
wants to merge
5
commits into
main
Choose a base branch
from
add-gcs-read-benchmark-runner
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
0d393bc
feat(storage): add run_benchmark_tests.sh for automated time-based GC…
e01584f
ci(storage): add benchmarks-cloudbuild.yaml trigger config for high-b…
9f50945
fix(storage): resolve dd payload race condition and f-string variable…
048ce17
style(storage): add defensive isinstance type validation when modifyi…
7ca06c6
refactor(cloudbuild): target standing VM in us-west4-a and zonal bucket
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
81 changes: 81 additions & 0 deletions
81
packages/google-cloud-storage/cloudbuild/benchmarks-cloudbuild.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| substitutions: | ||
| _ZONE: "us-west4-a" | ||
| _VM_NAME: "shradhakatyal-benchmarks-us-west4-a" | ||
| _ULIMIT: "65536" | ||
| _PROCESSES: "48" | ||
| _COROS: "1" | ||
| _FILE_SIZE_MIB: "10240" | ||
| _CHUNK_SIZE_KIB: "102400" | ||
| _ZONAL_BUCKET: "shradhakatyal-read-bench-zb-us-west4-a" | ||
|
|
||
| steps: | ||
| # Step 0: Generate a persistent SSH key for this build run. | ||
| - name: "gcr.io/google.com/cloudsdktool/cloud-sdk" | ||
| id: "generate-ssh-key" | ||
| entrypoint: "bash" | ||
| args: | ||
| - "-c" | ||
| - | | ||
| mkdir -p /workspace/.ssh | ||
| ssh-keygen -t rsa -f /workspace/.ssh/google_compute_engine -N '' -C gcb | ||
| cat /workspace/.ssh/google_compute_engine.pub > /workspace/gcb_ssh_key.pub | ||
| gcloud compute os-login ssh-keys add \ | ||
| --key-file=/workspace/.ssh/google_compute_engine.pub \ | ||
| --ttl=1h | ||
| waitFor: ["-"] | ||
|
|
||
| # Step 1: Package google-cloud-storage directory for direct transfer to VM | ||
| - name: "gcr.io/google.com/cloudsdktool/cloud-sdk" | ||
| id: "package-code" | ||
| entrypoint: "bash" | ||
| args: | ||
| - "-c" | ||
| - | | ||
| tar --exclude='.nox' --exclude='venv_*' --exclude='.pytest_cache' --exclude='__pycache__' --exclude='.git' -czf /workspace/google-cloud-storage.tar.gz -C /workspace/packages google-cloud-storage | ||
| waitFor: ["-"] | ||
|
|
||
| # Step 2: Run the read microbenchmark suite inside the standing GCE VM via SSH. | ||
| - name: "gcr.io/google.com/cloudsdktool/cloud-sdk" | ||
| id: "run-tests-on-vm" | ||
| entrypoint: "bash" | ||
| args: | ||
| - "-c" | ||
| - | | ||
| set -e | ||
| # Verify SSH connectivity to existing standing VM | ||
| for i in {1..6}; do | ||
| if gcloud compute ssh "${_VM_NAME}" --zone=${_ZONE} --internal-ip --ssh-key-file=/workspace/.ssh/google_compute_engine --command="echo VM is ready"; then | ||
| break | ||
| fi | ||
| echo "Waiting for VM connectivity... (attempt $i/6)" | ||
| sleep 10 | ||
| done | ||
|
|
||
| # Copy runner script and tarball to the standing VM | ||
| gcloud compute scp packages/google-cloud-storage/cloudbuild/run_benchmark_tests.sh /workspace/google-cloud-storage.tar.gz "${_VM_NAME}":~ --zone=${_ZONE} --internal-ip --ssh-key-file=/workspace/.ssh/google_compute_engine | ||
|
|
||
| # Execute run_benchmark_tests.sh on the VM via SSH | ||
| gcloud compute ssh "${_VM_NAME}" --zone=${_ZONE} --internal-ip --ssh-key-file=/workspace/.ssh/google_compute_engine \ | ||
| --command="ulimit -n ${_ULIMIT}; tar -xzf google-cloud-storage.tar.gz && cp run_benchmark_tests.sh google-cloud-storage/ && cd google-cloud-storage && PROCESSES=${_PROCESSES} COROS=${_COROS} FILE_SIZE_MIB=${_FILE_SIZE_MIB} CHUNK_SIZE_KIB=${_CHUNK_SIZE_KIB} TARGET_BUCKET=${_ZONAL_BUCKET} bash run_benchmark_tests.sh" | ||
| waitFor: | ||
| - "generate-ssh-key" | ||
| - "package-code" | ||
|
|
||
| # Step 3: Cleanup temporary OS Login SSH key | ||
| - name: "gcr.io/google.com/cloudsdktool/cloud-sdk" | ||
| id: "cleanup-ssh-key" | ||
| entrypoint: "bash" | ||
| args: | ||
| - "-c" | ||
| - | | ||
| echo "--- Removing SSH key from OS Login profile ---" | ||
| gcloud compute os-login ssh-keys remove \ | ||
| --key-file=/workspace/gcb_ssh_key.pub || true | ||
| waitFor: | ||
| - "run-tests-on-vm" | ||
|
|
||
| timeout: "3600s" # 60 minutes | ||
|
|
||
| options: | ||
| logging: CLOUD_LOGGING_ONLY | ||
| dynamicSubstitutions: true |
151 changes: 151 additions & 0 deletions
151
packages/google-cloud-storage/cloudbuild/run_benchmark_tests.sh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,151 @@ | ||
| #!/bin/bash | ||
| # ============================================================================== | ||
| # Automated Google Cloud Storage Read Microbenchmark Runner | ||
| # Intended for GitHub CI/CD & GCE High-Bandwidth Tier-1 VMs (C4/N2/C3 series) | ||
| # Location: packages/google-cloud-storage/cloudbuild/run_benchmark_tests.sh | ||
| # ============================================================================== | ||
|
|
||
| set -eo pipefail | ||
|
|
||
| # Configurable defaults | ||
| PROCESSES="${PROCESSES:-48}" | ||
| COROS="${COROS:-1}" | ||
| FILE_SIZE_MIB="${FILE_SIZE_MIB:-10240}" # 10 GiB files by default | ||
| CHUNK_SIZE_KIB="${CHUNK_SIZE_KIB:-102400}" # ~100 MiB read chunks by default | ||
| BUCKET_TYPE="${BUCKET_TYPE:-zonal}" # "zonal" uses BidiReadObject gRPC DirectPath | ||
| TARGET_BUCKET="${DEFAULT_RAPID_ZONAL_BUCKET:-shradhakatyal-read-bench-zb-us-west4-a}" | ||
| OUT_JSON="${OUT_JSON:-/tmp/bench_result.json}" | ||
| UPLOAD_GCS_PREFIX="${UPLOAD_GCS_PREFIX:-}" | ||
|
|
||
| echo "========================================================================" | ||
| echo " GCS Read Microbenchmark Runner (gRPC BidiReadObject / REST)" | ||
| echo " Processes: ${PROCESSES}" | ||
| echo " Coroutines/proc: ${COROS}" | ||
| echo " File Size: ${FILE_SIZE_MIB} MiB" | ||
| echo " Chunk Size: ${CHUNK_SIZE_KIB} KiB" | ||
| echo " Bucket Type: ${BUCKET_TYPE} (zonal = BidiReadObject gRPC DirectPath)" | ||
| echo " Target Bucket: gs://${TARGET_BUCKET}" | ||
| echo "========================================================================" | ||
|
|
||
| # Ensure HOME is exported for gRPC / ALTS Application Default Credentials | ||
| export HOME="${HOME:-/root}" | ||
| export DEFAULT_RAPID_ZONAL_BUCKET="${TARGET_BUCKET}" | ||
| export DEFAULT_STANDARD_BUCKET="${TARGET_BUCKET}" | ||
|
|
||
| # Determine repository root | ||
| REPO_ROOT="$(git rev-parse --show-toplevel 2>/dev/null || pwd)" | ||
| cd "${REPO_ROOT}/packages/google-cloud-storage" 2>/dev/null || cd "$(pwd)" | ||
|
|
||
| echo "--- 1. Checking Python dependencies ---" | ||
| if ! python3 -c "import pytest, psutil, yaml" 2>/dev/null; then | ||
| echo "Installing test dependencies..." | ||
| pip install --upgrade pip | ||
| pip install -e . | ||
| pip install pytest pytest-benchmark psutil pyyaml google-cloud-testutils google-cloud-kms | ||
| fi | ||
|
|
||
| CONFIG_PATH="tests/perf/microbenchmarks/time_based/reads/config.yaml" | ||
| if [ ! -f "${CONFIG_PATH}" ]; then | ||
| echo "ERROR: Could not find ${CONFIG_PATH}. Please run from google-cloud-storage root." | ||
| exit 1 | ||
| fi | ||
|
|
||
| echo "--- 2. Updating ${CONFIG_PATH} parameters ---" | ||
| python3 -c " | ||
| import yaml | ||
| path = '${CONFIG_PATH}' | ||
| with open(path) as f: | ||
| d = yaml.safe_load(f) | ||
| if isinstance(d, dict): | ||
| common = d.get('common') | ||
| if isinstance(common, dict): | ||
| common['file_sizes_mib'] = [${FILE_SIZE_MIB}] | ||
| common['chunk_sizes_kib'] = [${CHUNK_SIZE_KIB}] | ||
| common['bucket_types'] = ['${BUCKET_TYPE}'] | ||
| workloads = d.get('workload') | ||
| if isinstance(workloads, list): | ||
| for w in workloads: | ||
| if isinstance(w, dict): | ||
| w['processes'] = [${PROCESSES}] | ||
| w['coros'] = [${COROS}] | ||
| with open(path, 'w') as f: | ||
| yaml.dump(d, f) | ||
| " | ||
|
|
||
| # Patch config.py so 1-to-1 process-to-file indexing prevents 404 on multi-coroutine runs | ||
| sed -i 's/num_files = num_processes \* num_coros/num_files = num_processes/g' tests/perf/microbenchmarks/time_based/reads/config.py || true | ||
| sed -i 's/num_files = num_processes \* num_coros/num_files = num_processes/g' tests/perf/microbenchmarks/reads/config.py || true | ||
|
|
||
| echo "--- 3. Pre-seeding & verifying ${PROCESSES} test objects (${FILE_SIZE_MIB} MiB each) in gs://${TARGET_BUCKET} ---" | ||
| python3 -c " | ||
| import multiprocessing, os, time | ||
| from google.cloud import storage | ||
|
|
||
| bucket_name = '${TARGET_BUCKET}' | ||
| file_size_mib = int('${FILE_SIZE_MIB}') | ||
| num_processes = int('${PROCESSES}') | ||
| expected_size = file_size_mib * 1024 * 1024 | ||
| local_file = '/tmp/benchmark_test_payload' | ||
|
|
||
| def check_object(idx): | ||
| client = storage.Client() | ||
| bucket = client.bucket(bucket_name) | ||
| obj_name = f'fio-go_storage_fio.0.{idx}' | ||
| try: | ||
| blob = bucket.get_blob(obj_name) | ||
| if not blob or blob.size != expected_size: | ||
| return idx | ||
| except Exception as e: | ||
| print(f'Error checking {obj_name}: {e}') | ||
| return idx | ||
| return None | ||
|
|
||
| def upload_object(idx): | ||
| client = storage.Client() | ||
| bucket = client.bucket(bucket_name) | ||
| obj_name = f'fio-go_storage_fio.0.{idx}' | ||
| try: | ||
| t0 = time.time() | ||
| print(f'Uploading {obj_name} ({file_size_mib} MiB)...') | ||
| blob_new = bucket.blob(obj_name) | ||
| blob_new.upload_from_filename(local_file) | ||
| print(f'Uploaded {obj_name} in {time.time()-t0:.1f}s') | ||
| except Exception as e: | ||
| print(f'Error uploading {obj_name}: {e}') | ||
|
|
||
| if __name__ == '__main__': | ||
| print(f'Verifying {num_processes} objects in bucket {bucket_name}...') | ||
| with multiprocessing.Pool(min(16, num_processes)) as pool: | ||
| results = pool.map(check_object, range(num_processes)) | ||
|
|
||
| missing_indices = [r for r in results if r is not None] | ||
| if missing_indices: | ||
| print(f'Found {len(missing_indices)} missing/incomplete objects.') | ||
| if not os.path.exists(local_file): | ||
| print(f'Generating {expected_size} bytes payload locally...') | ||
| os.system(f'dd if=/dev/urandom of={local_file} bs=1M count={file_size_mib} status=none') | ||
|
|
||
| with multiprocessing.Pool(min(16, len(missing_indices))) as pool: | ||
| pool.map(upload_object, missing_indices) | ||
| " | ||
|
shradhakatyal marked this conversation as resolved.
|
||
|
|
||
| echo "--- 4. Executing pytest benchmark suite ---" | ||
| pytest --benchmark-json="${OUT_JSON}" \ | ||
| -vv -s \ | ||
| --log-format='%(asctime)s %(levelname)s %(message)s' --log-date-format='%H:%M:%S' \ | ||
| tests/perf/microbenchmarks/time_based/reads/test_reads.py || true | ||
|
|
||
| if [ -s "${OUT_JSON}" ]; then | ||
| echo "========================================================================" | ||
| echo " BENCHMARK STATS SUMMARY" | ||
| echo "========================================================================" | ||
| grep -E '"name":|"avg_throughput_mib_s":|"net_throughput_mb_s":|"cpu_max_global":' "${OUT_JSON}" -B 1 -A 2 || true | ||
|
|
||
| if [ -n "${UPLOAD_GCS_PREFIX}" ]; then | ||
| GCS_DEST="${UPLOAD_GCS_PREFIX}/test_result_$(hostname)_$(date +%s).json" | ||
| echo "Uploading JSON report to ${GCS_DEST}..." | ||
| gcloud storage cp "${OUT_JSON}" "${GCS_DEST}" | ||
| fi | ||
| fi | ||
|
|
||
| echo "--- Benchmark Run Complete ---" | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.