-
Notifications
You must be signed in to change notification settings - Fork 3.9k
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
roachprod: fix VM creation and disk type detection in grow command #141835
Open
shailendra-patel
wants to merge
1
commit into
cockroachdb:master
Choose a base branch
from
shailendra-patel:fix-grow-cmd
base: master
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.
Conversation
This file contains 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
🟢 Sysbench [SQL, 3node, oltp_read_write]
Reproducebenchdiff binaries: mkdir -p benchdiff/3393c69/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/3393c699d77ba04fa4eef871fea0a5b6179d0c2d/bin/pkg_sql_tests benchdiff/3393c69/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/3393c69/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
mkdir -p benchdiff/b0b0e69/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/b0b0e695f4623659574ebf45a5a140bb58673082/bin/pkg_sql_tests benchdiff/b0b0e69/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/b0b0e69/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests benchdiff command: benchdiff --run=^BenchmarkSysbench/SQL/3node/oltp_read_write$ --old=b0b0e69 --new=3393c69 ./pkg/sql/tests ⚪ Sysbench [KV, 1node, local, oltp_read_only]
Reproducebenchdiff binaries: mkdir -p benchdiff/3393c69/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/3393c699d77ba04fa4eef871fea0a5b6179d0c2d/bin/pkg_sql_tests benchdiff/3393c69/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/3393c69/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
mkdir -p benchdiff/b0b0e69/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/b0b0e695f4623659574ebf45a5a140bb58673082/bin/pkg_sql_tests benchdiff/b0b0e69/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/b0b0e69/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests benchdiff command: benchdiff --run=^BenchmarkSysbench/KV/1node_local/oltp_read_only$ --old=b0b0e69 --new=3393c69 ./pkg/sql/tests 🟢 Sysbench [KV, 1node, local, oltp_write_only]
Reproducebenchdiff binaries: mkdir -p benchdiff/3393c69/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/3393c699d77ba04fa4eef871fea0a5b6179d0c2d/bin/pkg_sql_tests benchdiff/3393c69/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/3393c69/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
mkdir -p benchdiff/b0b0e69/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/b0b0e695f4623659574ebf45a5a140bb58673082/bin/pkg_sql_tests benchdiff/b0b0e69/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/b0b0e69/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests benchdiff command: benchdiff --run=^BenchmarkSysbench/KV/1node_local/oltp_write_only$ --old=b0b0e69 --new=3393c69 ./pkg/sql/tests Artifactsdownload: mkdir -p new
gcloud storage cp gs://cockroach-microbench-ci/artifacts/3393c699d77ba04fa4eef871fea0a5b6179d0c2d/13460265651-1/\* new/
mkdir -p old
gcloud storage cp gs://cockroach-microbench-ci/artifacts/b0b0e695f4623659574ebf45a5a140bb58673082/13460265651-1/\* old/ Legend
No regressions detected! built with commit: 3393c699d77ba04fa4eef871fea0a5b6179d0c2d |
29afb2e
to
3c52b2e
Compare
This commit fixes two bugs in the roachprod grow command: 1. Fixed VM creation failure due to hostname collisions. Previously, we were using the same VM name multiple times across different zones, causing "RESOURCE_ALREADY_EXISTS" errors. The fix extracts the hostname allocation logic into a new helper function (computeHostNamesPerZone) that properly distributes unique hostnames across zones. 2. Fixed incorrect disk type detection in instance group templates. We were checking d.InitializeParams.DiskType for "SCRATCH" instead of d.Type, which prevented proper identification of local SSD volumes. The bug is likely to be introduced in cockroachdb#137956 Epic: none Release note: None
3c52b2e
to
3393c69
Compare
Please explore adding test cases. |
nameisbhaskar
approved these changes
Feb 22, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This commit fixes two bugs in the roachprod grow command:
Fixed VM creation failure due to hostname collisions. Previously, we were using the same VM name multiple times across different zones, causing "RESOURCE_ALREADY_EXISTS" errors. The fix extracts the hostname allocation logic into a new helper function (computeHostNamesPerZone) that properly distributes unique hostnames across zones.
Fixed incorrect disk type detection in instance group templates. We were checking d.InitializeParams.DiskType for "SCRATCH" instead of d.Type, which prevented proper identification of local SSD volumes.
The bug is likely to be introduced in #137956
Epic: none
Release note: None