Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
TINKERPOP-2169 Fix connection leak on CorruptedFrameException
Connection leak is fixed by forcefully destroying connection when the underlying Netty channel is inactive. This commit also removes marking the host as unavailable when a connection is abruptly disconnected.
- Loading branch information
Divij Vaidya
committed
Mar 8, 2019
1 parent
5ac3add
commit 2cd84ff
Showing
6 changed files
with
177 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
105 changes: 105 additions & 0 deletions
105
...rver/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientConnectionIntegrateTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.tinkerpop.gremlin.driver; | ||
|
|
||
| import io.netty.handler.codec.CorruptedFrameException; | ||
| import org.apache.log4j.Level; | ||
| import org.apache.log4j.Logger; | ||
| import org.apache.tinkerpop.gremlin.server.AbstractGremlinServerIntegrationTest; | ||
| import org.apache.tinkerpop.gremlin.server.TestClientFactory; | ||
| import org.apache.tinkerpop.gremlin.util.Log4jRecordingAppender; | ||
| import org.junit.After; | ||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| import static org.hamcrest.CoreMatchers.is; | ||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.junit.Assert.fail; | ||
|
|
||
| public class ClientConnectionIntegrateTest extends AbstractGremlinServerIntegrationTest { | ||
| private Log4jRecordingAppender recordingAppender = null; | ||
| private Level previousLogLevel; | ||
|
|
||
| @Before | ||
| public void setupForEachTest() { | ||
| recordingAppender = new Log4jRecordingAppender(); | ||
| final Logger rootLogger = Logger.getRootLogger(); | ||
|
|
||
| if (name.getMethodName().equals("shouldCloseConnectionDeadDueToUnRecoverableError")) { | ||
| final org.apache.log4j.Logger connectionLogger = org.apache.log4j.Logger.getLogger(Connection.class); | ||
| previousLogLevel = connectionLogger.getLevel(); | ||
| connectionLogger.setLevel(Level.DEBUG); | ||
| } | ||
|
|
||
| rootLogger.addAppender(recordingAppender); | ||
| } | ||
|
|
||
| @After | ||
| public void teardownForEachTest() { | ||
| final Logger rootLogger = Logger.getRootLogger(); | ||
|
|
||
| if (name.getMethodName().equals("shouldCloseConnectionDeadDueToUnRecoverableError")) { | ||
| final org.apache.log4j.Logger connectionLogger = org.apache.log4j.Logger.getLogger(Connection.class); | ||
| connectionLogger.setLevel(previousLogLevel); | ||
| } | ||
|
|
||
| rootLogger.removeAppender(recordingAppender); | ||
| } | ||
|
|
||
| /** | ||
| * Reproducer for TINKERPOP-2169 | ||
| */ | ||
| @Test | ||
| public void shouldCloseConnectionDeadDueToUnRecoverableError() throws Exception { | ||
| // Set a low value of maxContentLength to intentionally trigger CorruptedFrameException | ||
| final Cluster cluster = TestClientFactory.build() | ||
| .maxContentLength(64) | ||
| .minConnectionPoolSize(1) | ||
| .maxConnectionPoolSize(2) | ||
| .create(); | ||
| final Client.ClusteredClient client = cluster.connect(); | ||
|
|
||
| try { | ||
| // Add the test data so that the g.V() response could exceed maxContentLength | ||
| client.submit("g.inject(1).repeat(__.addV()).times(10).count()").all().get(); | ||
| try { | ||
| client.submit("g.V().fold()").all().get(); | ||
|
|
||
| fail("Should throw an exception."); | ||
| } catch (Exception re) { | ||
| assertThat(re.getCause() instanceof CorruptedFrameException, is(true)); | ||
| } | ||
|
|
||
| // Assert that the host has not been marked unavailable | ||
| Assert.assertEquals(1, cluster.availableHosts().size()); | ||
|
|
||
| // Assert that there is no connection leak and all connections have been closed | ||
| Assert.assertEquals(0, client.hostConnectionPools.values().stream() | ||
| .findFirst().get() | ||
| .numConnectionsWaitingToCleanup()); | ||
|
|
||
| // Assert that the connection has been destroyed. Specifically check for the string with | ||
| // isDead=true indicating the connection that was closed due to CorruptedFrameException. | ||
| assertThat(recordingAppender.logContainsAny("^(?!.*(isDead=false)).*isDead=true.*destroyed successfully.$"), is(true)); | ||
| } finally { | ||
| cluster.close(); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.