Treat 404 as empty register in AzureBlobStore (#108900)

Closes #108504
elastic · May 22, 2024 · aa542de · aa542de
1 parent 69cc9d6
commit aa542de
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/docs/changelog/108900.yaml b/docs/changelog/108900.yaml
@@ -0,0 +1,6 @@
+pr: 108900
+summary: Treat 404 as empty register in `AzureBlobStore`
+area: Snapshot/Restore
+type: bug
+issues:
+ - 108504
diff --git a/...s/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureBlobStore.java b/...s/repository-azure/src/main/java/org/elasticsearch/repositories/azure/AzureBlobStore.java
@@ -828,7 +828,7 @@ OptionalBytesReference getRegister(String blobPath, String containerPath, String
  } catch (Exception e) {
  if (Throwables.getRootCause(e) instanceof BlobStorageException blobStorageException
  && blobStorageException.getStatusCode() == RestStatus.NOT_FOUND.getStatus()) {
- return OptionalBytesReference.MISSING;
+ return OptionalBytesReference.EMPTY;
  }
  throw e;
  }

diff --git a/...est/java/org/elasticsearch/repositories/blobstore/testkit/AzureSnapshotRepoTestKitIT.java b/...est/java/org/elasticsearch/repositories/blobstore/testkit/AzureSnapshotRepoTestKitIT.java
@@ -77,10 +77,4 @@ protected Settings repositorySettings() {
 
  return Settings.builder().put("client", "repository_test_kit").put("container", container).put("base_path", basePath).build();
  }
-
- @Override
- @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/108504")
- public void testRepositoryAnalysis() throws Exception {
- super.testRepositoryAnalysis();
- }
 }