Skip to content

Commit 09c6e6e

Browse files
committed
Add random path when present, don't assert generation header is present
1 parent 08e1b95 commit 09c6e6e

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

modules/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageRetryingInputStream.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,6 @@ private Long parseGenerationHeader(HttpResponse response) {
158158
assert false : "Unexpected value for x-goog-generation header: " + generationHeader;
159159
return null;
160160
}
161-
} else {
162-
assert false : "X-Goog-Generation header was missing?";
163161
}
164162
return null;
165163
}

modules/repository-gcs/src/test/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobContainerRetriesTests.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,12 @@ public void testContentsChangeWhileStreaming() throws IOException {
605605
String message = assertThrows(NoSuchFileException.class, () -> readFully(inputStream)).getMessage();
606606
assertThat(
607607
message,
608-
startsWith("Blob object [" + key + "] generation [1] unavailable on resume (contents changed, or object deleted):")
608+
startsWith(
609+
"Blob object ["
610+
+ container.path().buildAsString()
611+
+ key
612+
+ "] generation [1] unavailable on resume (contents changed, or object deleted):"
613+
)
609614
);
610615
}
611616
}

0 commit comments

Comments
 (0)