-
Notifications
You must be signed in to change notification settings - Fork 263
Fix invalidblocklist debug call #3394
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
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -277,8 +277,6 @@ func (s *blockBlobSenderBase) Epilogue() { | |
| CPKScopeInfo: s.jptm.CpkScopeInfo(), | ||
| }) | ||
| if err != nil { | ||
| jptm.FailActiveSend(common.Iff(blobTags != nil, "Committing block list (with tags)", "Committing block list"), err) | ||
|
|
||
| /* | ||
| If we get an invalid block list, it's likely one of our blocks was deleted, or GC'd mid-job or something. | ||
| Knowing which blocks are missing is useful, as up to 50k blocks can exist in a single object. | ||
|
|
@@ -331,6 +329,9 @@ func (s *blockBlobSenderBase) Epilogue() { | |
| } | ||
| } | ||
|
|
||
| // Fail _afterwards_, since this is the action that cancels our context. Unfortunately, doing this would cause us to fail to send the request that'd get us details on the block list. | ||
| jptm.FailActiveSend(common.Iff(blobTags != nil, "Committing block list (with tags)", "Committing block list"), err) | ||
|
|
||
|
Comment on lines
+332
to
+334
|
||
| return | ||
| } | ||
|
|
||
|
|
||
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.
Now that FailActiveSend is delayed until after the InvalidBlockList diagnostics, any latency/hang in the GetBlockList call (or subsequent formatting) will delay marking the transfer failed/canceling the context. Consider running the diagnostic GetBlockList under a short, bounded timeout context (best-effort) so this debug path can’t stall epilogue/failure propagation.