From a527db33c8db2a2015f0e810da3ba6a25c1dee0a Mon Sep 17 00:00:00 2001 From: Andy Zhang <87735571+Andyz26@users.noreply.github.com> Date: Mon, 7 Oct 2024 16:28:19 -0700 Subject: [PATCH] fix ut --- .../master/jobcluster/JobClusterAkkaTest.java | 23 ++++++++++++++++++- .../job/JobClusterManagerAkkaTest.java | 17 +++++++++++++- .../worker/client/MantisHttpClientImpl.java | 2 +- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/mantis-control-plane/mantis-control-plane-server/src/test/java/io/mantisrx/master/jobcluster/JobClusterAkkaTest.java b/mantis-control-plane/mantis-control-plane-server/src/test/java/io/mantisrx/master/jobcluster/JobClusterAkkaTest.java index ba14d85d7..ae68d5d27 100644 --- a/mantis-control-plane/mantis-control-plane-server/src/test/java/io/mantisrx/master/jobcluster/JobClusterAkkaTest.java +++ b/mantis-control-plane/mantis-control-plane-server/src/test/java/io/mantisrx/master/jobcluster/JobClusterAkkaTest.java @@ -56,6 +56,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doAnswer; @@ -114,7 +115,14 @@ import io.mantisrx.server.core.Status; import io.mantisrx.server.core.Status.TYPE; import io.mantisrx.server.core.domain.WorkerId; -import io.mantisrx.server.master.domain.*; +import io.mantisrx.server.master.domain.DataFormatAdapter; +import io.mantisrx.server.master.domain.IJobClusterDefinition; +import io.mantisrx.server.master.domain.JobClusterConfig; +import io.mantisrx.server.master.domain.JobClusterDefinitionImpl; +import io.mantisrx.server.master.domain.JobClusterDefinitionImpl.CompletedJob; +import io.mantisrx.server.master.domain.JobDefinition; +import io.mantisrx.server.master.domain.JobId; +import io.mantisrx.server.master.domain.SLA; import io.mantisrx.server.master.persistence.IMantisPersistenceProvider; import io.mantisrx.server.master.persistence.KeyValueBasedPersistenceProvider; import io.mantisrx.server.master.persistence.MantisJobStore; @@ -123,6 +131,7 @@ import io.mantisrx.server.master.scheduler.WorkerEvent; import io.mantisrx.server.master.store.FileBasedStore; import io.mantisrx.server.master.store.NamedJob; +import io.mantisrx.shaded.com.google.common.collect.ImmutableList; import io.mantisrx.shaded.com.google.common.collect.Lists; import java.io.File; import java.time.Duration; @@ -643,6 +652,18 @@ public void testJobClusterDisable() throws InterruptedException { .withJobDefinition(jobDefn) .withJobState(JobState.Completed) .build(); + when(jobStoreMock.loadCompletedJobsForCluster(any(), anyInt(), any())) + // .thenReturn(ImmutableList.of()); + .thenReturn(ImmutableList.of( + new CompletedJob( + completedJobMock.getClusterName(), + completedJobMock.getJobId().getId(), + "v1", + JobState.Completed, + -1L, + -1L, + completedJobMock.getUser(), + completedJobMock.getLabels()))); when(jobStoreMock.getArchivedJob(any())).thenReturn(of(completedJobMock)); doAnswer((Answer) invocation -> { storeCompletedCalled.countDown(); diff --git a/mantis-control-plane/mantis-control-plane-server/src/test/java/io/mantisrx/master/jobcluster/job/JobClusterManagerAkkaTest.java b/mantis-control-plane/mantis-control-plane-server/src/test/java/io/mantisrx/master/jobcluster/job/JobClusterManagerAkkaTest.java index 769e29bd1..b388994ec 100644 --- a/mantis-control-plane/mantis-control-plane-server/src/test/java/io/mantisrx/master/jobcluster/job/JobClusterManagerAkkaTest.java +++ b/mantis-control-plane/mantis-control-plane-server/src/test/java/io/mantisrx/master/jobcluster/job/JobClusterManagerAkkaTest.java @@ -30,6 +30,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -89,6 +90,7 @@ import io.mantisrx.server.master.domain.IJobClusterDefinition; import io.mantisrx.server.master.domain.JobClusterConfig; import io.mantisrx.server.master.domain.JobClusterDefinitionImpl; +import io.mantisrx.server.master.domain.JobClusterDefinitionImpl.CompletedJob; import io.mantisrx.server.master.domain.JobDefinition; import io.mantisrx.server.master.domain.JobId; import io.mantisrx.server.master.domain.SLA; @@ -99,6 +101,7 @@ import io.mantisrx.server.master.scheduler.WorkerEvent; import io.mantisrx.server.master.scheduler.WorkerLaunched; import io.mantisrx.server.master.store.FileBasedStore; +import io.mantisrx.shaded.com.google.common.collect.ImmutableList; import io.mantisrx.shaded.com.google.common.collect.Lists; import java.io.IOException; import java.net.MalformedURLException; @@ -1596,7 +1599,7 @@ public void testTerminalEventFromZombieWorkerIgnored() { } @Test - public void testNonTerminalEventFromZombieWorkerLeadsToTermination() { + public void testNonTerminalEventFromZombieWorkerLeadsToTermination() throws IOException { TestKit probe = new TestKit(system); String clusterName = "testNonTerminalEventFromZombieWorkerLeadsToTermination"; @@ -1612,6 +1615,18 @@ public void testNonTerminalEventFromZombieWorkerLeadsToTermination() { assertEquals(SUCCESS_CREATED, resp.responseCode); WorkerId zWorker1 = new WorkerId("randomCluster", "randomCluster-1", 0, 1); + when(jobStoreMock.loadCompletedJobsForCluster(any(), anyInt(), any())) + // .thenReturn(ImmutableList.of()); + .thenReturn(ImmutableList.of( + new CompletedJob( + clusterName, + clusterName + "-1", + "v1", + JobState.Completed, + -1L, + -1L, + "ut", + ImmutableList.of()))); when(jobStoreMock.getArchivedJob(zWorker1.getJobId())) .thenReturn(Optional.of( new MantisJobMetadataImpl.Builder().withJobDefinition(mock(JobDefinition.class)) diff --git a/mantis-server/mantis-server-worker-client/src/main/java/io/mantisrx/server/worker/client/MantisHttpClientImpl.java b/mantis-server/mantis-server-worker-client/src/main/java/io/mantisrx/server/worker/client/MantisHttpClientImpl.java index 9454013d9..96c2d687f 100644 --- a/mantis-server/mantis-server-worker-client/src/main/java/io/mantisrx/server/worker/client/MantisHttpClientImpl.java +++ b/mantis-server/mantis-server-worker-client/src/main/java/io/mantisrx/server/worker/client/MantisHttpClientImpl.java @@ -81,7 +81,7 @@ public Observable, HttpClientRequest< } protected void trackConnection(Channel channel) { - log.info("Tracking connection: {}", channel.toString()); + log.debug("Tracking connection: {}", channel.toString()); synchronized (connectionTracker) { if (isClosed.get()) { log.info("Http client is already closed. Close the channel immediately. {}", channel);