Prevent cascading test failures in SearchServiceTests

I'm not really fixing the failing tests, but ensuring that the two tests that fail don't cause a bunch of other tests to fail by leaving transient settings around. (Clean up the transient settings even if those tests fail.) Signed-off-by: Michael Froh <[email protected]>
opensearch-project · Dec 19, 2024 · fd14e80 · fd14e80
1 parent b780ac5
commit fd14e80
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/server/src/test/java/org/opensearch/search/SearchServiceTests.java b/server/src/test/java/org/opensearch/search/SearchServiceTests.java
@@ -1585,15 +1585,15 @@ public void testConcurrentSegmentSearchWithRandomizedModeSettings() throws IOExc
             } else {
                 assertNull(searchContext.searcher().getTaskExecutor());
             }
-        }
-
-        // Cleanup
-        client().admin()
-            .cluster()
-            .prepareUpdateSettings()
-            .setTransientSettings(Settings.builder().putNull(SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_MODE.getKey()))
-            .get();
+        } finally {
+            // Cleanup
+            client().admin()
+                .cluster()
+                .prepareUpdateSettings()
+                .setTransientSettings(Settings.builder().putNull(SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_MODE.getKey()))
+                .get();
 
+        }
     }
 
     /**
@@ -1749,15 +1749,15 @@ public void testConcurrentSegmentSearchIsSetOnceDuringContextCreation() throws I
 
                 // verify that concurrent segment search is still set to same expected value for the context
                 assertEquals(concurrentSearchSetting, searchContext.shouldUseConcurrentSearch());
+            } finally {
+                // Cleanup
+                client().admin()
+                    .cluster()
+                    .prepareUpdateSettings()
+                    .setTransientSettings(Settings.builder().putNull(SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey()))
+                    .get();
             }
         }
-
-        // Cleanup
-        client().admin()
-            .cluster()
-            .prepareUpdateSettings()
-            .setTransientSettings(Settings.builder().putNull(SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey()))
-            .get();
     }
 
     /**