From 23e13396384912344ebc188aae94995ac076e05a Mon Sep 17 00:00:00 2001 From: Dmitry Vyazelenko <696855+vyazelenko@users.noreply.github.com> Date: Wed, 4 Aug 2021 16:48:58 +0200 Subject: [PATCH] [Java] Remove publication linger timeout validation that expected the value to be greater than or equal to the driver-level timeout, because the validation was not working and `linger=0` was allowed and is used in tests and also in the Cluster. --- .../main/java/io/aeron/driver/Configuration.java | 15 --------------- .../java/io/aeron/driver/PublicationParams.java | 1 - 2 files changed, 16 deletions(-) diff --git a/aeron-driver/src/main/java/io/aeron/driver/Configuration.java b/aeron-driver/src/main/java/io/aeron/driver/Configuration.java index c7386446fd..eea5e71424 100644 --- a/aeron-driver/src/main/java/io/aeron/driver/Configuration.java +++ b/aeron-driver/src/main/java/io/aeron/driver/Configuration.java @@ -1735,21 +1735,6 @@ public static void validateMtuLength(final int mtuLength) } } - /** - * Validate the publication linger timeout is an appropriate value. - * - * @param timeoutNs to be validated. - * @param driverLingerTimeoutNs set for the driver operation. - * @throws ConfigurationException if the values are not valid. - */ - public static void validatePublicationLingerTimeoutNs(final long timeoutNs, final long driverLingerTimeoutNs) - { - if (timeoutNs < driverLingerTimeoutNs) - { - throw new ConfigurationException("linger=" + driverLingerTimeoutNs + " < timeoutNs =" + timeoutNs); - } - } - /** * Get the {@link TerminationValidator} implementations which can be used for validating a termination request * sent to the driver to ensure the client has the right to terminate a driver. diff --git a/aeron-driver/src/main/java/io/aeron/driver/PublicationParams.java b/aeron-driver/src/main/java/io/aeron/driver/PublicationParams.java index c397cf7b0a..9c60ebe756 100644 --- a/aeron-driver/src/main/java/io/aeron/driver/PublicationParams.java +++ b/aeron-driver/src/main/java/io/aeron/driver/PublicationParams.java @@ -255,7 +255,6 @@ private void getLingerTimeoutNs(final ChannelUri channelUri) if (null != lingerParam) { lingerTimeoutNs = SystemUtil.parseDuration(LINGER_PARAM_NAME, lingerParam); - Configuration.validatePublicationLingerTimeoutNs(lingerTimeoutNs, lingerTimeoutNs); } }