backuppcl: pass finishesSpec field to resume span #120204
Conversation
msbutler
requested review from
herkolategan and
renatolabs
and removed request for
a team,
herkolategan and
renatolabs
|
This change is |
msbutler
added
backport-23.1.x
msbutler
force-pushed
the
butler-fix-fraction-completed
branch
from
2548eec to
4a4d4ae
Compare
| span: *resp.ResumeSpan, | ||
| firstKeyTS: resumeTS, | ||
| start: span.start, | ||
| end: span.end, | ||
| attempts: span.attempts, | ||
| lastTried: span.lastTried, |
There was a problem hiding this comment.
Should we reconsider our pattern her. Perhaps we should copy the whole struct and then reset the fields we want to reset.
There was a problem hiding this comment.
perhaps in a follow up commit that doesn't get backported?
msbutler
force-pushed
the
butler-fix-fraction-completed
branch
4 times, most recently
from
70f8213 to
c23cff6
Compare
PR cockroachdb#114268 broke the plumbing for the CompletedSpans metric which allows the backup coordinator to update the FractionCompleted metric. This patch fixes this bug by passing the finishesSpec field to the resume span. Informs cockroachdb#120161 Release note: none
msbutler
force-pushed
the
butler-fix-fraction-completed
branch
from
c23cff6 to
2707ed1
Compare
This refactor makes the code less error prone, when adding a new field to `spanAndTime`. Release note: none Epic: none
|
TFTR! bors r=dt |
|
Build succeeded: |
![blathers[crl]](https://avatars.githubusercontent.com/in/59700?s=40&u=373d9101a12edc3847d2fb6ae78e3adcfb4ca41e&v=4){kind=avatar}
|
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 2707ed1 to blathers/backport-release-23.1-120204: 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 23.1.x failed. See errors above. error creating merge commit from 2707ed1 to blathers/backport-release-23.2-120204: 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 23.2.x failed. See errors above. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
|
When you manually backport to 23.1, can you do 23.1.17-rc as well? |
PR #114268 broke the plumbing for the CompletedSpans metric which allows the backup coordinator to update the FractionCompleted metric. This patch fixes this bug by passing the finishesSpec field to the resume span.
Informs #120161
Release note: none