libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

Save ~2s for Keycloak startup in the testsuite

Browse source 
Relates to #21033
This commit is contained in:
Martin Bartoš 2023-06-15 13:18:37 +02:00 committed by Hynek Mlnařík
parent 365fb34df4
commit c6995f5ded
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/AbstractQuarkusDeployableContainer.java
View file

@ -43,6 +43,7 @@ import javax.net.ssl.SSLSession;
import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager; import javax.net.ssl.X509TrustManager;
import org.apache.commons.lang3.SystemUtils; import org.apache.commons.lang3.SystemUtils;
import org.jboss.arquillian.container.spi.client.container.DeployableContainer; import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
import org.jboss.arquillian.container.spi.client.container.DeploymentException; import org.jboss.arquillian.container.spi.client.container.DeploymentException;
@ -87,7 +88,7 @@ public abstract class AbstractQuarkusDeployableContainer implements DeployableCo
deployArchiveToServer(archive); deployArchiveToServer(archive);
restartServer(); restartServer();
} catch (Exception e) { } catch (Exception e) {
throw new DeploymentException(e.getMessage(),e); throw new DeploymentException(e.getMessage(), e);
} }
return new ProtocolMetaData(); return new ProtocolMetaData();
@ -104,7 +105,7 @@ public abstract class AbstractQuarkusDeployableContainer implements DeployableCo
Files.deleteIfExists(wrkDir.toPath().resolve(archive.getName())); Files.deleteIfExists(wrkDir.toPath().resolve(archive.getName()));
restartServer(); restartServer();
} catch (Exception e) { } catch (Exception e) {
throw new DeploymentException(e.getMessage(),e); throw new DeploymentException(e.getMessage(), e);
} }
} }
@ -173,18 +174,21 @@ public abstract class AbstractQuarkusDeployableContainer implements DeployableCo
final StoreProvider storeProvider = StoreProvider.getCurrentProvider(); final StoreProvider storeProvider = StoreProvider.getCurrentProvider();
final Supplier<Boolean> shouldSetUpDb = () -> !restart.get() && !storeProvider.equals(StoreProvider.DEFAULT); final Supplier<Boolean> shouldSetUpDb = () -> !restart.get() && !storeProvider.equals(StoreProvider.DEFAULT);
final Supplier<String> getClusterConfig = () -> System.getProperty("auth.server.quarkus.cluster.config", "local"); final String cacheMode = System.getProperty("auth.server.quarkus.cluster.config", "local");
if ("local".equals(cacheMode)) {
// Save ~2s for each Quarkus startup, when we know ISPN cluster is empty. See https://github.com/keycloak/keycloak/issues/21033
commands.add("-Djgroups.join_timeout=10");
}
log.debugf("FIPS Mode: %s", configuration.getFipsMode()); log.debugf("FIPS Mode: %s", configuration.getFipsMode());
// only run build during first execution of the server (if the DB is specified), restarts or when running cluster tests // only run build during first execution of the server (if the DB is specified), restarts or when running cluster tests
if (restart.get() || shouldSetUpDb.get() || "ha".equals(getClusterConfig.get()) || configuration.getFipsMode() != FipsMode.DISABLED) { if (restart.get() || "ha".equals(cacheMode) || shouldSetUpDb.get() || configuration.getFipsMode() != FipsMode.DISABLED) {
commands.removeIf("--optimized"::equals); commands.removeIf("--optimized"::equals);
commands.add("--http-relative-path=/auth"); commands.add("--http-relative-path=/auth");
if (!storeProvider.isMapStore()) { if (!storeProvider.isMapStore()) {
String cacheMode = getClusterConfig.get();
if ("local".equals(cacheMode)) { if ("local".equals(cacheMode)) {
commands.add("--cache=local"); commands.add("--cache=local");
} else { } else {
@ -295,7 +299,7 @@ public abstract class AbstractQuarkusDeployableContainer implements DeployableCo
} }
private SSLSocketFactory createInsecureSslSocketFactory() throws IOException { private SSLSocketFactory createInsecureSslSocketFactory() throws IOException {
TrustManager[] trustAllCerts = new TrustManager[] {new X509TrustManager() { TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() {
public void checkClientTrusted(final X509Certificate[] chain, final String authType) { public void checkClientTrusted(final X509Certificate[] chain, final String authType) {
} }