Skip to content

[Storage] [DataMovement] Fixed bug where adding multiple transfer in parallel could cause a Dictionary Collision in the transfers stored #46919

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.

Sign up for GitHub

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

Merged
amnguye merged 8 commits into from
Oct 31, 2024
Merged

[Storage] [DataMovement] Fixed bug where adding multiple transfer in parallel could cause a Dictionary Collision in the transfers stored #46919

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
21391ee
WIP
amnguye Oct 9, 2024
3638b10
Merge branch 'main' into fix/storage/checkpointer-transfers-dictionary
amnguye Oct 12, 2024
3d0d1a2
WIP -test
amnguye Oct 12, 2024
cd42128
Fixed bug where adding multiple transfers in parallel could cause a c…
amnguye Oct 30, 2024
74f12f0
Merge branch 'main' into fix/storage/checkpointer-transfers-dictionary
amnguye Oct 30, 2024
4b74f10
Merge main test continued
amnguye Oct 30, 2024
1e2fdd2
Fix tests
amnguye Oct 31, 2024
97dbc32
Fix to get transferes local checkpointer test to ignore order
amnguye Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into fix/storage/checkpointer-transfers-dictionary
  • Loading branch information
@amnguye
amnguye committed Oct 30, 2024
commit 74f12f06709b9a17304a4931506ba037a79f3f09
4 changes: 1 addition & 3 deletions sdk/storage/Azure.Storage.DataMovement/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
### Breaking Changes

### Bugs Fixed
- Fixed bug where adding multiple transfers in parallel could cause a collision (`InvalidOperationException`) in the data transfers stored within the `TransferManager`.

### Other Changes

Expand All @@ -19,9 +20,6 @@
- Removed the constructor for `TransferCheckpointStoreOptions` and replaced with a static builder method `Local`.
- Changed `TransferCheckpointStoreOptions.CheckpointerPath` to internal.

### Bugs Fixed
- Fixed bug where adding multiple transfers in parallel could cause a collision (`InvalidOperationException`) in the data transfers stored within the `TransferManager`.

### Other Changes
- Upgraded `System.Text.Json` package dependency to 6.0.10 for security fix.

Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/Azure.Storage.DataMovement/src/TransferManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ private async Task SetDataTransfers(CancellationToken cancellationToken = defaul
List<string> storedTransfers = await _checkpointer.GetStoredTransfersAsync(cancellationToken).ConfigureAwait(false);
foreach (string transferId in storedTransfers)
{
DataTransferStatus jobStatus = await _checkpointer.GetJobStatusAsync(transferId).ConfigureAwait(false);
DataTransferStatus jobStatus = await _checkpointer.GetJobStatusAsync(transferId, cancellationToken).ConfigureAwait(false);
// If TryAdd fails here, we need to check if in other places where we are
// adding that every transferId is unique.
if (!_dataTransfers.TryAdd(transferId, new DataTransfer(
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.