From 312b3aa03e6fe3dfb52ecfd74d093927513175ca Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Thu, 11 Aug 2022 09:53:27 +0200 Subject: [PATCH] Disable Hazelcast network join auto-detection in tests At present, Hazelcast configurations used in tests disable multicast join but leave network join auto-detection enabled. This can cause issues with parallel test execution on machines that have bigger number of CPU cores/threads. This commit updates Hazelcast configurations used in tests to disable network join auto-detection and thus ensure no network join method ends up being enabled. --- .../session/hazelcast/HazelcastITestUtils.java | 4 ++-- .../src/integration-test/resources/hazelcast-server.xml | 2 +- .../src/main/java/sample/config/SessionConfig.java | 4 ++-- .../src/main/java/sample/SessionConfig.java | 4 ++-- .../src/main/java/sample/Initializer.java | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/HazelcastITestUtils.java b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/HazelcastITestUtils.java index e3144dfb9..b3de50aa8 100644 --- a/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/HazelcastITestUtils.java +++ b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/HazelcastITestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,7 +45,7 @@ static HazelcastInstance embeddedHazelcastServer() { Config config = new Config(); NetworkConfig networkConfig = config.getNetworkConfig(); networkConfig.setPort(0); - networkConfig.getJoin().getMulticastConfig().setEnabled(false); + networkConfig.getJoin().getAutoDetectionConfig().setEnabled(false); AttributeConfig attributeConfig = new AttributeConfig() .setName(HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE) .setExtractorClassName(PrincipalNameExtractor.class.getName()); diff --git a/spring-session-hazelcast/src/integration-test/resources/hazelcast-server.xml b/spring-session-hazelcast/src/integration-test/resources/hazelcast-server.xml index 4605924da..0d79c3acd 100644 --- a/spring-session-hazelcast/src/integration-test/resources/hazelcast-server.xml +++ b/spring-session-hazelcast/src/integration-test/resources/hazelcast-server.xml @@ -5,7 +5,7 @@ - + diff --git a/spring-session-samples/spring-session-sample-boot-hazelcast/src/main/java/sample/config/SessionConfig.java b/spring-session-samples/spring-session-sample-boot-hazelcast/src/main/java/sample/config/SessionConfig.java index e7589c7d5..0f3d40199 100644 --- a/spring-session-samples/spring-session-sample-boot-hazelcast/src/main/java/sample/config/SessionConfig.java +++ b/spring-session-samples/spring-session-sample-boot-hazelcast/src/main/java/sample/config/SessionConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ public Config hazelcastConfig() { Config config = new Config(); NetworkConfig networkConfig = config.getNetworkConfig(); networkConfig.setPort(0); - networkConfig.getJoin().getMulticastConfig().setEnabled(false); + networkConfig.getJoin().getAutoDetectionConfig().setEnabled(false); AttributeConfig attributeConfig = new AttributeConfig() .setName(HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE) .setExtractorClassName(PrincipalNameExtractor.class.getName()); diff --git a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/src/main/java/sample/SessionConfig.java b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/src/main/java/sample/SessionConfig.java index 4e0bd232c..49146de23 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/src/main/java/sample/SessionConfig.java +++ b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/src/main/java/sample/SessionConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ public HazelcastInstance hazelcastInstance() { Config config = new Config(); NetworkConfig networkConfig = config.getNetworkConfig(); networkConfig.setPort(0); - networkConfig.getJoin().getMulticastConfig().setEnabled(false); + networkConfig.getJoin().getAutoDetectionConfig().setEnabled(false); AttributeConfig attributeConfig = new AttributeConfig() .setName(HazelcastIndexedSessionRepository.PRINCIPAL_NAME_ATTRIBUTE) .setExtractorClassName(PrincipalNameExtractor.class.getName()); diff --git a/spring-session-samples/spring-session-sample-misc-hazelcast/src/main/java/sample/Initializer.java b/spring-session-samples/spring-session-sample-misc-hazelcast/src/main/java/sample/Initializer.java index 640a290b4..c93217bdb 100644 --- a/spring-session-samples/spring-session-sample-misc-hazelcast/src/main/java/sample/Initializer.java +++ b/spring-session-samples/spring-session-sample-misc-hazelcast/src/main/java/sample/Initializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,7 +63,7 @@ private HazelcastInstance createHazelcastInstance() { Config config = new Config(); NetworkConfig networkConfig = config.getNetworkConfig(); networkConfig.setPort(0); - networkConfig.getJoin().getMulticastConfig().setEnabled(false); + networkConfig.getJoin().getAutoDetectionConfig().setEnabled(false); config.getMapConfig(SESSION_MAP_NAME).setTimeToLiveSeconds(MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS); return Hazelcast.newHazelcastInstance(config); }