Skip to content

Commit 0876454

Browse files
idegtiarenkoalbertzaharovits
authored andcommitted
Reword exception message (#110481)
Rewords the exception message to make it clear the documents limit is per shard, not per index.
1 parent 4c97d87 commit 0876454

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

server/src/internalClusterTest/java/org/elasticsearch/index/engine/MaxDocsLimitIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void testMaxDocsLimit() throws Exception {
102102
assertThat(indexingResult.numFailures, equalTo(rejectedRequests));
103103
assertThat(indexingResult.numSuccess, equalTo(0));
104104
final IllegalArgumentException deleteError = expectThrows(IllegalArgumentException.class, client().prepareDelete("test", "any-id"));
105-
assertThat(deleteError.getMessage(), containsString("Number of documents in the index can't exceed [" + maxDocs.get() + "]"));
105+
assertThat(deleteError.getMessage(), containsString("Number of documents in the shard cannot exceed [" + maxDocs.get() + "]"));
106106
indicesAdmin().prepareRefresh("test").get();
107107
assertNoFailuresAndResponse(
108108
prepareSearch("test").setQuery(new MatchAllQueryBuilder()).setTrackTotalHitsUpTo(Integer.MAX_VALUE).setSize(0),
@@ -162,7 +162,7 @@ static IndexingResult indexDocs(int numRequests, int numThreads) throws Exceptio
162162
assertThat(resp.status(), equalTo(RestStatus.CREATED));
163163
} catch (IllegalArgumentException e) {
164164
numFailure.incrementAndGet();
165-
assertThat(e.getMessage(), containsString("Number of documents in the index can't exceed [" + maxDocs.get() + "]"));
165+
assertThat(e.getMessage(), containsString("Number of documents in the shard cannot exceed [" + maxDocs.get() + "]"));
166166
}
167167
}
168168
});

server/src/main/java/org/elasticsearch/index/engine/InternalEngine.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1688,7 +1688,7 @@ private Exception tryAcquireInFlightDocs(Operation operation, int addingDocs) {
16881688
final long totalDocs = indexWriter.getPendingNumDocs() + inFlightDocCount.addAndGet(addingDocs);
16891689
if (totalDocs > maxDocs) {
16901690
releaseInFlightDocs(addingDocs);
1691-
return new IllegalArgumentException("Number of documents in the index can't exceed [" + maxDocs + "]");
1691+
return new IllegalArgumentException("Number of documents in the shard cannot exceed [" + maxDocs + "]");
16921692
} else {
16931693
return null;
16941694
}

server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7417,7 +7417,7 @@ public void testMaxDocsOnPrimary() throws Exception {
74177417
assertNotNull(result.getFailure());
74187418
assertThat(
74197419
result.getFailure().getMessage(),
7420-
containsString("Number of documents in the index can't exceed [" + maxDocs + "]")
7420+
containsString("Number of documents in the shard cannot exceed [" + maxDocs + "]")
74217421
);
74227422
assertThat(result.getSeqNo(), equalTo(UNASSIGNED_SEQ_NO));
74237423
assertThat(engine.getLocalCheckpointTracker().getMaxSeqNo(), equalTo(maxSeqNo));

0 commit comments

Comments
 (0)