From e8ae835df2b4a809cb23f2b175e7a28f17d7c9c1 Mon Sep 17 00:00:00 2001 From: Andrew Obuchowicz Date: Tue, 18 Oct 2022 14:33:50 -0400 Subject: [PATCH] fixup! chore: remove che.infra.kubernetes.workspace_start_timeout_min property --- .../kubernetes/KubernetesInternalRuntime.java | 18 ------------ .../KubernetesInternalRuntimeTest.java | 28 ------------------- 2 files changed, 46 deletions(-) diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntime.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntime.java index 19a58e384c..be3d4a3f09 100644 --- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntime.java +++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntime.java @@ -471,25 +471,7 @@ public class KubernetesInternalRuntime @Override protected void internalStop(Map stopOptions) throws InfrastructureException { RuntimeIdentity identity = getContext().getIdentity(); - TracingTags.WORKSPACE_ID.set(identity.getWorkspaceId()); - - runtimeHangingDetector.stopTracking(getContext().getIdentity()); - if (startSynchronizer.interrupt()) { - // runtime is STARTING. Need to wait until start will be interrupted properly - - // Runtime is not interrupted yet. It may occur when start was performing by another - // Che Server that is crashed so start is hung up in STOPPING phase. - // Need to clean up runtime resources - probeScheduler.cancel(identity.getWorkspaceId()); - runtimeCleaner.cleanUp(namespace, identity.getWorkspaceId()); - - } else { - // runtime is RUNNING. Clean up used resources - // Cancels workspace servers probes if any - probeScheduler.cancel(identity.getWorkspaceId()); - runtimeCleaner.cleanUp(namespace, identity.getWorkspaceId()); - } } @Override diff --git a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntimeTest.java b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntimeTest.java index fdb29fabf2..d3f71053f7 100644 --- a/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntimeTest.java +++ b/infrastructures/kubernetes/src/test/java/org/eclipse/che/workspace/infrastructure/kubernetes/KubernetesInternalRuntimeTest.java @@ -30,7 +30,6 @@ import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -72,7 +71,6 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -503,23 +501,6 @@ public class KubernetesInternalRuntimeTest { assertEquals(provisionedCommand.getType(), provisionedCommand.getType()); } - @Test - public void stopsKubernetesEnvironment() throws Exception { - doNothing().when(namespace).cleanUp(); - - internalRuntime.internalStop(emptyMap()); - - verify(runtimeHangingDetector).stopTracking(IDENTITY); - verify(runtimeCleaner).cleanUp(namespace, WORKSPACE_ID); - } - - @Test(expectedExceptions = InfrastructureException.class) - public void throwsInfrastructureExceptionWhenKubernetesNamespaceCleanupFailed() throws Exception { - doThrow(InfrastructureException.class).when(runtimeCleaner).cleanUp(namespace, WORKSPACE_ID); - - internalRuntime.internalStop(emptyMap()); - } - @Test public void testRepublishContainerOutputAsMachineLogEvents() throws Exception { final MachineLogsPublisher logsPublisher = @@ -568,15 +549,6 @@ public class KubernetesInternalRuntimeTest { verify(eventService, never()).publish(any()); } - @Test - public void cancelsWsProbesOnRuntimeStop() throws Exception { - doNothing().when(namespace).cleanUp(); - - internalRuntime.internalStop(emptyMap()); - - verify(probesScheduler).cancel(WORKSPACE_ID); - } - @Test public void shouldMarkRuntimeStarting() throws Exception { // when