Skip to content

Commit 9385176

Browse files
committed
iter
1 parent f01b866 commit 9385176

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

server/src/internalClusterTest/java/org/elasticsearch/search/retriever/RetrieverRewriteIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void testRewriteCompoundRetrieverShouldThrowForPartialResults() throws Ex
129129
);
130130
assertThat(
131131
ex.getDetailedMessage(),
132-
containsString("[open_point_in_time] action requires all shards to be available. Missing shards")
132+
containsString("Search rejected due to missing shards")
133133
);
134134
} finally {
135135
internalCluster().restartNode(randomDataNode);

server/src/main/java/org/elasticsearch/action/search/TransportOpenPointInTimeAction.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,6 @@ void runOpenPointInTimePhase(
241241
searchRequest.getMaxConcurrentShardRequests(),
242242
clusters
243243
) {
244-
protected String missingShardsErrorMessage(StringBuilder missingShards) {
245-
return "[open_point_in_time] action requires all shards to be available. Missing shards: ["
246-
+ missingShards
247-
+ "]. Consider using `allow_partial_search_results` setting to bypass this error.";
248-
}
249-
250244
@Override
251245
protected void executePhaseOnShard(
252246
SearchShardIterator shardIt,

x-pack/plugin/sql/qa/jdbc/single-node/src/javaRestTest/java/org/elasticsearch/xpack/sql/qa/jdbc/single_node/JdbcShardFailureIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void createTestIndex() throws IOException {
7676
public void testPartialResponseHandling() throws SQLException {
7777
try (Connection c = esJdbc(); Statement s = c.createStatement()) {
7878
SQLException exception = expectThrows(SQLException.class, () -> s.executeQuery("SELECT * FROM test ORDER BY test_field ASC"));
79-
assertThat(exception.getMessage(), containsString("[open_point_in_time] action requires all shards to be available"));
79+
assertThat(exception.getMessage(), containsString("Search rejected due to missing shards"));
8080
}
8181
}
8282
}

0 commit comments

Comments
 (0)