Merge with main

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Aug 2, 2024 · dd8e7c3 · dd8e7c3
1 parent 383fa83
commit dd8e7c3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/src/test/java/org/opensearch/action/bulk/RetryTests.java b/server/src/test/java/org/opensearch/action/bulk/RetryTests.java
@@ -72,7 +72,7 @@ public void setUp() throws Exception {
         super.setUp();
         this.bulkClient = new MockBulkClient(getTestName(), CALLS_TO_FAIL);
         // Stash some random headers so we can assert that we preserve them
-        // bulkClient.threadPool().getThreadContext().stashContext();
+        bulkClient.threadPool().getThreadContext().stashContext();
         expectedHeaders.clear();
         expectedHeaders.put(randomAlphaOfLength(5), randomAlphaOfLength(5));
         bulkClient.threadPool().getThreadContext().putHeader(expectedHeaders);

diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/ThreadContextTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/ThreadContextTests.java
@@ -584,7 +584,7 @@ public void testPreservesThreadsOriginalContextOnRunException() throws IOExcepti
 
                 @Override
                 public void onAfter() {
-                    assertTrue(threadContext.isSystemContext());
+                    assertEquals(systemContext, threadContext.isSystemContext());
                     assertEquals("bar", threadContext.getHeader("foo"));
                     assertEquals("bar_transient", threadContext.getTransient("foo"));
                     assertNotNull(threadContext.getTransient("failure"));
@@ -595,7 +595,7 @@ public void onAfter() {
 
                 @Override
                 public void onFailure(Exception e) {
-                    assertTrue(threadContext.isSystemContext());
+                    assertEquals(systemContext, threadContext.isSystemContext());
                     assertEquals("exception from doRun", e.getMessage());
                     assertEquals("bar", threadContext.getHeader("foo"));
                     assertEquals("bar_transient", threadContext.getTransient("foo"));
@@ -605,7 +605,7 @@ public void onFailure(Exception e) {
 
                 @Override
                 protected void doRun() throws Exception {
-                    assertTrue(threadContext.isSystemContext());
+                    assertEquals(systemContext, threadContext.isSystemContext());
                     assertEquals("bar", threadContext.getHeader("foo"));
                     assertEquals("bar_transient", threadContext.getTransient("foo"));
                     assertFalse(threadContext.isDefaultContext());