Commit 3b74e10
SOLR-17949: Fix Azure Blob path/listing bugs and wire tests to shared backup suites
Align the Azure Blob backup repository with S3/GCS conventions:
- resolve()/getBlobPath() now mirror S3 exactly (fold URI host into the path),
fixing exists()/getPathType() on virtual directories
- listDir() strips trailing delimiters so it returns bare child names per the
BackupRepository contract
- delete() tolerates already-absent files (lenient, like local/S3)
- commitBlockList(..., true) for overwrite semantics on retried uploads
- handleBlobException() logs HTTP 404 at debug, other failures at error
- fail fast with a clear message when the container name is missing
- drop the unused CHUNK_SIZE constant and unused throws on sanitizedPath()
- document the ~195 GiB single-file block-count ceiling
Rewrite the tests to extend the shared abstract suites (AbstractBackupRepositoryTest,
AbstractIncrementalBackupTest, AbstractInstallShardTest) against Azurite via a new
AzuriteTestContainer helper. Recommend supplying secrets via sysprops/env vars in the
reference guide.
Co-authored-by: Cursor <cursoragent@cursor.com>1 parent 0ee9d20 commit 3b74e10
11 files changed
Lines changed: 413 additions & 891 deletions
File tree
- solr
- modules/azure-blob-repository
- src
- java/org/apache/solr/azureblob
- test/org/apache/solr/azureblob
- solr-ref-guide/modules/deployment-guide/pages
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
68 | | - | |
| 68 | + | |
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
| |||
Lines changed: 18 additions & 19 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
57 | 56 | | |
58 | 57 | | |
59 | 58 | | |
| |||
121 | 120 | | |
122 | 121 | | |
123 | 122 | | |
| 123 | + | |
124 | 124 | | |
125 | 125 | | |
126 | 126 | | |
| |||
170 | 170 | | |
171 | 171 | | |
172 | 172 | | |
173 | | - | |
174 | | - | |
175 | | - | |
176 | | - | |
177 | | - | |
178 | | - | |
179 | | - | |
180 | | - | |
181 | | - | |
182 | | - | |
183 | | - | |
184 | | - | |
185 | | - | |
186 | | - | |
187 | 173 | | |
188 | 174 | | |
189 | | - | |
| 175 | + | |
| 176 | + | |
190 | 177 | | |
191 | 178 | | |
192 | 179 | | |
193 | 180 | | |
194 | 181 | | |
195 | 182 | | |
196 | | - | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
197 | 193 | | |
198 | 194 | | |
199 | 195 | | |
| |||
352 | 348 | | |
353 | 349 | | |
354 | 350 | | |
355 | | - | |
| 351 | + | |
356 | 352 | | |
357 | 353 | | |
358 | 354 | | |
| |||
377 | 373 | | |
378 | 374 | | |
379 | 375 | | |
380 | | - | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
381 | 380 | | |
382 | 381 | | |
383 | 382 | | |
| |||
Lines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
21 | 22 | | |
22 | 23 | | |
23 | 24 | | |
| |||
54 | 55 | | |
55 | 56 | | |
56 | 57 | | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
57 | 64 | | |
58 | 65 | | |
59 | 66 | | |
| |||
Lines changed: 2 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
41 | | - | |
42 | | - | |
| 41 | + | |
43 | 42 | | |
44 | 43 | | |
45 | 44 | | |
| |||
220 | 219 | | |
221 | 220 | | |
222 | 221 | | |
223 | | - | |
| 222 | + | |
224 | 223 | | |
225 | 224 | | |
226 | 225 | | |
| |||
Lines changed: 9 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
222 | 222 | | |
223 | 223 | | |
224 | 224 | | |
| 225 | + | |
| 226 | + | |
225 | 227 | | |
226 | 228 | | |
227 | 229 | | |
| |||
579 | 581 | | |
580 | 582 | | |
581 | 583 | | |
582 | | - | |
| 584 | + | |
583 | 585 | | |
584 | 586 | | |
585 | 587 | | |
| |||
621 | 623 | | |
622 | 624 | | |
623 | 625 | | |
624 | | - | |
625 | | - | |
626 | 626 | | |
| 627 | + | |
| 628 | + | |
| 629 | + | |
627 | 630 | | |
628 | | - | |
629 | | - | |
630 | 631 | | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
631 | 635 | | |
632 | 636 | | |
0 commit comments