Przeglądaj źródła

[Test] Fix EsExecutorsTests.testParseExecutorName (#109053)

Use the overloading method that takes settings as parameter to test null
nodeName.

Resolves: #109014
Yang Wang 1 rok temu
rodzic
commit
a97f2abf67

+ 15 - 1
server/src/test/java/org/elasticsearch/common/util/concurrent/EsExecutorsTests.java

@@ -13,6 +13,7 @@ import org.elasticsearch.action.ActionRunnable;
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.unit.Processors;
+import org.elasticsearch.node.Node;
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.hamcrest.Matcher;
@@ -22,6 +23,7 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -628,7 +630,19 @@ public class EsExecutorsTests extends ESTestCase {
 
     public void testParseExecutorName() throws InterruptedException {
         final var executorName = randomAlphaOfLength(10);
-        final var threadFactory = EsExecutors.daemonThreadFactory(rarely() ? null : randomAlphaOfLength(10), executorName);
+        final String nodeName = rarely() ? null : randomIdentifier();
+        final ThreadFactory threadFactory;
+        if (nodeName == null) {
+            threadFactory = EsExecutors.daemonThreadFactory(Settings.EMPTY, executorName);
+        } else if (randomBoolean()) {
+            threadFactory = EsExecutors.daemonThreadFactory(
+                Settings.builder().put(Node.NODE_NAME_SETTING.getKey(), nodeName).build(),
+                executorName
+            );
+        } else {
+            threadFactory = EsExecutors.daemonThreadFactory(nodeName, executorName);
+        }
+
         final var thread = threadFactory.newThread(() -> {});
         try {
             assertThat(EsExecutors.executorName(thread.getName()), equalTo(executorName));