Modify shrink exception to be more informative (#12117)

Signed-off-by: Poojita Raj <[email protected]> (cherry picked from commit f715ee1) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Feb 1, 2024 · c7e478c · c7e478c
1 parent 3b47fa3
commit c7e478c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...lusterTest/java/org/opensearch/indices/replication/SegmentReplicationResizeRequestIT.java b/...lusterTest/java/org/opensearch/indices/replication/SegmentReplicationResizeRequestIT.java
@@ -87,7 +87,8 @@ public void testCreateShrinkIndexThrowsExceptionWhenReplicasBehind() throws Exce
                     .get()
             );
             assertEquals(
-                " For index [test] replica shards haven't caught up with primary, please retry after sometime.",
+                "Replication still in progress for index [test]. Please wait for replication to complete and retry. "
+                    + "Use the _cat/segment_replication/test api to check if the index is up to date (e.g. bytes_behind == 0).",
                 exception.getMessage()
             );
 

diff --git a/server/src/main/java/org/opensearch/action/admin/indices/shrink/TransportResizeAction.java b/server/src/main/java/org/opensearch/action/admin/indices/shrink/TransportResizeAction.java
@@ -168,9 +168,11 @@ protected void clusterManagerOperation(
                                 .getSegments()
                                 .getReplicationStats().maxBytesBehind != 0) {
                                 throw new IllegalStateException(
-                                    " For index ["
+                                    "Replication still in progress for index ["
                                         + sourceIndex
-                                        + "] replica shards haven't caught up with primary, please retry after sometime."
+                                        + "]. Please wait for replication to complete and retry. Use the _cat/segment_replication/"
+                                        + sourceIndex
+                                        + " api to check if the index is up to date (e.g. bytes_behind == 0)."
                                 );
                             }