Update error message as per review comments

Signed-off-by: Shreyansh Ray <[email protected]>
rayshrey · Nov 28, 2023 · 3b842e4 · 3b842e4
1 parent 69f1cf9
commit 3b842e4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/server/src/internalClusterTest/java/org/opensearch/index/engine/MaxDocsLimitIT.java b/server/src/internalClusterTest/java/org/opensearch/index/engine/MaxDocsLimitIT.java
@@ -127,7 +127,7 @@ public void testMaxDocsLimit() throws Exception {
         );
         assertThat(
             deleteError.getMessage(),
-            containsString("Number of documents in shard " + shardId + " can't exceed [" + maxDocs.get() + "]")
+            containsString("Number of documents in shard " + shardId + " exceeds the limit of [" + maxDocs.get() + "] documents per shard")
         );
         client().admin().indices().prepareRefresh("test").get();
         SearchResponse searchResponse = client().prepareSearch("test")
@@ -216,7 +216,13 @@ static IndexingResult indexDocs(int numRequests, int numThreads) throws Exceptio
                         numFailure.incrementAndGet();
                         assertThat(
                             e.getMessage(),
-                            containsString("Number of documents in shard " + shardId + " can't exceed [" + maxDocs.get() + "]")
+                            containsString(
+                                "Number of documents in shard "
+                                    + shardId
+                                    + " exceeds the limit of ["
+                                    + maxDocs.get()
+                                    + "] documents per shard"
+                            )
                         );
                     }
                 }

diff --git a/server/src/main/java/org/opensearch/index/engine/InternalEngine.java b/server/src/main/java/org/opensearch/index/engine/InternalEngine.java
@@ -1412,7 +1412,9 @@ private Exception tryAcquireInFlightDocs(Operation operation, int addingDocs) {
         final long totalDocs = indexWriter.getPendingNumDocs() + inFlightDocCount.addAndGet(addingDocs);
         if (totalDocs > maxDocs) {
             releaseInFlightDocs(addingDocs);
-            return new IllegalArgumentException("Number of documents in shard " + shardId + " can't exceed [" + maxDocs + "]");
+            return new IllegalArgumentException(
+                "Number of documents in shard " + shardId + " exceeds the limit of [" + maxDocs + "] documents per shard"
+            );
         } else {
             return null;
         }

diff --git a/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/opensearch/index/engine/InternalEngineTests.java
@@ -7801,7 +7801,9 @@ public void testMaxDocsOnPrimary() throws Exception {
                     assertNotNull(result.getFailure());
                     assertThat(
                         result.getFailure().getMessage(),
-                        containsString("Number of documents in shard " + shardId + " can't exceed [" + maxDocs + "]")
+                        containsString(
+                            "Number of documents in shard " + shardId + " exceeds the limit of [" + maxDocs + "] documents per shard"
+                        )
                     );
                     assertThat(result.getSeqNo(), equalTo(UNASSIGNED_SEQ_NO));
                     assertThat(engine.getLocalCheckpointTracker().getMaxSeqNo(), equalTo(maxSeqNo));