-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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
scpb: ensure IndexZoneConfig fields do not overlap #135933
Conversation
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.
Nit: For the reserved field add a comment for when we stopped using it
Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: complete! 1 of 0 LGTMs obtained (waiting on @annrpom)
Also? |
Previously, Dedej-Bergin (Bergin Dedej) wrote…
|
In cockroachdb#134522, we added a fix to ensure that we cleaned up backrefs properly for our `IndexZoneConfig` element, but in doing so, we created an overlap of field ID `3` between v24.2+. This patch ensures that we do not re-use the same field ID for a different field in our IndexZoneConfig element by marking it as `reserved`. Fixes: cockroachdb#133003 Fixes: cockroachdb#135807 Release note: None
b20c7c8
to
d0d3a1e
Compare
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.
done
Reviewable status: complete! 0 of 0 LGTMs obtained (and 1 stale) (waiting on @Dedej-Bergin and @fqazi)
Previously, Dedej-Bergin (Bergin Dedej) wrote…
Fixes: #134934
we likely want to leave that one open and ignore it until that branch gets deleted since this does not need to be backported to the rc
; apologies for the noise
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.
Reviewable status: complete! 0 of 0 LGTMs obtained (and 1 stale) (waiting on @fqazi)
TFTRs! ('-')7 bors r+ |
Based on the specified backports for this PR, I applied new labels to the following linked issue(s). Please adjust the labels as needed to match the branches actually affected by the issue(s), including adding any known older branches. Issue #135807: branch-release-24.3. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
Encountered an error creating backports. Some common things that can go wrong:
You might need to create your backport manually using the backport tool. error creating merge commit from d0d3a1e to blathers/backport-release-24.3-135933: 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 24.3.x failed. See errors above. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
In #134522, we added a fix to ensure that we cleaned up backrefs properly for our
IndexZoneConfig
element, but in doing so, we created an overlap of field ID3
between v24.2+. This patch ensures that we do not re-use the same field ID for a different field in our IndexZoneConfig element by marking it asreserved
.Fixes: #133003
Fixes: #135807
Release note: None