diff --git a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java index 127b9e88c8a70..bda2442081567 100644 --- a/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java +++ b/community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java @@ -66,7 +66,7 @@ import static java.lang.String.format; import static org.neo4j.consistency.internal.SchemaIndexExtensionLoader.instantiateKernelExtensions; import static org.neo4j.consistency.internal.SchemaIndexExtensionLoader.loadIndexProviders; -import static org.neo4j.io.file.Files.createOrOpenAsOuputStream; +import static org.neo4j.io.file.Files.createOrOpenAsOutputStream; import static org.neo4j.kernel.configuration.Settings.FALSE; import static org.neo4j.kernel.configuration.Settings.TRUE; import static org.neo4j.kernel.impl.factory.DatabaseInfo.COMMUNITY; @@ -219,7 +219,7 @@ public Result runFullConsistencyCheck( final File storeDir, Config config, Progr { try { - return new PrintWriter( createOrOpenAsOuputStream( fileSystem, reportFile, true ) ); + return new PrintWriter( createOrOpenAsOutputStream( fileSystem, reportFile, true ) ); } catch ( IOException e ) { diff --git a/community/io/src/main/java/org/neo4j/io/file/Files.java b/community/io/src/main/java/org/neo4j/io/file/Files.java index 33b827d248c5d..cfb9124be2c5c 100644 --- a/community/io/src/main/java/org/neo4j/io/file/Files.java +++ b/community/io/src/main/java/org/neo4j/io/file/Files.java @@ -42,7 +42,7 @@ private Files() * @return An output stream * @throws IOException If an error occurs creating directories or opening the file */ - public static OutputStream createOrOpenAsOuputStream( FileSystemAbstraction fileSystem, File file, boolean append ) throws IOException + public static OutputStream createOrOpenAsOutputStream( FileSystemAbstraction fileSystem, File file, boolean append ) throws IOException { if ( file.getParentFile() != null ) { diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/logging/StoreLogService.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/logging/StoreLogService.java index d71a8efea21fe..e65c8f753c359 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/logging/StoreLogService.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/logging/StoreLogService.java @@ -39,7 +39,7 @@ import org.neo4j.logging.RotatingFileOutputStreamSupplier; import org.neo4j.scheduler.JobScheduler; -import static org.neo4j.io.file.Files.createOrOpenAsOuputStream; +import static org.neo4j.io.file.Files.createOrOpenAsOutputStream; public class StoreLogService extends AbstractLogService implements Lifecycle { @@ -170,7 +170,7 @@ private StoreLogService( LogProvider userLogProvider, FormattedLogProvider internalLogProvider; if ( internalLogRotationThreshold == 0 ) { - OutputStream outputStream = createOrOpenAsOuputStream( fileSystem, internalLog, true ); + OutputStream outputStream = createOrOpenAsOutputStream( fileSystem, internalLog, true ); internalLogProvider = internalLogBuilder.toOutputStream( outputStream ); rotationListener.accept( internalLogProvider ); this.closeable = outputStream; diff --git a/community/logging/src/main/java/org/neo4j/logging/RotatingFileOutputStreamSupplier.java b/community/logging/src/main/java/org/neo4j/logging/RotatingFileOutputStreamSupplier.java index 80392bb1496c1..b5242d5c31c82 100644 --- a/community/logging/src/main/java/org/neo4j/logging/RotatingFileOutputStreamSupplier.java +++ b/community/logging/src/main/java/org/neo4j/logging/RotatingFileOutputStreamSupplier.java @@ -37,7 +37,7 @@ import org.neo4j.io.NullOutputStream; import org.neo4j.io.fs.FileSystemAbstraction; -import static org.neo4j.io.file.Files.createOrOpenAsOuputStream; +import static org.neo4j.io.file.Files.createOrOpenAsOutputStream; /** * A {@link Supplier} of {@link OutputStream}s backed by on-disk files, which @@ -335,7 +335,7 @@ void rotate() private OutputStream openOutputFile() throws IOException { - return createOrOpenAsOuputStream( fileSystem, outputFile, true ); + return createOrOpenAsOutputStream( fileSystem, outputFile, true ); } private void shiftArchivedOutputFiles() throws IOException diff --git a/community/neo4j-harness/src/main/java/org/neo4j/harness/internal/AbstractInProcessServerBuilder.java b/community/neo4j-harness/src/main/java/org/neo4j/harness/internal/AbstractInProcessServerBuilder.java index 5bf0cb0cfa68b..47f347fe6d622 100644 --- a/community/neo4j-harness/src/main/java/org/neo4j/harness/internal/AbstractInProcessServerBuilder.java +++ b/community/neo4j-harness/src/main/java/org/neo4j/harness/internal/AbstractInProcessServerBuilder.java @@ -57,7 +57,7 @@ import static org.neo4j.graphdb.factory.GraphDatabaseSettings.data_directory; import static org.neo4j.graphdb.factory.GraphDatabaseSettings.pagecache_memory; import static org.neo4j.helpers.collection.Iterables.append; -import static org.neo4j.io.file.Files.createOrOpenAsOuputStream; +import static org.neo4j.io.file.Files.createOrOpenAsOutputStream; public abstract class AbstractInProcessServerBuilder implements TestServerBuilder { @@ -130,7 +130,7 @@ public ServerControls newServer() final OutputStream logOutputStream; try { - logOutputStream = createOrOpenAsOuputStream( fileSystem, new File( serverFolder, "neo4j.log" ), true ); + logOutputStream = createOrOpenAsOutputStream( fileSystem, new File( serverFolder, "neo4j.log" ), true ); } catch ( IOException e ) { diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/PageCacheWarmer.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/PageCacheWarmer.java index 4b9b02f8cfd29..d3ccfcb3da0f9 100644 --- a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/PageCacheWarmer.java +++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/pagecache/PageCacheWarmer.java @@ -75,7 +75,7 @@ public class PageCacheWarmer implements NeoStoreFileListing.StoreFileProvider private final PageCache pageCache; private final ExecutorService executor; private final PageLoaderFactory pageLoaderFactory; - private volatile boolean stopped; + private boolean stopped; PageCacheWarmer( FileSystemAbstraction fs, PageCache pageCache, JobScheduler scheduler ) { @@ -114,15 +114,9 @@ public synchronized Resource addFilesTo( Collection coll ) th return Resource.EMPTY; } - public void stop() + public synchronized void stop() { stopped = true; - synchronized ( this ) - { - // This synchronised block means we'll wait for any reheat() or profile() to notice our raised stopped flag, - // before we return to the caller. This helps avoid races, e.g. if the page cache is closed while this page - // cache warmer is still holding on to some mapped pages. - } executor.shutdown(); } @@ -133,7 +127,7 @@ public void stop() * reheating was stopped early via {@link #stop()}. * @throws IOException if anything goes wrong while reading the profiled data back in. */ - public synchronized OptionalLong reheat() throws IOException + synchronized OptionalLong reheat() throws IOException { long pagesLoaded = 0; List files = pageCache.listExistingMappings(); diff --git a/enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/DynamicLoggingQueryExecutionMonitor.java b/enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/DynamicLoggingQueryExecutionMonitor.java index ccc8b99e8bc16..e6509c925c17a 100644 --- a/enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/DynamicLoggingQueryExecutionMonitor.java +++ b/enterprise/query-logging/src/main/java/org/neo4j/kernel/impl/query/DynamicLoggingQueryExecutionMonitor.java @@ -36,7 +36,7 @@ import org.neo4j.logging.RotatingFileOutputStreamSupplier; import org.neo4j.scheduler.JobScheduler; -import static org.neo4j.io.file.Files.createOrOpenAsOuputStream; +import static org.neo4j.io.file.Files.createOrOpenAsOutputStream; import static org.neo4j.kernel.impl.query.QueryLogger.NO_LOG; class DynamicLoggingQueryExecutionMonitor extends LifecycleAdapter implements QueryExecutionMonitor @@ -191,7 +191,7 @@ private void buildRotatingLog( long rotationThreshold, int maxArchives ) throws private void buildNonRotatingLog() throws IOException { - OutputStream logOutputStream = createOrOpenAsOuputStream( fileSystem, currentQueryLogFile, true ); + OutputStream logOutputStream = createOrOpenAsOutputStream( fileSystem, currentQueryLogFile, true ); log = logBuilder.toOutputStream( logOutputStream ); closable = logOutputStream; }