Always return a task description even when it cannot be serialized.

Signed-off-by: dblock <dblock@amazon.com>
opensearch-project · Mar 21, 2024 · 098c81e · 098c81e
1 parent 53c0ce3
commit 098c81e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/server/src/main/java/org/opensearch/action/search/SearchTask.java b/server/src/main/java/org/opensearch/action/search/SearchTask.java
@@ -80,7 +80,11 @@ public SearchTask(
 
     @Override
     public final String getDescription() {
-        return descriptionSupplier.get();
+        try {
+            return descriptionSupplier.get();
+        } catch(UnsupportedOperationException e) {
+            return e.getMessage();
+        }
     }
 
     @Override

diff --git a/server/src/test/java/org/opensearch/search/geo/GeoPointShapeQueryTests.java b/server/src/test/java/org/opensearch/search/geo/GeoPointShapeQueryTests.java
@@ -127,6 +127,7 @@ public void testQueryLine() throws Exception {
     public void testQueryLinearRing() throws Exception {
         XContentBuilder xcb = createDefaultMapping();
         client().admin().indices().prepareCreate("test").setMapping(xcb).get();
+
         ensureGreen();
 
         LinearRing linearRing = new LinearRing(new double[] { -25, -35, -25 }, new double[] { -25, -35, -25 });
@@ -143,8 +144,6 @@ public void testQueryLinearRing() throws Exception {
                 e.getCause().getMessage(),
                 containsString("Field [" + defaultGeoFieldName + "] does not support LINEARRING queries")
             );
-        } catch (UnsupportedOperationException e) {
-            assertThat(e.getMessage(), containsString("line ring cannot be serialized using GeoJson"));
         }
     }