From 2ae602980c8fc56a7d3b492109ffc19bb3488b74 Mon Sep 17 00:00:00 2001 From: Andrew Obuchowicz Date: Wed, 5 Oct 2022 16:17:02 -0400 Subject: [PATCH] chore: remove che.workspace.probe_pool_size property Signed-off-by: Andrew Obuchowicz --- .../src/main/webapp/WEB-INF/classes/che/che.properties | 4 ---- .../cascaderemoval/JpaEntitiesCascadeRemovalTest.java | 2 -- .../api/workspace/server/hc/probe/ProbeScheduler.java | 9 +++------ 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties index e12f81b12e..178e2adc4d 100644 --- a/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties +++ b/assembly/assembly-wsmaster-war/src/main/webapp/WEB-INF/classes/che/che.properties @@ -29,10 +29,6 @@ che.websocket.endpoint=ws://${CHE_HOST}:${CHE_PORT}/api/websocket # for major WebSocket interactions and messaging. che.websocket.internal.endpoint=NULL -# This property specifies how many threads to use for workspace server liveness probes. -che.workspace.probe_pool_size=10 - - # HTTP proxy setting for workspace JVM. che.workspace.http_proxy_java_options=NULL diff --git a/multiuser/integration-tests/che-multiuser-cascade-removal/src/test/java/org/eclipse/che/multiuser/integration/jpa/cascaderemoval/JpaEntitiesCascadeRemovalTest.java b/multiuser/integration-tests/che-multiuser-cascade-removal/src/test/java/org/eclipse/che/multiuser/integration/jpa/cascaderemoval/JpaEntitiesCascadeRemovalTest.java index 9f6d1ba796..eae5bef84f 100644 --- a/multiuser/integration-tests/che-multiuser-cascade-removal/src/test/java/org/eclipse/che/multiuser/integration/jpa/cascaderemoval/JpaEntitiesCascadeRemovalTest.java +++ b/multiuser/integration-tests/che-multiuser-cascade-removal/src/test/java/org/eclipse/che/multiuser/integration/jpa/cascaderemoval/JpaEntitiesCascadeRemovalTest.java @@ -297,8 +297,6 @@ public class JpaEntitiesCascadeRemovalTest { new ResourceImpl( RamResourceType.ID, 1024, RamResourceType.UNIT))))); - bindConstant().annotatedWith(Names.named("che.workspace.probe_pool_size")).to(1); - // setup bindings for the devfile that would otherwise be read from the config bindConstant() .annotatedWith(Names.named("che.workspace.devfile.default_editor")) diff --git a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/hc/probe/ProbeScheduler.java b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/hc/probe/ProbeScheduler.java index 7f22226321..078efe5d49 100644 --- a/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/hc/probe/ProbeScheduler.java +++ b/wsmaster/che-core-api-workspace/src/main/java/org/eclipse/che/api/workspace/server/hc/probe/ProbeScheduler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2021 Red Hat, Inc. + * Copyright (c) 2012-2022 Red Hat, Inc. * This program and the accompanying materials are made * available under the terms of the Eclipse Public License 2.0 * which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -22,7 +22,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import java.util.function.Supplier; import javax.inject.Inject; -import javax.inject.Named; import javax.inject.Singleton; import org.eclipse.che.api.core.model.workspace.WorkspaceStatus; import org.eclipse.che.api.workspace.server.hc.probe.ProbeResult.ProbeStatus; @@ -52,13 +51,11 @@ public class ProbeScheduler { private final Map> probesFutures; @Inject - public ProbeScheduler( - @Named("che.workspace.probe_pool_size") int probeSchedulerPoolSize, - ExecutorServiceWrapper executorServiceWrapper) { + public ProbeScheduler(ExecutorServiceWrapper executorServiceWrapper) { probesExecutor = executorServiceWrapper.wrap( new ScheduledThreadPoolExecutor( - probeSchedulerPoolSize, + 10, new ThreadFactoryBuilder() .setDaemon(true) .setNameFormat("ServerProbes-%s")