This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 114e34e8c6801471a4365aa257584e373b9940bd Merge: fa37c8ad23 1622b49c72 Author: Keith Turner <[email protected]> AuthorDate: Fri Mar 27 21:49:40 2026 +0000 Merge branch '2.1' .../java/org/apache/accumulo/test/ScanServerGroupConfigurationIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --cc test/src/main/java/org/apache/accumulo/test/ScanServerGroupConfigurationIT.java index 3fcbaa391a,566355d341..3f9f46ffbb --- a/test/src/main/java/org/apache/accumulo/test/ScanServerGroupConfigurationIT.java +++ b/test/src/main/java/org/apache/accumulo/test/ScanServerGroupConfigurationIT.java @@@ -43,61 -45,61 +43,61 @@@ import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import com.google.common.collect.Iterables; - public class ScanServerGroupConfigurationIT extends SharedMiniClusterBase { - // @formatter:off - private static final String clientConfiguration = - "["+ - " {"+ - " \"isDefault\": true,"+ - " \"maxBusyTimeout\": \"5m\","+ - " \"busyTimeoutMultiplier\": 8,"+ - " \"scanTypeActivations\": [],"+ - " \"attemptPlans\": ["+ - " {"+ - " \"servers\": \"3\","+ - " \"busyTimeout\": \"33ms\","+ - " \"salt\": \"one\""+ - " },"+ - " {"+ - " \"servers\": \"13\","+ - " \"busyTimeout\": \"33ms\","+ - " \"salt\": \"two\""+ - " },"+ - " {"+ - " \"servers\": \"100%\","+ - " \"busyTimeout\": \"33ms\""+ - " }"+ - " ]"+ - " },"+ - " {"+ - " \"isDefault\": false,"+ - " \"maxBusyTimeout\": \"5m\","+ - " \"busyTimeoutMultiplier\": 8,"+ - " \"group\": \"GROUP1\","+ - " \"scanTypeActivations\": [\"use_group1\"],"+ - " \"timeToWaitForScanServers\": \"120s\","+ - " \"attemptPlans\": ["+ - " {"+ - " \"servers\": \"3\","+ - " \"busyTimeout\": \"33ms\","+ - " \"salt\": \"one\""+ - " },"+ - " {"+ - " \"servers\": \"13\","+ - " \"busyTimeout\": \"33ms\","+ - " \"salt\": \"two\""+ - " },"+ - " {"+ - " \"servers\": \"100%\","+ - " \"busyTimeout\": \"33ms\""+ - " }"+ - " ]"+ - " }"+ - "]"; - // @formatter:on + public static final String clientConfiguration = """ + [ + { + "isDefault": true, + "maxBusyTimeout": "5m", + "busyTimeoutMultiplier": 8, + "scanTypeActivations": [], + "timeToWaitForScanServers": "0s", + "attemptPlans": [ + { + "servers": "3", + "busyTimeout": "33ms", + "salt": "one" + }, + { + "servers": "13", + "busyTimeout": "33ms", + "salt": "two" + }, + { + "servers": "100%", + "busyTimeout": "33ms" + } + ] + }, + { + "isDefault": false, + "maxBusyTimeout": "5m", + "busyTimeoutMultiplier": 8, + "group": "GROUP1", + "scanTypeActivations": [ + "use_group1" + ], - "timeToWaitForScanServers": "0s", ++ "timeToWaitForScanServers": "120s", + "attemptPlans": [ + { + "servers": "3", + "busyTimeout": "33ms", + "salt": "one" + }, + { + "servers": "13", + "busyTimeout": "33ms", + "salt": "two" + }, + { + "servers": "100%", + "busyTimeout": "33ms" + } + ] + } + ] + """; private static class Config implements MiniClusterConfigurationCallback { @Override
