Move markAsSystemContext

Signed-off-by: Craig Perkins <cwperx@amazon.com>
opensearch-project · Nov 22, 2024 · 0ef49bf · 0ef49bf
1 parent 83896cd
commit 0ef49bf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/server/src/main/java/org/opensearch/client/OriginSettingClient.java b/server/src/main/java/org/opensearch/client/OriginSettingClient.java
@@ -71,8 +71,6 @@ protected <Request extends ActionRequest, Response extends ActionResponse> void
                 () -> in().threadPool().getThreadContext().stashWithOrigin(origin)
             )
         ) {
-            ThreadContext threadContext = in().threadPool().getThreadContext();
-            ThreadContextAccess.doPrivilegedVoid(threadContext::markAsSystemContext);
             super.doExecute(action, request, new ContextPreservingActionListener<>(supplier, listener));
         }
     }

diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java b/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java
@@ -227,6 +227,7 @@ public StoredContext stashWithOrigin(String origin) {
             sm.checkPermission(STASH_WITH_ORIGIN_THREAD_CONTEXT_PERMISSION);
         }
         final ThreadContext.StoredContext storedContext = stashContext();
+        ThreadContextAccess.doPrivilegedVoid(this::markAsSystemContext);
         putTransient(ACTION_ORIGIN_TRANSIENT_NAME, origin);
         return storedContext;
     }