This is an automated email from the ASF dual-hosted git repository. spmallette pushed a commit to branch driver-35 in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit eaf68015e48a8e611dd3c27fc16d1af8a1789ffe Author: Stephen Mallette <[email protected]> AuthorDate: Thu Oct 3 09:11:29 2019 -0400 Removed obsolete driver settings. These were deprecated initially because we were trying to do this change in a non-breaking fashion along 3.4.x. Now that this has moved to 3.5.0 we can just make a clean break and clean up all the code - no deprecation is necessary. --- docs/src/upgrade/release-3.5.x.asciidoc | 7 + .../apache/tinkerpop/gremlin/driver/Cluster.java | 146 --------------------- .../tinkerpop/gremlin/driver/ConnectionPool.java | 27 +--- .../gremlin/driver/ConnectionPoolImpl.java | 16 +-- .../apache/tinkerpop/gremlin/driver/Settings.java | 72 ---------- .../gremlin/driver/ClusterBuilderTest.java | 2 - .../tinkerpop/gremlin/driver/SettingsTest.java | 10 -- ...ClientSingleRequestConnectionIntegrateTest.java | 14 +- .../gremlin/server/GremlinDriverIntegrateTest.java | 13 +- .../gremlin/server/GremlinServerIntegrateTest.java | 3 +- .../server/GremlinServerSessionIntegrateTest.java | 2 - 11 files changed, 15 insertions(+), 297 deletions(-) diff --git a/docs/src/upgrade/release-3.5.x.asciidoc b/docs/src/upgrade/release-3.5.x.asciidoc index 417d335..484eb34 100644 --- a/docs/src/upgrade/release-3.5.x.asciidoc +++ b/docs/src/upgrade/release-3.5.x.asciidoc @@ -37,6 +37,13 @@ entangled and easier to reason about as the removal of multiplexing eliminates t connection usage and requests in process. Instead, users simply need to consider the connection pool size which represents the maximum number of concurrent requests that the client can make to the server. +A number of configuration options have been removed, so expect the potential for compilation problems on upgrade. +Moreover, given the significance of the change in the processing model, expect the need to alter configurations and +application code in some cases to achieve the same performance as before. + +For example, as the driver may now open more connections than before, it may be necessary to modify the operating +system setting for the maximum number of open files. + See: link:https://issues.apache.org/jira/browse/TINKERPOP-2205[TINKERPOP-2205] ==== Gryo Usage diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java index f3e9dc2..6d72a32 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java @@ -196,12 +196,7 @@ public final class Cluster { .channelizer(settings.connectionPool.channelizer) .maxContentLength(settings.connectionPool.maxContentLength) .maxWaitForConnection(settings.connectionPool.maxWaitForConnection) - .maxInProcessPerConnection(settings.connectionPool.maxInProcessPerConnection) - .minInProcessPerConnection(settings.connectionPool.minInProcessPerConnection) - .maxSimultaneousUsagePerConnection(settings.connectionPool.maxSimultaneousUsagePerConnection) - .minSimultaneousUsagePerConnection(settings.connectionPool.minSimultaneousUsagePerConnection) .maxConnectionPoolSize(settings.connectionPool.maxSize) - .minConnectionPoolSize(settings.connectionPool.minSize) .validationRequest(settings.connectionPool.validationRequest); if (settings.username != null && settings.password != null) @@ -325,36 +320,6 @@ public final class Cluster { } /** - * Gets the minimum number of in-flight requests that can occur on a {@link Connection} before it is considered - * for closing on return to the {@link ConnectionPool}. - */ - public int getMinInProcessPerConnection() { - return manager.connectionPoolSettings.minInProcessPerConnection; - } - - /** - * Gets the maximum number of in-flight requests that can occur on a {@link Connection}. - */ - public int getMaxInProcessPerConnection() { - return manager.connectionPoolSettings.maxInProcessPerConnection; - } - - /** - * Gets the maximum number of times that a {@link Connection} can be borrowed from the pool simultaneously. - */ - public int maxSimultaneousUsagePerConnection() { - return manager.connectionPoolSettings.maxSimultaneousUsagePerConnection; - } - - /** - * Gets the minimum number of times that a {@link Connection} should be borrowed from the pool before it falls - * under consideration for closing. - */ - public int minSimultaneousUsagePerConnection() { - return manager.connectionPoolSettings.minSimultaneousUsagePerConnection; - } - - /** * Gets the maximum size that the {@link ConnectionPool} can grow. */ public int maxConnectionPoolSize() { @@ -362,13 +327,6 @@ public final class Cluster { } /** - * Gets the minimum size of the {@link ConnectionPool}. - */ - public int minConnectionPoolSize() { - return manager.connectionPoolSettings.minSize; - } - - /** * Gets the override for the server setting that determines how many results are returned per batch. */ public int getResultIterationBatchSize() { @@ -539,12 +497,7 @@ public final class Cluster { private MessageSerializer serializer = Serializers.GRAPHBINARY_V1D0.simpleInstance(); private int nioPoolSize = Runtime.getRuntime().availableProcessors(); private int workerPoolSize = Runtime.getRuntime().availableProcessors() * 2; - private int minConnectionPoolSize = ConnectionPool.DEFAULT_MIN_POOL_SIZE; private int maxConnectionPoolSize = ConnectionPool.DEFAULT_MAX_POOL_SIZE; - private int minSimultaneousUsagePerConnection = ConnectionPool.DEFAULT_MIN_SIMULTANEOUS_USAGE_PER_CONNECTION; - private int maxSimultaneousUsagePerConnection = ConnectionPool.DEFAULT_MAX_SIMULTANEOUS_USAGE_PER_CONNECTION; - private int maxInProcessPerConnection = Connection.DEFAULT_MAX_IN_PROCESS; - private int minInProcessPerConnection = Connection.DEFAULT_MIN_IN_PROCESS; private int maxWaitForConnection = Connection.DEFAULT_MAX_WAIT_FOR_CONNECTION; private int maxWaitForSessionClose = Connection.DEFAULT_MAX_WAIT_FOR_SESSION_CLOSE; private int maxContentLength = Connection.DEFAULT_MAX_CONTENT_LENGTH; @@ -726,81 +679,6 @@ public final class Cluster { } /** - * The minimum number of in-flight requests that can occur on a {@link Connection} before it is considered - * for closing on return to the {@link ConnectionPool}. - * - * @deprecated As of release 3.4.3, not replaced, this parameter is ignored. - * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-2205";>TINKERPOP-2205</a> - */ - @Deprecated - public Builder minInProcessPerConnection(final int minInProcessPerConnection) { - this.minInProcessPerConnection = minInProcessPerConnection; - return this; - } - - /** - * The maximum number of in-flight requests that can occur on a {@link Connection}. This represents an - * indication of how busy a {@link Connection} is allowed to be. This number is linked to the - * {@link #maxSimultaneousUsagePerConnection} setting, but is slightly different in that it refers to - * the total number of requests on a {@link Connection}. In other words, a {@link Connection} might - * be borrowed once to have multiple requests executed against it. This number controls the maximum - * number of requests whereas {@link #maxInProcessPerConnection} controls the times borrowed. - * - * @deprecated As of release 3.4.3, replaced by {@link #maxConnectionPoolSize}. For backward - * compatibility it is still used to approximate the amount of parallelism required. In future versions, the - * approximation logic will be removed and dependency on this parameter will be completely eliminated. - * To disable the dependency on this parameter right now, explicitly set the value of - * {@link #maxInProcessPerConnection} and {@link #maxSimultaneousUsagePerConnection} to zero. - * - * @see ConnectionPoolImpl#calculateMaxPoolSize(Settings.ConnectionPoolSettings) for approximation logic. - * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-2205";>TINKERPOP-2205</a> - */ - @Deprecated - public Builder maxInProcessPerConnection(final int maxInProcessPerConnection) { - this.maxInProcessPerConnection = maxInProcessPerConnection; - return this; - } - - /** - * The maximum number of times that a {@link Connection} can be borrowed from the pool simultaneously. - * This represents an indication of how busy a {@link Connection} is allowed to be. Set too large and the - * {@link Connection} may queue requests too quickly, rather than wait for an available {@link Connection} - * or create a fresh one. If set too small, the {@link Connection} will show as busy very quickly thus - * forcing waits for available {@link Connection} instances in the pool when there is more capacity available. - * - * @deprecated As of release 3.4.3, replaced by {@link #maxConnectionPoolSize}. For backward - * compatibility it is still used to approximate the amount of parallelism required. In future versions, the - * approximation logic will be removed and dependency on this parameter will be completely eliminated. - * To disable the dependency on this parameter right now, explicitly set the value of - * {@link #maxInProcessPerConnection} and {@link #maxSimultaneousUsagePerConnection} to zero. - * - * @see ConnectionPoolImpl#calculateMaxPoolSize(Settings.ConnectionPoolSettings) for approximation logic. - * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-2205";>TINKERPOP-2205</a> - */ - @Deprecated - public Builder maxSimultaneousUsagePerConnection(final int maxSimultaneousUsagePerConnection) { - this.maxSimultaneousUsagePerConnection = maxSimultaneousUsagePerConnection; - return this; - } - - /** - * The minimum number of times that a {@link Connection} should be borrowed from the pool before it falls - * under consideration for closing. If a {@link Connection} is not busy and the - * {@link #minConnectionPoolSize} is exceeded, then there is no reason to keep that connection open. Set - * too large and {@link Connection} that isn't busy will continue to consume resources when it is not being - * used. Set too small and {@link Connection} instances will be destroyed when the driver might still be - * busy. - * - * @deprecated As of release 3.4.3, not replaced, this parameter is ignored. - * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-2205";>TINKERPOP-2205</a> - */ - @Deprecated - public Builder minSimultaneousUsagePerConnection(final int minSimultaneousUsagePerConnection) { - this.minSimultaneousUsagePerConnection = minSimultaneousUsagePerConnection; - return this; - } - - /** * The maximum size that the {@link ConnectionPool} can grow. */ public Builder maxConnectionPoolSize(final int maxSize) { @@ -809,19 +687,6 @@ public final class Cluster { } /** - * The minimum size of the {@link ConnectionPool}. When the {@link Client} is started, {@link Connection} - * objects will be initially constructed to this size. - * - * @deprecated As of release 3.4.3, not replaced, this parameter is ignored. - * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-2205";>TINKERPOP-2205</a> - */ - @Deprecated - public Builder minConnectionPoolSize(final int minSize) { - this.minConnectionPoolSize = minSize; - return this; - } - - /** * Override the server setting that determines how many results are returned per batch. */ public Builder resultIterationBatchSize(final int size) { @@ -1025,12 +890,7 @@ public final class Cluster { this.contactPoints = builder.getContactPoints(); connectionPoolSettings = new Settings.ConnectionPoolSettings(); - connectionPoolSettings.maxInProcessPerConnection = builder.maxInProcessPerConnection; - connectionPoolSettings.minInProcessPerConnection = builder.minInProcessPerConnection; - connectionPoolSettings.maxSimultaneousUsagePerConnection = builder.maxSimultaneousUsagePerConnection; - connectionPoolSettings.minSimultaneousUsagePerConnection = builder.minSimultaneousUsagePerConnection; connectionPoolSettings.maxSize = builder.maxConnectionPoolSize; - connectionPoolSettings.minSize = builder.minConnectionPoolSize; connectionPoolSettings.maxWaitForConnection = builder.maxWaitForConnection; connectionPoolSettings.maxWaitForSessionClose = builder.maxWaitForSessionClose; connectionPoolSettings.maxContentLength = builder.maxContentLength; @@ -1067,12 +927,6 @@ public final class Cluster { } private void validateBuilder(final Builder builder) { - if (builder.maxInProcessPerConnection < 0) - throw new IllegalArgumentException("maxInProcessPerConnection must be greater than equal to zero"); - - if (builder.maxSimultaneousUsagePerConnection < 0) - throw new IllegalArgumentException("maxSimultaneousUsagePerConnection must be greater than equal to zero"); - if (builder.maxConnectionPoolSize < 1) throw new IllegalArgumentException("maxConnectionPoolSize must be greater than zero"); diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java index 9d8804f..5f7ee3b 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java @@ -44,32 +44,7 @@ import java.util.concurrent.TimeoutException; */ public interface ConnectionPool { int DEFAULT_MAX_POOL_SIZE = 8; - /** - * @deprecated As of release 3.4.3, not replaced, this setting is ignored. - * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-2205";>TINKERPOP-2205</a> - */ - @Deprecated - int DEFAULT_MIN_POOL_SIZE = 2; - /** - * @deprecated As of release 3.4.3, not replaced, this setting is ignored. - * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-2205";>TINKERPOP-2205</a> - */ - @Deprecated - int DEFAULT_MIN_SIMULTANEOUS_USAGE_PER_CONNECTION = 8; - /** - * @deprecated As of release 3.4.3, replaced by {@link ConnectionPool#DEFAULT_MAX_POOL_SIZE}. For backward - * compatibility it is still used to approximate the amount of parallelism required. In future versions, the - * approximation logic will be removed and dependency on this parameter will be completely eliminated. - * To disable the dependency on this parameter right now, explicitly set the value of - * {@link Settings.ConnectionPoolSettings#maxInProcessPerConnection} and {@link Settings.ConnectionPoolSettings#maxSimultaneousUsagePerConnection} - * to 0. - * - * @see ConnectionPoolImpl#calculateMaxPoolSize(Settings.ConnectionPoolSettings) for approximation - * logic. - * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-2205";>TINKERPOP-2205</a> - */ - @Deprecated - int DEFAULT_MAX_SIMULTANEOUS_USAGE_PER_CONNECTION = 16; + /** * Borrow a connection from the connection pool which would execute the request. Connection pool ensures * that the connection is backed by a healthy {@link Channel} and WebSocket handshake is already complete. diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPoolImpl.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPoolImpl.java index d70d1f7..5f0ccae 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPoolImpl.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPoolImpl.java @@ -138,7 +138,7 @@ public class ConnectionPoolImpl implements ConnectionPool { ChannelHealthChecker.ACTIVE, FixedChannelPool.AcquireTimeoutAction.FAIL, // throw an exception on acquire timeout connectionPoolSettings.maxWaitForConnection, - calculateMaxPoolSize(connectionPoolSettings), /*maxConnections*/ + connectionPoolSettings.maxSize, /*maxConnections*/ 1, /*maxPendingAcquires*/ true);/*releaseHealthCheck*/ } @@ -218,20 +218,6 @@ public class ConnectionPoolImpl implements ConnectionPool { return new SingleRequestConnection(ch, this); } - /** - * Calculates the max size of the channel pool. To maintain backward compatibility - * it is calculated as a function of maxInProcess and maxSimultaneousUsage. In future - * version, when backward compatibility is not required, it should be equal to - * Connectionpoolsettings.maxSize - */ - int calculateMaxPoolSize(Settings.ConnectionPoolSettings connectionPoolSettings) { - if (connectionPoolSettings.maxSimultaneousUsagePerConnection != 0 || connectionPoolSettings.maxInProcessPerConnection != 0) { - return connectionPoolSettings.maxSize * Math.max(connectionPoolSettings.maxSimultaneousUsagePerConnection, connectionPoolSettings.maxInProcessPerConnection); - } else { - return connectionPoolSettings.maxSize; - } - } - @Override public Cluster getCluster() { return this.cluster; diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java index 3049ea9..5deba8b 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java @@ -200,24 +200,9 @@ final class Settings { if (connectionPoolConf.containsKey("sslSkipCertValidation")) cpSettings.sslSkipCertValidation = connectionPoolConf.getBoolean("sslSkipCertValidation"); - if (connectionPoolConf.containsKey("minSize")) - cpSettings.minSize = connectionPoolConf.getInt("minSize"); - if (connectionPoolConf.containsKey("maxSize")) cpSettings.maxSize = connectionPoolConf.getInt("maxSize"); - if (connectionPoolConf.containsKey("minSimultaneousUsagePerConnection")) - cpSettings.minSimultaneousUsagePerConnection = connectionPoolConf.getInt("minSimultaneousUsagePerConnection"); - - if (connectionPoolConf.containsKey("maxSimultaneousUsagePerConnection")) - cpSettings.maxSimultaneousUsagePerConnection = connectionPoolConf.getInt("maxSimultaneousUsagePerConnection"); - - if (connectionPoolConf.containsKey("maxInProcessPerConnection")) - cpSettings.maxInProcessPerConnection = connectionPoolConf.getInt("maxInProcessPerConnection"); - - if (connectionPoolConf.containsKey("minInProcessPerConnection")) - cpSettings.minInProcessPerConnection = connectionPoolConf.getInt("minInProcessPerConnection"); - if (connectionPoolConf.containsKey("maxWaitForConnection")) cpSettings.maxWaitForConnection = connectionPoolConf.getInt("maxWaitForConnection"); @@ -298,13 +283,6 @@ final class Settings { public boolean sslSkipCertValidation = false; /** - * The minimum size of a connection pool for a {@link Host}. By default this is set to 2. - * @deprecated As of release 3.4.3, value is ignore - */ - @Deprecated - public int minSize = ConnectionPool.DEFAULT_MIN_POOL_SIZE; - - /** * The maximum size of a connection pool for a {@link Host}. By default this is set to 8. */ public int maxSize = ConnectionPool.DEFAULT_MAX_POOL_SIZE; @@ -317,56 +295,6 @@ final class Settings { public long keepAliveInterval = Connection.DEFAULT_KEEP_ALIVE_INTERVAL; /** - * A connection under low use can be destroyed. This setting determines the threshold for determining when - * that connection can be released and is defaulted to 8. - * - * @deprecated As of release 3.4.3, not replaced, this parameter is ignored. - * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-2205";>TINKERPOP-2205</a> - */ - @Deprecated - public int minSimultaneousUsagePerConnection = ConnectionPool.DEFAULT_MIN_SIMULTANEOUS_USAGE_PER_CONNECTION; - - /** - * If a connection is over used, then it might mean that is necessary to expand the pool by adding a new - * connection. This setting determines the threshold for a connections over use and is defaulted to 16. Set - * the value to 0 to disable the use of this parameter. - * - * @deprecated As of release 3.4.3, replaced by {@link ConnectionPool#DEFAULT_MAX_POOL_SIZE}. - * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-2205";>TINKERPOP-2205</a> - */ - @Deprecated - public int maxSimultaneousUsagePerConnection = ConnectionPool.DEFAULT_MAX_SIMULTANEOUS_USAGE_PER_CONNECTION; - - /** - * The maximum number of requests in flight on a connection where the default is 4. Set the value to 0 to disable - * the use of this parameter. - * - * @deprecated As of release 3.4.3, replaced by {@link ConnectionPool#DEFAULT_MAX_POOL_SIZE}. For backward - * compatibility it is still used to approximate the amount of parallelism required. In future versions, the - * approximation logic will be removed and dependency on this parameter will be completely eliminated. - * To disable the dependency on this parameter right now, explicitly set the value of - * {@link Settings.ConnectionPoolSettings#maxInProcessPerConnection} and {@link Settings.ConnectionPoolSettings#maxSimultaneousUsagePerConnection} - * to 0. - * - * @see ConnectionPoolImpl#calculateMaxPoolSize(Settings.ConnectionPoolSettings) for approximation logic. - * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-2205";>TINKERPOP-2205</a> - */ - @Deprecated - public int maxInProcessPerConnection = Connection.DEFAULT_MAX_IN_PROCESS; - - /** - * A connection has available in-process requests which is calculated by subtracting the number of current - * in-flight requests on a connection and subtracting that from the {@link #maxInProcessPerConnection}. When - * that number drops below this configuration setting, the connection is recommended for replacement. The - * default for this setting is 1. - * - * @deprecated As of release 3.4.3, not replaced, this parameter is ignored. - * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-2205";>TINKERPOP-2205</a> - */ - @Deprecated - public int minInProcessPerConnection = Connection.DEFAULT_MIN_IN_PROCESS; - - /** * The amount of time in milliseconds to wait for a new connection before timing out where the default value * is 3000. */ diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterBuilderTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterBuilderTest.java index 81290a9..6c7126d 100644 --- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterBuilderTest.java +++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClusterBuilderTest.java @@ -38,8 +38,6 @@ public class ClusterBuilderTest { @Parameterized.Parameters(name = "{0}") public static Iterable<Object[]> data() { return Arrays.asList(new Object[][]{ - {"maxInProcessPerConnectionNeg1", Cluster.build().maxInProcessPerConnection(-1), "maxInProcessPerConnection must be greater than equal to zero"}, - {"maxSimultaneousUsagePerConnectionNeg1", Cluster.build().maxSimultaneousUsagePerConnection(-1), "maxSimultaneousUsagePerConnection must be greater than equal to zero"}, {"maxConnectionPoolSize0", Cluster.build().maxConnectionPoolSize(0), "maxConnectionPoolSize must be greater than zero"}, {"maxConnectionPoolSizeNeg1", Cluster.build().maxConnectionPoolSize(-1), "maxConnectionPoolSize must be greater than zero"}, {"maxConnectionPoolSize0", Cluster.build().maxWaitForConnection(0), "maxWaitForConnection must be greater than zero"}, diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java index b8a1b00..67cda0d 100644 --- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java +++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java @@ -55,12 +55,7 @@ public class SettingsTest { conf.setProperty("connectionPool.sslEnabledProtocols", Arrays.asList("TLSv1.1","TLSv1.2")); conf.setProperty("connectionPool.sslCipherSuites", Arrays.asList("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384")); conf.setProperty("connectionPool.sslSkipCertValidation", true); - conf.setProperty("connectionPool.minSize", 100); conf.setProperty("connectionPool.maxSize", 200); - conf.setProperty("connectionPool.minSimultaneousUsagePerConnection", 300); - conf.setProperty("connectionPool.maxSimultaneousUsagePerConnection", 400); - conf.setProperty("connectionPool.maxInProcessPerConnection", 500); - conf.setProperty("connectionPool.minInProcessPerConnection", 600); conf.setProperty("connectionPool.maxWaitForConnection", 700); conf.setProperty("connectionPool.maxContentLength", 800); conf.setProperty("connectionPool.reconnectInterval", 900); @@ -89,12 +84,7 @@ public class SettingsTest { assertEquals(Arrays.asList("TLSv1.1","TLSv1.2"), settings.connectionPool.sslEnabledProtocols); assertEquals(Arrays.asList("TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"), settings.connectionPool.sslCipherSuites); assertThat(settings.connectionPool.sslSkipCertValidation, is(true)); - assertEquals(100, settings.connectionPool.minSize); assertEquals(200, settings.connectionPool.maxSize); - assertEquals(300, settings.connectionPool.minSimultaneousUsagePerConnection); - assertEquals(400, settings.connectionPool.maxSimultaneousUsagePerConnection); - assertEquals(500, settings.connectionPool.maxInProcessPerConnection); - assertEquals(600, settings.connectionPool.minInProcessPerConnection); assertEquals(700, settings.connectionPool.maxWaitForConnection); assertEquals(800, settings.connectionPool.maxContentLength); assertEquals(900, settings.connectionPool.reconnectInterval); diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientSingleRequestConnectionIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientSingleRequestConnectionIntegrateTest.java index 49d39a4..63b4fe1 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientSingleRequestConnectionIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientSingleRequestConnectionIntegrateTest.java @@ -127,10 +127,6 @@ public class ClientSingleRequestConnectionIntegrateTest extends AbstractGremlinS final Cluster cluster = TestClientFactory.build() .maxContentLength(96) .maxConnectionPoolSize(1) - .maxSimultaneousUsagePerConnection(0) - .minSimultaneousUsagePerConnection(0) - .maxInProcessPerConnection(0) - .minInProcessPerConnection(0) .create(); final Client.ClusteredClient client = cluster.connect(); @@ -189,10 +185,6 @@ public class ClientSingleRequestConnectionIntegrateTest extends AbstractGremlinS public void testTimeoutOnExpiredMaxWaitForConnection() { final Cluster cluster = TestClientFactory.build() .maxConnectionPoolSize(2) - .maxSimultaneousUsagePerConnection(0) - .minSimultaneousUsagePerConnection(0) - .maxInProcessPerConnection(0) - .minInProcessPerConnection(0) .maxWaitForConnection(500) .create(); @@ -413,7 +405,7 @@ public class ClientSingleRequestConnectionIntegrateTest extends AbstractGremlinS } @Test - public void testAbruptClose() throws ExecutionException, InterruptedException, TimeoutException { + public void testAbruptClose() throws InterruptedException { final Cluster cluster = this.createClusterWithXNumOfConnection(50); @@ -441,10 +433,6 @@ public class ClientSingleRequestConnectionIntegrateTest extends AbstractGremlinS private Cluster createClusterWithXNumOfConnection(int x) { return TestClientFactory.build() .maxConnectionPoolSize(x) - .maxSimultaneousUsagePerConnection(0) - .minSimultaneousUsagePerConnection(0) - .maxInProcessPerConnection(0) - .minInProcessPerConnection(0) .create(); } } diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java index 4293f5f..d9801e0 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java @@ -99,8 +99,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.core.StringStartsWith.startsWith; import static org.mockito.Mockito.verify; /** @@ -262,8 +260,6 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration // complicate the assertion logic final Cluster cluster = TestClientFactory.build(). maxConnectionPoolSize(1). - maxSimultaneousUsagePerConnection(0). - maxInProcessPerConnection(0). keepAliveInterval(1002).create(); final Client client = cluster.connect(); @@ -1235,6 +1231,8 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration assertEquals(101, results12.all().get().get(0).getInt()); assertEquals(4, results22.all().get().get(0).getInt()); assertEquals(30, results32.all().get().get(0).getInt()); + } catch (Exception ex) { + throw ex; } finally { cluster.close(); } @@ -1287,17 +1285,14 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration @Test public void shouldBeThreadSafeToUseOneClient() throws Exception { final Cluster cluster = TestClientFactory.build().workerPoolSize(2) - .maxInProcessPerConnection(64) - .minInProcessPerConnection(32) - .maxConnectionPoolSize(16) - .minConnectionPoolSize(8).create(); + .maxConnectionPoolSize(128).create(); final Client client = cluster.connect(); final Map<Integer, Integer> results = new ConcurrentHashMap<>(); final List<Thread> threads = new ArrayList<>(); for (int ix = 0; ix < 100; ix++) { final int otherNum = ix; - final Thread t = new Thread(()->{ + final Thread t = new Thread(() -> { try { results.put(otherNum, client.submit("1000+" + otherNum).all().get().get(0).getInt()); } catch (Exception ex) { diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java index 281bdb1..abe63e2 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java @@ -58,7 +58,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.lang.reflect.Field; import java.net.ConnectException; import java.util.Arrays; import java.util.HashMap; @@ -277,7 +276,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration @Test public void shouldPingChannelIfClientDies() throws Exception { - final Client client = TestClientFactory.build().maxConnectionPoolSize(1).minConnectionPoolSize(1).keepAliveInterval(0).create().connect(); + final Client client = TestClientFactory.build().maxConnectionPoolSize(1).keepAliveInterval(0).create().connect(); client.submit("1+1").all().get(); // since we do nothing for 3 seconds and the time limit for ping is 1 second we should get *about* 3 pings - diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java index a6974a8..0a57c84 100644 --- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java +++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerSessionIntegrateTest.java @@ -329,8 +329,6 @@ public class GremlinServerSessionIntegrateTest extends AbstractGremlinServerInt public void shouldEnsureSessionBindingsAreThreadSafe() throws Exception { final Cluster cluster = TestClientFactory.build() .maxConnectionPoolSize(1000) - .maxInProcessPerConnection(0) // disable these deprecated parameters - .maxSimultaneousUsagePerConnection(0) // disable these deprecated parameters .create(); try { final Client client = cluster.connect(name.getMethodName());
