Skip to content
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 regression in propagateDiskLabels #103191

Conversation

srosenberg
Copy link
Member

Previous PR [1] fixed data races, and as a result of refactoring, introduced another bug.
When multiple zones are used, the --zone arg. is duplicated across all hosts.

Epic: none
Release note: None

[1] #103087

Previous PR [1] fixed data races, and as a result of
refactoring, introduced another bug.
When multiple zones are used, the `--zone` arg. is
duplicated across all hosts.

Epic: none
Release note: None

[1] cockroachdb#103087
@srosenberg srosenberg requested a review from a team as a code owner May 12, 2023 14:35
@srosenberg srosenberg requested review from herkolategan, smg260 and renatolabs and removed request for a team May 12, 2023 14:35
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@srosenberg srosenberg added backport-23.1.x Flags PRs that need to be backported to 23.1 backport-22.2.x labels May 12, 2023
@srosenberg
Copy link
Member Author

TFTR! Final attempt 🤞

bors r=renatolabs

@craig
Copy link
Contributor

craig bot commented May 12, 2023

Build succeeded:

@craig craig bot merged commit 957e51e into cockroachdb:master May 12, 2023
@blathers-crl
Copy link

blathers-crl bot commented May 12, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from e676243 to blathers/backport-release-22.2-103191: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.2.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants