From 3e7bca2a4ec1d5bcc5d84f3a4b5a6a61f67c677d Mon Sep 17 00:00:00 2001 From: Sumit Bansal Date: Sun, 29 Sep 2024 17:01:28 +0530 Subject: [PATCH] Remove unncessary debug statement and fix exception registeration Signed-off-by: Sumit Bansal --- .../java/org/opensearch/OpenSearchServerException.java | 9 +++++++++ .../opensearch/rest/ResponseLimitBreachedException.java | 2 +- .../java/org/opensearch/rest/ResponseLimitSettings.java | 1 - .../java/org/opensearch/ExceptionSerializationTests.java | 2 ++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/opensearch/OpenSearchServerException.java b/server/src/main/java/org/opensearch/OpenSearchServerException.java index b0ab62259d5c0..89bd50b40a46c 100644 --- a/server/src/main/java/org/opensearch/OpenSearchServerException.java +++ b/server/src/main/java/org/opensearch/OpenSearchServerException.java @@ -14,6 +14,7 @@ import static org.opensearch.Version.V_2_10_0; import static org.opensearch.Version.V_2_13_0; import static org.opensearch.Version.V_2_17_0; +import static org.opensearch.Version.V_2_18_0; import static org.opensearch.Version.V_2_1_0; import static org.opensearch.Version.V_2_4_0; import static org.opensearch.Version.V_2_5_0; @@ -1210,6 +1211,14 @@ public static void registerExceptions() { V_2_17_0 ) ); + registerExceptionHandle( + new OpenSearchExceptionHandle( + org.opensearch.rest.ResponseLimitBreachedException.class, + org.opensearch.rest.ResponseLimitBreachedException::new, + 175, + V_2_18_0 + ) + ); registerExceptionHandle( new OpenSearchExceptionHandle( org.opensearch.cluster.block.IndexCreateBlockException.class, diff --git a/server/src/main/java/org/opensearch/rest/ResponseLimitBreachedException.java b/server/src/main/java/org/opensearch/rest/ResponseLimitBreachedException.java index 281e023a45a6b..d06b7e13d135f 100644 --- a/server/src/main/java/org/opensearch/rest/ResponseLimitBreachedException.java +++ b/server/src/main/java/org/opensearch/rest/ResponseLimitBreachedException.java @@ -15,7 +15,7 @@ import java.io.IOException; /** - * Thrown when api response limit threshold exceeds + * Thrown when api response breaches threshold limit. * * @opensearch.internal */ diff --git a/server/src/main/java/org/opensearch/rest/ResponseLimitSettings.java b/server/src/main/java/org/opensearch/rest/ResponseLimitSettings.java index ac29331c1954f..a8a337ac77622 100644 --- a/server/src/main/java/org/opensearch/rest/ResponseLimitSettings.java +++ b/server/src/main/java/org/opensearch/rest/ResponseLimitSettings.java @@ -126,7 +126,6 @@ public static boolean isResponseLimitBreached(final RoutingTable routingTable, f totalShards += entry.getValue().getShards().size(); if (totalShards > limit) return true; } - System.out.println("Total Shards" + totalShards); break; } return false; diff --git a/server/src/test/java/org/opensearch/ExceptionSerializationTests.java b/server/src/test/java/org/opensearch/ExceptionSerializationTests.java index 2e4a2d7bdd59c..ff68d1718e9b9 100644 --- a/server/src/test/java/org/opensearch/ExceptionSerializationTests.java +++ b/server/src/test/java/org/opensearch/ExceptionSerializationTests.java @@ -106,6 +106,7 @@ import org.opensearch.indices.replication.common.ReplicationFailedException; import org.opensearch.ingest.IngestProcessorException; import org.opensearch.repositories.RepositoryException; +import org.opensearch.rest.ResponseLimitBreachedException; import org.opensearch.rest.action.admin.indices.AliasesNotFoundException; import org.opensearch.search.SearchContextMissingException; import org.opensearch.search.SearchException; @@ -898,6 +899,7 @@ public void testIds() { ids.put(172, ViewNotFoundException.class); ids.put(173, ViewAlreadyExistsException.class); ids.put(174, InvalidIndexContextException.class); + ids.put(175, ResponseLimitBreachedException.class); ids.put(10001, IndexCreateBlockException.class); Map, Integer> reverse = new HashMap<>();