-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8213 from pontusmelke/3.1-delete-user-stresstest
Don't close transaction from separate thread
- Loading branch information
Showing
6 changed files
with
189 additions
and
16 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,5 +25,5 @@ public interface ManagedBoltStateMachine | |
|
|
||
| void terminate(); | ||
|
|
||
| boolean hasTerminated(); | ||
| boolean willTerminate(); | ||
| } | ||
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
142 changes: 142 additions & 0 deletions
142
integrationtests/src/test/java/org/neo4j/bolt/DeleteUserStressIT.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,142 @@ | ||
| /* | ||
| * Copyright (c) 2002-2016 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.neo4j.bolt; | ||
|
|
||
| import org.junit.Before; | ||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.File; | ||
| import java.util.Set; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
| import java.util.concurrent.ExecutorService; | ||
| import java.util.concurrent.Executors; | ||
| import java.util.concurrent.TimeUnit; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import org.neo4j.driver.v1.Driver; | ||
| import org.neo4j.driver.v1.GraphDatabase; | ||
| import org.neo4j.driver.v1.Session; | ||
| import org.neo4j.driver.v1.Transaction; | ||
| import org.neo4j.driver.v1.exceptions.ClientException; | ||
| import org.neo4j.graphdb.factory.GraphDatabaseSettings; | ||
| import org.neo4j.harness.junit.Neo4jRule; | ||
| import org.neo4j.io.fs.FileUtils; | ||
|
|
||
| import static org.hamcrest.MatcherAssert.assertThat; | ||
| import static org.hamcrest.Matchers.empty; | ||
| import static org.neo4j.driver.v1.AuthTokens.basic; | ||
|
|
||
| public class DeleteUserStressIT | ||
| { | ||
| @Rule | ||
| public Neo4jRule db = new Neo4jRule().withConfig( GraphDatabaseSettings.auth_enabled, "true" ); | ||
| private Driver adminDriver; | ||
| private final Set<Throwable> errors = ConcurrentHashMap.newKeySet(); | ||
|
|
||
| @Before | ||
| public void setup() throws Exception | ||
| { | ||
| File knownHosts = new File( System.getProperty( "user.home" ) + "/.neo4j/known_hosts" ); | ||
| FileUtils.deleteFile( knownHosts ); | ||
| adminDriver = GraphDatabase.driver( db.boltURI(), basic( "neo4j", "neo4j" ) ); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldRun() throws InterruptedException | ||
| { | ||
| ExecutorService service = Executors.newFixedThreadPool( 3 ); | ||
| service.submit( createUserWork ); | ||
| service.submit( deleteUserWork ); | ||
| service.submit( transactionWork ); | ||
|
|
||
| service.awaitTermination( 30, TimeUnit.SECONDS ); | ||
|
|
||
| String msg = String.join( System.lineSeparator(), | ||
| errors.stream().map( Throwable::getMessage ).collect( Collectors.toList() ) ); | ||
| assertThat( msg, errors, empty()); | ||
| } | ||
|
|
||
| @SuppressWarnings( "InfiniteLoopStatement" ) | ||
| private final Runnable transactionWork = () -> { | ||
|
|
||
| for (; ; ) | ||
| { | ||
| try ( Driver driver = GraphDatabase.driver( db.boltURI(), basic( "pontus", "sutnop" ) ) ) | ||
| { | ||
|
|
||
| try ( Session session = driver.session(); | ||
| Transaction tx = session.beginTransaction() ) | ||
| { | ||
| tx.run( "UNWIND range(1, 100000) AS n RETURN n" ).consume(); | ||
| tx.success(); | ||
| } | ||
| } | ||
| catch ( ClientException e ) | ||
| { | ||
| if ( !e.getMessage().equals( "The client is unauthorized due to authentication failure." ) ) | ||
| { | ||
| errors.add( e ); | ||
| } | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| @SuppressWarnings( "InfiniteLoopStatement" ) | ||
| private final Runnable deleteUserWork = () -> { | ||
|
|
||
| for (; ; ) | ||
| { | ||
| try ( Session session = adminDriver.session(); | ||
| Transaction tx = session.beginTransaction() ) | ||
| { | ||
| tx.run( "CALL dbms.security.deleteUser('pontus')" ).consume(); | ||
| tx.success(); | ||
| } | ||
| catch ( ClientException e ) | ||
| { | ||
| if ( !e.getMessage().equals( "User 'pontus' does not exist." ) ) | ||
| { | ||
| errors.add( e ); | ||
| } | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| @SuppressWarnings( "InfiniteLoopStatement" ) | ||
| private final Runnable createUserWork = () -> { | ||
| for (; ; ) | ||
| { | ||
| try ( Session session = adminDriver.session(); | ||
| Transaction tx = session.beginTransaction() ) | ||
| { | ||
| tx.run( "CALL dbms.security.createUser('pontus', 'sutnop', false)" ).consume(); | ||
| tx.success(); | ||
| } | ||
| catch ( ClientException e ) | ||
| { | ||
| if ( !e.getMessage().equals( "The specified user 'pontus' already exists." ) ) | ||
| { | ||
| errors.add( e ); | ||
| } | ||
| } | ||
| } | ||
| }; | ||
| } |