This is an automated email from the ASF dual-hosted git repository.
abstractdog pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new e95c79d9728 HIVE-26089: ported TestAsyncPbRpcProxy to junit5,
front-loaded JVM warmup and un-ignored a test (#6733)
e95c79d9728 is described below
commit e95c79d9728076d234f722dd78761eb2d8143dab
Author: Konstantin Bereznyakov <[email protected]>
AuthorDate: Wed Sep 2 01:47:03 2026 -0700
HIVE-26089: ported TestAsyncPbRpcProxy to junit5, front-loaded JVM warmup
and un-ignored a test (#6733)
---
.../hadoop/hive/llap/TestAsyncPbRpcProxy.java | 61 +++++++++++++++-------
1 file changed, 41 insertions(+), 20 deletions(-)
diff --git
a/llap-client/src/test/org/apache/hadoop/hive/llap/TestAsyncPbRpcProxy.java
b/llap-client/src/test/org/apache/hadoop/hive/llap/TestAsyncPbRpcProxy.java
index 03cee59d66d..d352963797e 100644
--- a/llap-client/src/test/org/apache/hadoop/hive/llap/TestAsyncPbRpcProxy.java
+++ b/llap-client/src/test/org/apache/hadoop/hive/llap/TestAsyncPbRpcProxy.java
@@ -19,26 +19,47 @@
package org.apache.hadoop.hive.llap;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.mock;
import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
import com.google.protobuf.Message;
import org.apache.commons.lang3.mutable.MutableInt;
-import org.apache.hadoop.hive.llap.LlapNodeId;
import org.apache.hadoop.hive.llap.tez.LlapProtocolClientProxy;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class TestAsyncPbRpcProxy {
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+class TestAsyncPbRpcProxy {
+
+ /**
+ * Front-loads one-time initialization (Mockito, log4j2 (transitively),
classloading) that would
+ * otherwise happen inside the first test's timeout window. A timeout here
indicates a
+ * starved executor, not a test bug (HIVE-26089).
+ */
+ @BeforeAll
+ @Timeout(value = 60000, unit = TimeUnit.MILLISECONDS, threadMode =
Timeout.ThreadMode.SEPARATE_THREAD)
+ static void warmUp() {
+ // Initializes Mockito (agent attach, mock-class generation). Mock classes
are
+ // generated and cached per type, so warm both types the tests use.
+ mock(Message.class);
+ mock(LlapProtocolClientProxy.ExecuteRequestCallback.class);
+ // Loads the RequestManager class hierarchy. Also initializes log4j2,
because the
+ // constructor touches a logger (via AsyncResponseHandler).
+ new RequestManagerForTest(1);
+ // Loads the request classes and LlapNodeId, including its Guava cache.
+ new CallableRequestForTest(LlapNodeId.getInstance("warmup-host", 0), null,
null);
+ }
- @Test (timeout = 5000)
- public void testMultipleNodes() throws Exception {
+ @Test
+ @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS, threadMode =
Timeout.ThreadMode.SEPARATE_THREAD)
+ void testMultipleNodes() throws Exception {
RequestManagerForTest requestManager = new RequestManagerForTest(1);
LlapNodeId nodeId1 = LlapNodeId.getInstance("host1", 1025);
@@ -59,16 +80,16 @@ public void testMultipleNodes() throws Exception {
assertEquals(2, requestManager.numSubmissionsCounters);
assertNotNull(requestManager.numInvocationsPerNode.get(nodeId1));
assertNotNull(requestManager.numInvocationsPerNode.get(nodeId2));
- Assert.assertEquals(1,
requestManager.numInvocationsPerNode.get(nodeId1).getValue().intValue());
- Assert.assertEquals(1,
requestManager.numInvocationsPerNode.get(nodeId2).getValue().intValue());
+ assertEquals(1,
requestManager.numInvocationsPerNode.get(nodeId1).getValue().intValue());
+ assertEquals(1,
requestManager.numInvocationsPerNode.get(nodeId2).getValue().intValue());
assertEquals(0, requestManager.currentLoopSkippedRequests.size());
assertEquals(0, requestManager.currentLoopSkippedRequests.size());
assertEquals(0, requestManager.currentLoopDisabledNodes.size());
}
- @org.junit.Ignore("HIVE-26089")
- @Test(timeout = 5000)
- public void testSingleInvocationPerNode() throws Exception {
+ @Test
+ @Timeout(value = 5000, unit = TimeUnit.MILLISECONDS, threadMode =
Timeout.ThreadMode.SEPARATE_THREAD)
+ void testSingleInvocationPerNode() throws Exception {
RequestManagerForTest requestManager = new RequestManagerForTest(1);
LlapNodeId nodeId1 = LlapNodeId.getInstance("host1", 1025);
@@ -83,7 +104,7 @@ public void testSingleInvocationPerNode() throws Exception {
requestManager.process();
assertEquals(1, requestManager.numSubmissionsCounters);
assertNotNull(requestManager.numInvocationsPerNode.get(nodeId1));
- Assert.assertEquals(1,
requestManager.numInvocationsPerNode.get(nodeId1).getValue().intValue());
+ assertEquals(1,
requestManager.numInvocationsPerNode.get(nodeId1).getValue().intValue());
assertEquals(0, requestManager.currentLoopSkippedRequests.size());
// Second request for host. Single invocation since the last has not
completed.
@@ -92,7 +113,7 @@ public void testSingleInvocationPerNode() throws Exception {
requestManager.process();
assertEquals(1, requestManager.numSubmissionsCounters);
assertNotNull(requestManager.numInvocationsPerNode.get(nodeId1));
- Assert.assertEquals(1,
requestManager.numInvocationsPerNode.get(nodeId1).getValue().intValue());
+ assertEquals(1,
requestManager.numInvocationsPerNode.get(nodeId1).getValue().intValue());
assertEquals(1, requestManager.currentLoopSkippedRequests.size());
assertEquals(1, requestManager.currentLoopDisabledNodes.size());
assertTrue(requestManager.currentLoopDisabledNodes.contains(nodeId1));
@@ -102,7 +123,7 @@ public void testSingleInvocationPerNode() throws Exception {
requestManager.process();
assertEquals(2, requestManager.numSubmissionsCounters);
assertNotNull(requestManager.numInvocationsPerNode.get(nodeId1));
- Assert.assertEquals(2,
requestManager.numInvocationsPerNode.get(nodeId1).getValue().intValue());
+ assertEquals(2,
requestManager.numInvocationsPerNode.get(nodeId1).getValue().intValue());
assertEquals(0, requestManager.currentLoopSkippedRequests.size());
assertEquals(0, requestManager.currentLoopDisabledNodes.size());
assertFalse(requestManager.currentLoopDisabledNodes.contains(nodeId1));
@@ -114,7 +135,7 @@ static class RequestManagerForTest extends
LlapProtocolClientProxy.RequestManage
int numSubmissionsCounters = 0;
private Map<LlapNodeId, MutableInt> numInvocationsPerNode = new
HashMap<>();
- public RequestManagerForTest(int numThreads) {
+ RequestManagerForTest(int numThreads) {
super(numThreads, 1);
}
