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.

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

Jump to bottom

Batch API: Fixes the size limit to reduce timeouts #1757

Merged
merged 8 commits into from
Aug 7, 2020
Merged

Batch API: Fixes the size limit to reduce timeouts #1757

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0a5fcda
Batch size update
rakkuma Aug 6, 2020
02598bd
Merge branch 'master' of https://github.com/Azure/azure-cosmos-dotnet…
rakkuma Aug 6, 2020
69bc8a5
Test case
rakkuma Aug 6, 2020
065434a
code review fix
rakkuma Aug 6, 2020
58f08ee
Fixing comment
rakkuma Aug 7, 2020
6cb63d4
Merge branch 'master' into users/rakkuma/batch-config-update
j82w Aug 7, 2020
e9f5cec
Merge branch 'master' into users/rakkuma/batch-config-update
ealsur Aug 7, 2020
83b3893
Merge branch 'master' into users/rakkuma/batch-config-update
ealsur Aug 7, 2020
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
4 changes: 3 additions & 1 deletion Microsoft.Azure.Cosmos/src/Batch/BatchAsyncContainerExecutorCache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ namespace Microsoft.Azure.Cosmos
/// </summary>
internal class BatchAsyncContainerExecutorCache : IDisposable
{
// Same as bulk v2.
internal const int DefaultMaxBulkRequestBodySizeInBytes = 220201;
j82w marked this conversation as resolved.
Show resolved Hide resolved
private ConcurrentDictionary<string, BatchAsyncContainerExecutor> executorsPerContainer = new ConcurrentDictionary<string, BatchAsyncContainerExecutor>();

public BatchAsyncContainerExecutor GetExecutorForContainer(
Expand All @@ -35,7 +37,7 @@ public BatchAsyncContainerExecutor GetExecutorForContainer(
container,
cosmosClientContext,
Constants.MaxOperationsInDirectModeBatchRequest,
Constants.MaxDirectModeBatchRequestBodySizeInBytes);
DefaultMaxBulkRequestBodySizeInBytes);
rakkuma marked this conversation as resolved.
Show resolved Hide resolved
if (!this.executorsPerContainer.TryAdd(containerLink, newExecutor))
{
newExecutor.Dispose();
Expand Down
8 changes: 4 additions & 4 deletions ...Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Batch/BatchAsyncContainerExecutorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public async Task RetryOnSplit()
},
string.Empty);
mockContainer.Setup(x => x.GetRoutingMapAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(routingMap));
BatchAsyncContainerExecutor executor = new BatchAsyncContainerExecutor(mockContainer.Object, mockedContext.Object, 20, Constants.MaxDirectModeBatchRequestBodySizeInBytes);
BatchAsyncContainerExecutor executor = new BatchAsyncContainerExecutor(mockContainer.Object, mockedContext.Object, 20, BatchAsyncContainerExecutorCache.DefaultMaxBulkRequestBodySizeInBytes);
j82w marked this conversation as resolved.
Show resolved Hide resolved
TransactionalBatchOperationResult result = await executor.AddAsync(itemBatchOperation);

Mock.Get(mockContainer.Object)
Expand Down Expand Up @@ -117,7 +117,7 @@ public async Task RetryOnNameStale()
},
string.Empty);
mockContainer.Setup(x => x.GetRoutingMapAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(routingMap));
BatchAsyncContainerExecutor executor = new BatchAsyncContainerExecutor(mockContainer.Object, mockedContext.Object, 20, Constants.MaxDirectModeBatchRequestBodySizeInBytes);
BatchAsyncContainerExecutor executor = new BatchAsyncContainerExecutor(mockContainer.Object, mockedContext.Object, 20, BatchAsyncContainerExecutorCache.DefaultMaxBulkRequestBodySizeInBytes);
TransactionalBatchOperationResult result = await executor.AddAsync(itemBatchOperation);

Mock.Get(mockContainer.Object)
Expand Down Expand Up @@ -177,7 +177,7 @@ public async Task RetryOn429()
},
string.Empty);
mockContainer.Setup(x => x.GetRoutingMapAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(routingMap));
BatchAsyncContainerExecutor executor = new BatchAsyncContainerExecutor(mockContainer.Object, mockedContext.Object, 20, Constants.MaxDirectModeBatchRequestBodySizeInBytes);
BatchAsyncContainerExecutor executor = new BatchAsyncContainerExecutor(mockContainer.Object, mockedContext.Object, 20, BatchAsyncContainerExecutorCache.DefaultMaxBulkRequestBodySizeInBytes);
TransactionalBatchOperationResult result = await executor.AddAsync(itemBatchOperation);

Mock.Get(mockContainer.Object)
Expand Down Expand Up @@ -236,7 +236,7 @@ public async Task DoesNotRecalculatePartitionKeyRangeOnNoSplits()
},
string.Empty);
mockContainer.Setup(x => x.GetRoutingMapAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(routingMap));
BatchAsyncContainerExecutor executor = new BatchAsyncContainerExecutor(mockContainer.Object, mockedContext.Object, 20, Constants.MaxDirectModeBatchRequestBodySizeInBytes);
BatchAsyncContainerExecutor executor = new BatchAsyncContainerExecutor(mockContainer.Object, mockedContext.Object, 20, BatchAsyncContainerExecutorCache.DefaultMaxBulkRequestBodySizeInBytes);
TransactionalBatchOperationResult result = await executor.AddAsync(itemBatchOperation);

Mock.Get(mockContainer.Object)
Expand Down