Skip to content

Commit 34f1b0b

Browse files
stevejgordonstevejgordon
authored
Fix dropped doc callback for retried docs (#6815)
* Fix dropped doc callback for retried docs * Fix license header * Conditional ReferenceAssemblies See NuGet/Home#11823 * Update package locks * Update test SDK to avoid VS package restore issue
1 parent 164e792 commit 34f1b0b

File tree

21 files changed

+145
-181
lines changed

21 files changed

+145
-181
lines changed

‎.ci/packages.lock.json‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
{
22
"version": 1,
33
"dependencies": {
4-
".NETCoreApp,Version=v5.0": {
5-
"Microsoft.NETFramework.ReferenceAssemblies": {
6-
"type": "Direct",
7-
"requested": "[1.0.3, )",
8-
"resolved": "1.0.3",
9-
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg=="
10-
}
11-
}
4+
".NETCoreApp,Version=v5.0": {}
125
}
136
}

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<ExposedPublicKey>002400000480000094000000060200000024000052534131000400000100010025d3a22bf3781ba85067374ad832dfcba3c4fa8dd89227e36121ba17b2c33ad6b6ce03e45e562050a031e2ff7fe12cff9060a50acbc6a0eef9ef32dc258d90f874b2e76b581938071ccc4b4d98204d1d6ca7a1988d7a211f9fc98efd808cf85f61675b11007d0eb0461dc86a968d6af8ebba7e6b540303b54f1c1f5325c252be</ExposedPublicKey>
4646
</PropertyGroup>
4747

48-
<ItemGroup>
48+
<ItemGroup Condition="'$(TargetFramework)'=='net461' or '$(TargetFramework)'=='net472'">
4949
<!-- Include unconditionally due to difference in how dotnet cli and design time builds generate package.lock.json -->
5050
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.3"/>
5151
</ItemGroup>

‎build/scripts/packages.lock.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,6 @@
8484
"resolved": "5.0.0",
8585
"contentHash": "iHoYXA0VaSQUONGENB1aVafjDDZDZpwu39MtaRCTrmwFW/cTcK0b2yKNVYneFHJMc3ChtsSoM9lNtJ1dYXkHfA=="
8686
},
87-
"Microsoft.NETFramework.ReferenceAssemblies": {
88-
"type": "Direct",
89-
"requested": "[1.0.3, )",
90-
"resolved": "1.0.3",
91-
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg=="
92-
},
9387
"Newtonsoft.Json": {
9488
"type": "Direct",
9589
"requested": "[13.0.1, )",

‎src/ApiGenerator/packages.lock.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@
2121
"Microsoft.CodeAnalysis.Common": "[3.1.0-beta3-final]"
2222
}
2323
},
24-
"Microsoft.NETFramework.ReferenceAssemblies": {
25-
"type": "Direct",
26-
"requested": "[1.0.3, )",
27-
"resolved": "1.0.3",
28-
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg=="
29-
},
3024
"Newtonsoft.Json": {
3125
"type": "Direct",
3226
"requested": "[13.0.1, )",

‎src/DocGenerator/packages.lock.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,6 @@
113113
"NETStandard.Library": "1.6.1"
114114
}
115115
},
116-
"Microsoft.NETFramework.ReferenceAssemblies": {
117-
"type": "Direct",
118-
"requested": "[1.0.3, )",
119-
"resolved": "1.0.3",
120-
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg=="
121-
},
122116
"Newtonsoft.Json": {
123117
"type": "Direct",
124118
"requested": "[13.0.1, )",

‎src/Elasticsearch.Net.VirtualizedCluster/packages.lock.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,6 @@
9898
"resolved": "4.0.0",
9999
"contentHash": "PCgUb5I1DIe0GsBZ2fPXr/tOgph9Gh6yoHcpsFxNmTvyOQFXxyOcjM7wPs8ylakPNdFYBUs9YeF2Wsx6K/nEDQ=="
100100
},
101-
"Microsoft.NETFramework.ReferenceAssemblies": {
102-
"type": "Direct",
103-
"requested": "[1.0.3, )",
104-
"resolved": "1.0.3",
105-
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg=="
106-
},
107101
"Microsoft.SourceLink.GitHub": {
108102
"type": "Direct",
109103
"requested": "[1.0.0, )",

‎src/Elasticsearch.Net/packages.lock.json‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,6 @@
9999
"resolved": "4.6.0",
100100
"contentHash": "kxn3M2rnAGy5N5DgcIwcE8QTePWU/XiYcQVzn9HqTls2NKluVzVSmVWRjK7OUPWbljCXuZxHyhEz9kPRIQeXow=="
101101
},
102-
"Microsoft.NETFramework.ReferenceAssemblies": {
103-
"type": "Direct",
104-
"requested": "[1.0.3, )",
105-
"resolved": "1.0.3",
106-
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg=="
107-
},
108102
"Microsoft.SourceLink.GitHub": {
109103
"type": "Direct",
110104
"requested": "[1.0.0, )",
@@ -293,12 +287,6 @@
293287
"resolved": "4.6.0",
294288
"contentHash": "kxn3M2rnAGy5N5DgcIwcE8QTePWU/XiYcQVzn9HqTls2NKluVzVSmVWRjK7OUPWbljCXuZxHyhEz9kPRIQeXow=="
295289
},
296-
"Microsoft.NETFramework.ReferenceAssemblies": {
297-
"type": "Direct",
298-
"requested": "[1.0.3, )",
299-
"resolved": "1.0.3",
300-
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg=="
301-
},
302290
"Microsoft.SourceLink.GitHub": {
303291
"type": "Direct",
304292
"requested": "[1.0.0, )",

‎src/Nest.JsonNetSerializer/packages.lock.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,6 @@
110110
"resolved": "4.0.0",
111111
"contentHash": "PCgUb5I1DIe0GsBZ2fPXr/tOgph9Gh6yoHcpsFxNmTvyOQFXxyOcjM7wPs8ylakPNdFYBUs9YeF2Wsx6K/nEDQ=="
112112
},
113-
"Microsoft.NETFramework.ReferenceAssemblies": {
114-
"type": "Direct",
115-
"requested": "[1.0.3, )",
116-
"resolved": "1.0.3",
117-
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg=="
118-
},
119113
"Microsoft.SourceLink.GitHub": {
120114
"type": "Direct",
121115
"requested": "[1.0.0, )",

‎src/Nest/Document/Multiple/BulkAll/BulkAllObservable.cs‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,24 +162,43 @@ private async Task<BulkAllResponse> BulkAsync(IList<T> buffer, long page, int ba
162162

163163
var retryableDocuments = new List<T>();
164164
var droppedDocuments = new List<Tuple<BulkResponseItemBase, T>>();
165+
var retryableDocsRemainingAfterRetriesExceeded = false;
165166

166167
foreach (var documentWithResponse in response.Items.Zip(buffer, Tuple.Create))
167168
{
168-
if (documentWithResponse.Item1.IsValid) continue;
169+
if (documentWithResponse.Item1.IsValid)
170+
continue;
169171

170172
if (_retryPredicate(documentWithResponse.Item1, documentWithResponse.Item2))
171-
retryableDocuments.Add(documentWithResponse.Item2);
173+
{
174+
if (backOffRetries < _backOffRetries)
175+
{
176+
retryableDocuments.Add(documentWithResponse.Item2);
177+
}
178+
else
179+
{
180+
// We still have retriable documents but have exceeded all retries, so we mark these as
181+
// dropped so they get handled correctly.
182+
retryableDocsRemainingAfterRetriesExceeded = true;
183+
droppedDocuments.Add(documentWithResponse);
184+
}
185+
}
172186
else
187+
{
173188
droppedDocuments.Add(documentWithResponse);
189+
}
174190
}
175191

176192
HandleDroppedDocuments(droppedDocuments, response);
177193

178-
if (retryableDocuments.Count > 0 && backOffRetries < _backOffRetries)
194+
if (retryableDocsRemainingAfterRetriesExceeded)
195+
{
196+
throw ThrowOnBadBulk(response, $"Bulk indexing failed and after retrying {backOffRetries} times.");
197+
}
198+
else if (retryableDocuments.Count > 0)
199+
{
179200
return await RetryDocuments(page, ++backOffRetries, retryableDocuments).ConfigureAwait(false);
180-
181-
if (retryableDocuments.Count > 0)
182-
throw ThrowOnBadBulk(response, $"Bulk indexing failed and after retrying {backOffRetries} times");
201+
}
183202

184203
request.BackPressure?.Release();
185204

‎src/Nest/packages.lock.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,6 @@
9898
"resolved": "4.0.0",
9999
"contentHash": "PCgUb5I1DIe0GsBZ2fPXr/tOgph9Gh6yoHcpsFxNmTvyOQFXxyOcjM7wPs8ylakPNdFYBUs9YeF2Wsx6K/nEDQ=="
100100
},
101-
"Microsoft.NETFramework.ReferenceAssemblies": {
102-
"type": "Direct",
103-
"requested": "[1.0.3, )",
104-
"resolved": "1.0.3",
105-
"contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg=="
106-
},
107101
"Microsoft.SourceLink.GitHub": {
108102
"type": "Direct",
109103
"requested": "[1.0.0, )",

0 commit comments

Comments
 (0)