Skip to content

Notify handlers of a failure on graceful pool closure #1443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ public void channelInactive(ChannelHandlerContext ctx) {
// it is most likely inactive because actual network connection broke or was explicitly closed by the driver

messageDispatcher.handleChannelInactive(error);
ctx.channel().close();
} else {
fail(error);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ public void handleChannelInactive(Throwable cause) {
if (!gracefullyClosed) {
handleChannelError(cause);
} else {
while (!handlers.isEmpty()) {
ResponseHandler handler = removeHandler();
handler.onFailure(cause);
}
channel.close();
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,22 @@
*/
package org.neo4j.driver.integration;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.neo4j.driver.SessionConfig.builder;

import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.neo4j.driver.AccessMode;
import org.neo4j.driver.Config;
import org.neo4j.driver.Driver;
import org.neo4j.driver.GraphDatabase;
import org.neo4j.driver.Result;
import org.neo4j.driver.Session;
import org.neo4j.driver.internal.spi.ConnectionPool;
import org.neo4j.driver.util.DatabaseExtension;
import org.neo4j.driver.util.ParallelizableIT;

Expand Down Expand Up @@ -84,6 +91,25 @@ void useSessionAfterDriverIsClosed() {
assertThrows(IllegalStateException.class, () -> session.run("CREATE ()"));
}

@Test
void shouldInterruptStreamConsumptionAndEndRetriesOnDriverClosure() {
int fetchSize = 5;
Config config = Config.builder().withFetchSize(fetchSize).build();
Driver driver = GraphDatabase.driver(neo4j.uri(), neo4j.authToken(), config);
Session session = driver.session();

IllegalStateException exception = assertThrows(
IllegalStateException.class,
() -> session.readTransaction(tx -> {
Map<String, Object> parameters = new HashMap<>();
parameters.put("limit", fetchSize * 3);
Result result = tx.run("UNWIND range(0, $limit) AS x RETURN x", parameters);
CompletableFuture.runAsync(driver::close);
return result.list();
}));
assertEquals(ConnectionPool.CONNECTION_POOL_CLOSED_ERROR_MESSAGE, exception.getMessage());
}

private static Driver createDriver() {
return GraphDatabase.driver(neo4j.uri(), neo4j.authToken());
}
Expand Down