From 22ebc0fc89befb15343e0606c267465814b4f45a Mon Sep 17 00:00:00 2001 From: Chris Vest Date: Sat, 24 Feb 2018 13:05:02 +0100 Subject: [PATCH] Move the Neo4jJobScheduler to a dedicated scheduler package, and rename it to CentralJobScheduler. --- .../neo4j/bolt/v1/runtime/ResetFuzzTest.java | 5 ++--- .../java/org/neo4j/tooling/ImportTool.java | 4 ++-- .../java/org/neo4j/tooling/QuickImport.java | 4 ++-- .../kernel/impl/factory/PlatformModule.java | 4 ++-- .../CentralJobScheduler.java} | 6 +++--- .../impl/api/index/IndexingServiceTest.java | 4 ++-- .../sampling/IndexSamplingJobTrackerTest.java | 12 +++++------ .../CentralJobSchedulerTest.java} | 20 +++++++++---------- .../impl/util/CountingJobScheduler.java | 6 +++--- .../util/FileWatcherLifecycleAdapterTest.java | 5 +++-- .../test/rule/RecordStorageEngineRule.java | 4 ++-- .../lucene/explicit/NonUniqueIndexTest.java | 8 ++++---- .../core/consensus/ContinuousJobTest.java | 4 ++-- .../core/consensus/election/Fixture.java | 4 ++-- .../consensus/schedule/TimerServiceTest.java | 6 +++--- .../core/consensus/schedule/TimerTest.java | 4 ++-- .../shipping/RaftLogShipperTest.java | 4 ++-- .../CoreStateDownloaderServiceTest.java | 14 ++++++------- .../discovery/SharedDiscoveryServiceIT.java | 4 ++-- .../helper/RobustJobSchedulerWrapperTest.java | 4 ++-- .../fulltext/FulltextUpdateApplierTest.java | 4 ++-- .../kernel/ha/SlaveUpdatePullerTest.java | 4 ++-- .../ha/TestMasterCommittingAtSlave.java | 4 ++-- .../MasterImplConversationStopFuzzIT.java | 4 ++-- .../impl/pagecache/PageCacheWarmerTest.java | 4 ++-- .../auth/InternalFlatFileRealmIT.java | 4 ++-- .../enterprise/ArbiterBootstrapper.java | 4 ++-- 27 files changed, 77 insertions(+), 77 deletions(-) rename community/kernel/src/main/java/org/neo4j/kernel/impl/{util/Neo4jJobScheduler.java => scheduler/CentralJobScheduler.java} (98%) rename community/kernel/src/test/java/org/neo4j/kernel/impl/{util/Neo4jJobSchedulerTest.java => scheduler/CentralJobSchedulerTest.java} (93%) diff --git a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ResetFuzzTest.java b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ResetFuzzTest.java index 52d62a96db36d..41a573a50fe69 100644 --- a/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ResetFuzzTest.java +++ b/community/bolt/src/test/java/org/neo4j/bolt/v1/runtime/ResetFuzzTest.java @@ -43,7 +43,6 @@ import org.neo4j.bolt.runtime.CachedThreadPoolExecutorFactory; import org.neo4j.bolt.runtime.DefaultBoltConnectionFactory; import org.neo4j.bolt.runtime.ExecutorBoltSchedulerProvider; -import org.neo4j.bolt.security.auth.AuthenticationException; import org.neo4j.bolt.security.auth.AuthenticationResult; import org.neo4j.bolt.testing.BoltResponseRecorder; import org.neo4j.bolt.testing.RecordedBoltResponse; @@ -58,7 +57,7 @@ import org.neo4j.kernel.configuration.BoltConnector; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.logging.NullLogService; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.kernel.impl.util.ValueUtils; import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.kernel.monitoring.Monitors; @@ -93,7 +92,7 @@ public class ResetFuzzTest /** We track the number of un-closed transactions, and fail if we ever leak one */ private final AtomicLong liveTransactions = new AtomicLong(); private final Monitors monitors = new Monitors(); - private final Neo4jJobScheduler scheduler = life.add(new Neo4jJobScheduler()); + private final CentralJobScheduler scheduler = life.add( new CentralJobScheduler() ); private final BoltSchedulerProvider boltSchedulerProvider = life.add( new ExecutorBoltSchedulerProvider( createConfig(), new CachedThreadPoolExecutorFactory( NullLog.getInstance() ), scheduler, NullLogService.getInstance() ) ); diff --git a/community/import-tool/src/main/java/org/neo4j/tooling/ImportTool.java b/community/import-tool/src/main/java/org/neo4j/tooling/ImportTool.java index d5edaee63e03c..c64319969fa45 100644 --- a/community/import-tool/src/main/java/org/neo4j/tooling/ImportTool.java +++ b/community/import-tool/src/main/java/org/neo4j/tooling/ImportTool.java @@ -55,7 +55,7 @@ import org.neo4j.kernel.impl.logging.StoreLogService; import org.neo4j.kernel.impl.store.format.RecordFormatSelector; import org.neo4j.kernel.impl.util.Converters; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.kernel.impl.util.Validator; import org.neo4j.kernel.impl.util.Validators; import org.neo4j.kernel.internal.Version; @@ -561,7 +561,7 @@ public static void doImport( PrintStream out, PrintStream err, InputStream in, F dbConfig.augment( logs_directory, logsDir.getCanonicalPath() ); File internalLogFile = dbConfig.get( store_internal_log_path ); LogService logService = life.add( StoreLogService.withInternalLog( internalLogFile ).build( fs ) ); - final Neo4jJobScheduler jobScheduler = life.add( new Neo4jJobScheduler() ); + final CentralJobScheduler jobScheduler = life.add( new CentralJobScheduler() ); life.start(); ExecutionMonitor executionMonitor = detailedProgress diff --git a/community/import-tool/src/test/java/org/neo4j/tooling/QuickImport.java b/community/import-tool/src/test/java/org/neo4j/tooling/QuickImport.java index d0f11c0b599b4..82baf7d300576 100644 --- a/community/import-tool/src/test/java/org/neo4j/tooling/QuickImport.java +++ b/community/import-tool/src/test/java/org/neo4j/tooling/QuickImport.java @@ -34,7 +34,7 @@ import org.neo4j.kernel.configuration.Settings; import org.neo4j.kernel.impl.logging.SimpleLogService; import org.neo4j.kernel.impl.store.format.RecordFormatSelector; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; import org.neo4j.scheduler.JobScheduler; @@ -164,7 +164,7 @@ public long maxMemoryUsage() else { System.out.println( "Seed " + randomSeed ); - final JobScheduler jobScheduler = new Neo4jJobScheduler(); + final JobScheduler jobScheduler = new CentralJobScheduler(); consumer = BatchImporterFactory.withHighestPriority().instantiate( dir, fileSystem, null, importConfig, new SimpleLogService( logging, logging ), defaultVisible( jobScheduler ), EMPTY, dbConfig, RecordFormatSelector.selectForConfig( dbConfig, logging ), NO_MONITOR ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java index 8f0070c73534d..9696d311c413a 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/PlatformModule.java @@ -49,7 +49,7 @@ import org.neo4j.kernel.impl.transaction.log.checkpoint.CheckPointerMonitor; import org.neo4j.kernel.impl.transaction.log.checkpoint.StoreCopyCheckPointMutex; import org.neo4j.kernel.impl.transaction.state.DataSourceManager; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.kernel.info.DiagnosticsManager; import org.neo4j.kernel.info.JvmChecker; import org.neo4j.kernel.info.JvmMetadataRepository; @@ -301,7 +301,7 @@ protected LogService createLogService( LogProvider userLogProvider ) protected JobScheduler createJobScheduler() { - return new Neo4jJobScheduler(); + return new CentralJobScheduler(); } protected PageCache createPageCache( FileSystemAbstraction fileSystem, Config config, LogService logging, diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Neo4jJobScheduler.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/scheduler/CentralJobScheduler.java similarity index 98% rename from community/kernel/src/main/java/org/neo4j/kernel/impl/util/Neo4jJobScheduler.java rename to community/kernel/src/main/java/org/neo4j/kernel/impl/scheduler/CentralJobScheduler.java index 814869a09c87d..766324be9cf0d 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/util/Neo4jJobScheduler.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/scheduler/CentralJobScheduler.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.impl.util; +package org.neo4j.kernel.impl.scheduler; import java.util.Collections; import java.util.HashSet; @@ -48,7 +48,7 @@ import static org.neo4j.kernel.impl.util.DebugUtil.trackTest; -public class Neo4jJobScheduler extends LifecycleAdapter implements JobScheduler +public class CentralJobScheduler extends LifecycleAdapter implements JobScheduler { private static final AtomicInteger INSTANCE_COUNTER = new AtomicInteger(); private static final Group SCHEDULER_GROUP = new Group( "Scheduler" ); @@ -67,7 +67,7 @@ public class Neo4jJobScheduler extends LifecycleAdapter implements JobScheduler private volatile boolean started; - public Neo4jJobScheduler() + public CentralJobScheduler() { workStealingExecutors = new ConcurrentHashMap<>( 1 ); topLevelGroup = new ThreadGroup( "Neo4j-" + INSTANCE_COUNTER.incrementAndGet() + trackTest() ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java index 39cfe54ef550b..b78b3c9ece274 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/IndexingServiceTest.java @@ -79,7 +79,7 @@ import org.neo4j.kernel.impl.transaction.state.DefaultIndexProviderMap; import org.neo4j.kernel.impl.transaction.state.DirectIndexUpdates; import org.neo4j.kernel.impl.transaction.state.IndexUpdates; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.kernel.lifecycle.LifeRule; import org.neo4j.kernel.lifecycle.LifecycleException; import org.neo4j.logging.AssertableLogProvider; @@ -1224,7 +1224,7 @@ private IndexingService newIndexingServiceWithMockedDependencies( IndexPopulator Config config = Config.defaults( GraphDatabaseSettings.multi_threaded_schema_index_population_enabled, "false" ); return life.add( IndexingServiceFactory.createIndexingService( config, - life.add( new Neo4jJobScheduler() ), + life.add( new CentralJobScheduler() ), new DefaultIndexProviderMap( indexProvider ), storeView, nameLookup, diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTrackerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTrackerTest.java index 9b6106fce42e1..7ccb8b6eb03f6 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTrackerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/api/index/sampling/IndexSamplingJobTrackerTest.java @@ -32,7 +32,7 @@ import org.neo4j.kernel.api.schema.SchemaDescriptorFactory; import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptor; import org.neo4j.kernel.api.schema.index.SchemaIndexDescriptorFactory; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.scheduler.JobScheduler; import org.neo4j.test.DoubleLatch; @@ -63,7 +63,7 @@ public void shouldNotRunASampleJobWhichIsAlreadyRunning() throws Throwable { // given when( config.jobLimit() ).thenReturn( 2 ); - JobScheduler jobScheduler = new Neo4jJobScheduler(); + JobScheduler jobScheduler = new CentralJobScheduler(); jobScheduler.init(); IndexSamplingJobTracker jobTracker = new IndexSamplingJobTracker( config, jobScheduler ); final DoubleLatch latch = new DoubleLatch(); @@ -104,7 +104,7 @@ public void shouldNotAcceptMoreJobsThanAllowed() throws Throwable { // given when( config.jobLimit() ).thenReturn( 1 ); - JobScheduler jobScheduler = new Neo4jJobScheduler(); + JobScheduler jobScheduler = new CentralJobScheduler(); jobScheduler.init(); final IndexSamplingJobTracker jobTracker = new IndexSamplingJobTracker( config, jobScheduler ); @@ -168,7 +168,7 @@ public void shouldAcceptNewJobWhenRunningJobFinishes() throws Throwable // Given when( config.jobLimit() ).thenReturn( 1 ); - JobScheduler jobScheduler = new Neo4jJobScheduler(); + JobScheduler jobScheduler = new CentralJobScheduler(); jobScheduler.init(); final IndexSamplingJobTracker jobTracker = new IndexSamplingJobTracker( config, jobScheduler ); @@ -254,7 +254,7 @@ public void shouldStopAndWaitForAllJobsToFinish() throws Throwable // Given when( config.jobLimit() ).thenReturn( 2 ); - JobScheduler jobScheduler = new Neo4jJobScheduler(); + JobScheduler jobScheduler = new CentralJobScheduler(); jobScheduler.init(); final IndexSamplingJobTracker jobTracker = new IndexSamplingJobTracker( config, jobScheduler ); @@ -292,7 +292,7 @@ public void shouldWaitForAllJobsToFinish() throws Throwable // Given when( config.jobLimit() ).thenReturn( 2 ); - JobScheduler jobScheduler = new Neo4jJobScheduler(); + JobScheduler jobScheduler = new CentralJobScheduler(); jobScheduler.init(); final IndexSamplingJobTracker jobTracker = new IndexSamplingJobTracker( config, jobScheduler ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/Neo4jJobSchedulerTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/scheduler/CentralJobSchedulerTest.java similarity index 93% rename from community/kernel/src/test/java/org/neo4j/kernel/impl/util/Neo4jJobSchedulerTest.java rename to community/kernel/src/test/java/org/neo4j/kernel/impl/scheduler/CentralJobSchedulerTest.java index 964a1884e9ba8..8ae4777fc8871 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/Neo4jJobSchedulerTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/scheduler/CentralJobSchedulerTest.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.impl.util; +package org.neo4j.kernel.impl.scheduler; import org.junit.After; import org.junit.Test; @@ -50,11 +50,11 @@ import static org.junit.Assert.fail; import static org.neo4j.scheduler.JobScheduler.Groups.indexPopulation; -public class Neo4jJobSchedulerTest +public class CentralJobSchedulerTest { private final AtomicInteger invocations = new AtomicInteger(); private final LifeSupport life = new LifeSupport(); - private final Neo4jJobScheduler scheduler = life.add( new Neo4jJobScheduler() ); + private final CentralJobScheduler scheduler = life.add( new CentralJobScheduler() ); private final Runnable countInvocationsJob = invocations::incrementAndGet; @@ -189,8 +189,8 @@ public void longRunningScheduledJobsMustNotDelayOtherLongRunningJobs() public void shouldNotifyCancelListeners() { // GIVEN - Neo4jJobScheduler neo4jJobScheduler = new Neo4jJobScheduler(); - neo4jJobScheduler.init(); + CentralJobScheduler centralJobScheduler = new CentralJobScheduler(); + centralJobScheduler.init(); // WHEN AtomicBoolean halted = new AtomicBoolean(); @@ -201,19 +201,19 @@ public void shouldNotifyCancelListeners() LockSupport.parkNanos( MILLISECONDS.toNanos( 10 ) ); } }; - JobHandle handle = neo4jJobScheduler.schedule( indexPopulation, job ); + JobHandle handle = centralJobScheduler.schedule( indexPopulation, job ); handle.registerCancelListener( mayBeInterrupted -> halted.set( true ) ); handle.cancel( false ); // THEN assertTrue( halted.get() ); - neo4jJobScheduler.shutdown(); + centralJobScheduler.shutdown(); } @Test( timeout = 10_000 ) public void waitTerminationOnDelayedJobMustWaitUntilJobCompletion() throws Exception { - Neo4jJobScheduler scheduler = new Neo4jJobScheduler(); + CentralJobScheduler scheduler = new CentralJobScheduler(); scheduler.init(); AtomicBoolean triggered = new AtomicBoolean(); @@ -232,7 +232,7 @@ public void waitTerminationOnDelayedJobMustWaitUntilJobCompletion() throws Excep @Test( timeout = 10_000 ) public void scheduledTasksThatThrowsMustPropagateException() throws Exception { - Neo4jJobScheduler scheduler = new Neo4jJobScheduler(); + CentralJobScheduler scheduler = new CentralJobScheduler(); scheduler.init(); RuntimeException boom = new RuntimeException( "boom" ); @@ -258,7 +258,7 @@ public void scheduledTasksThatThrowsMustPropagateException() throws Exception @Test( timeout = 10_000 ) public void scheduledTasksThatThrowsShouldStop() throws Exception { - Neo4jJobScheduler scheduler = new Neo4jJobScheduler(); + CentralJobScheduler scheduler = new CentralJobScheduler(); scheduler.init(); BinaryLatch triggerLatch = new BinaryLatch(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/CountingJobScheduler.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/CountingJobScheduler.java index b0d2b841bcf04..2025361c46306 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/CountingJobScheduler.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/CountingJobScheduler.java @@ -19,21 +19,21 @@ */ package org.neo4j.kernel.impl.util; -import java.util.Map; import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.scheduler.JobScheduler; public class CountingJobScheduler implements JobScheduler { private final AtomicInteger counter; - private final Neo4jJobScheduler delegate; + private final CentralJobScheduler delegate; - public CountingJobScheduler( AtomicInteger counter, Neo4jJobScheduler delegate ) + public CountingJobScheduler( AtomicInteger counter, CentralJobScheduler delegate ) { this.counter = counter; this.delegate = delegate; diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/FileWatcherLifecycleAdapterTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/FileWatcherLifecycleAdapterTest.java index 01f5836e782a1..29a1cb129ca1b 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/util/FileWatcherLifecycleAdapterTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/util/FileWatcherLifecycleAdapterTest.java @@ -28,6 +28,7 @@ import org.neo4j.io.fs.watcher.FileWatcher; import org.neo4j.io.fs.watcher.SilentFileWatcher; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.kernel.impl.util.watcher.FileWatcherLifecycleAdapter; import static org.mockito.Mockito.verify; @@ -35,13 +36,13 @@ public class FileWatcherLifecycleAdapterTest { - private static Neo4jJobScheduler jobScheduler; + private static CentralJobScheduler jobScheduler; private FileWatcher fileWatcher = Mockito.mock( FileWatcher.class ); @BeforeClass public static void setUp() { - jobScheduler = new Neo4jJobScheduler(); + jobScheduler = new CentralJobScheduler(); } @AfterClass diff --git a/community/kernel/src/test/java/org/neo4j/test/rule/RecordStorageEngineRule.java b/community/kernel/src/test/java/org/neo4j/test/rule/RecordStorageEngineRule.java index 56834259de1a4..82a53617124ef 100644 --- a/community/kernel/src/test/java/org/neo4j/test/rule/RecordStorageEngineRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/rule/RecordStorageEngineRule.java @@ -53,7 +53,7 @@ import org.neo4j.kernel.impl.store.id.configuration.CommunityIdTypeConfigurationProvider; import org.neo4j.kernel.impl.transaction.state.DefaultIndexProviderMap; import org.neo4j.kernel.impl.util.IdOrderingQueue; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.kernel.impl.util.SynchronizedArrayIdOrderingQueue; import org.neo4j.kernel.internal.DatabaseHealth; import org.neo4j.kernel.internal.KernelEventHandlers; @@ -107,7 +107,7 @@ private RecordStorageEngine get( FileSystemAbstraction fs, PageCache pageCache, ExplicitIndexProviderLookup explicitIndexProviderLookup = mock( ExplicitIndexProviderLookup.class ); when( explicitIndexProviderLookup.all() ).thenReturn( Iterables.empty() ); IndexConfigStore indexConfigStore = new IndexConfigStore( storeDirectory, fs ); - JobScheduler scheduler = life.add( new Neo4jJobScheduler() ); + JobScheduler scheduler = life.add( new CentralJobScheduler() ); Config config = Config.defaults(); BufferingIdGeneratorFactory bufferingIdGeneratorFactory = diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java index 40211f85bcd2c..9363f5dafb94f 100644 --- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java +++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java @@ -51,7 +51,7 @@ import org.neo4j.kernel.impl.factory.PlatformModule; import org.neo4j.kernel.impl.logging.LogService; import org.neo4j.kernel.impl.logging.NullLogService; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.logging.LogProvider; import org.neo4j.storageengine.api.schema.IndexReader; import org.neo4j.test.rule.PageCacheAndDependenciesRule; @@ -116,7 +116,7 @@ protected PlatformModule createPlatform( File storeDir, Config config, Dependenc return new PlatformModule( storeDir, config, databaseInfo, dependencies, graphDatabaseFacade ) { @Override - protected Neo4jJobScheduler createJobScheduler() + protected CentralJobScheduler createJobScheduler() { return newSlowJobScheduler(); } @@ -132,9 +132,9 @@ protected LogService createLogService( LogProvider userLogProvider ) graphDatabaseFactoryState.databaseDependencies() ); } - private static Neo4jJobScheduler newSlowJobScheduler() + private static CentralJobScheduler newSlowJobScheduler() { - return new Neo4jJobScheduler() + return new CentralJobScheduler() { @Override public JobHandle schedule( Group group, Runnable job ) diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/ContinuousJobTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/ContinuousJobTest.java index ec19da8af4963..bc2d13a681353 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/ContinuousJobTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/ContinuousJobTest.java @@ -25,7 +25,7 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.locks.LockSupport; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.kernel.lifecycle.Lifespan; import org.neo4j.logging.NullLogProvider; import org.neo4j.scheduler.JobScheduler.Group; @@ -39,7 +39,7 @@ public class ContinuousJobTest { private static final long DEFAULT_TIMEOUT_MS = 15_000; private final Group jobGroup = new Group( "test" ); - private final Neo4jJobScheduler scheduler = new Neo4jJobScheduler(); + private final CentralJobScheduler scheduler = new CentralJobScheduler(); @Test public void shouldRunJobContinuously() throws Throwable diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/election/Fixture.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/election/Fixture.java index 595f01a9f5905..0dbff736a92ac 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/election/Fixture.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/election/Fixture.java @@ -38,7 +38,7 @@ import org.neo4j.causalclustering.identity.RaftTestMemberSetBuilder; import org.neo4j.causalclustering.messaging.TestNetwork; import org.neo4j.function.Predicates; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.logging.NullLogProvider; import org.neo4j.scheduler.JobScheduler; @@ -51,7 +51,7 @@ public class Fixture private final Set members = new HashSet<>(); private final Set bootstrapWaiters = new HashSet<>(); private final List timerServices = new ArrayList<>(); - private final JobScheduler scheduler = new Neo4jJobScheduler(); + private final JobScheduler scheduler = new CentralJobScheduler(); final Set rafts = new HashSet<>(); final TestNetwork net; diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/schedule/TimerServiceTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/schedule/TimerServiceTest.java index e4053da7d7269..289d5cd8c1d5c 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/schedule/TimerServiceTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/schedule/TimerServiceTest.java @@ -23,7 +23,7 @@ import java.util.concurrent.CountDownLatch; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.logging.FormattedLogProvider; import org.neo4j.logging.NullLogProvider; import org.neo4j.scheduler.JobScheduler; @@ -235,7 +235,7 @@ public void shouldNotInvokeCancelledTimer() throws Exception public void shouldAwaitCancellationUnderRealScheduler() throws Throwable { // given - Neo4jJobScheduler scheduler = new Neo4jJobScheduler(); + CentralJobScheduler scheduler = new CentralJobScheduler(); scheduler.init(); scheduler.start(); @@ -274,7 +274,7 @@ public void shouldAwaitCancellationUnderRealScheduler() throws Throwable public void shouldBeAbleToCancelBeforeHandlingWithRealScheduler() throws Throwable { // given - Neo4jJobScheduler scheduler = new Neo4jJobScheduler(); + CentralJobScheduler scheduler = new CentralJobScheduler(); scheduler.init(); scheduler.start(); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/schedule/TimerTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/schedule/TimerTest.java index 7101c3ae97059..f7a52cf0574d2 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/schedule/TimerTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/schedule/TimerTest.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.neo4j.concurrent.BinaryLatch; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.kernel.lifecycle.LifeRule; import org.neo4j.scheduler.JobScheduler; @@ -42,7 +42,7 @@ public class TimerTest public void shouldHandleConcurrentResetAndInvocationOfHandler() { // given - Neo4jJobScheduler scheduler = lifeRule.add( new Neo4jJobScheduler() ); + CentralJobScheduler scheduler = lifeRule.add( new CentralJobScheduler() ); JobScheduler.Group group = new JobScheduler.Group( "test" ); BinaryLatch invoked = new BinaryLatch(); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/shipping/RaftLogShipperTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/shipping/RaftLogShipperTest.java index 055bdba3fce71..af843fe92c636 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/shipping/RaftLogShipperTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/consensus/shipping/RaftLogShipperTest.java @@ -42,7 +42,7 @@ import org.neo4j.causalclustering.core.consensus.schedule.TimerService; import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.kernel.lifecycle.LifeRule; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; @@ -64,7 +64,7 @@ public class RaftLogShipperTest { @Rule public LifeRule life = new LifeRule( true ); - private JobScheduler scheduler = life.add( new Neo4jJobScheduler() ); + private JobScheduler scheduler = life.add( new CentralJobScheduler() ); private OutboundMessageCollector outbound; private RaftLog raftLog; diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/snapshot/CoreStateDownloaderServiceTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/snapshot/CoreStateDownloaderServiceTest.java index 5ff0ae4eb4dea..98ba974d964e0 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/snapshot/CoreStateDownloaderServiceTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/core/state/snapshot/CoreStateDownloaderServiceTest.java @@ -38,7 +38,7 @@ import org.neo4j.function.Predicates; import org.neo4j.helpers.AdvertisedSocketAddress; import org.neo4j.kernel.impl.util.CountingJobScheduler; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.logging.Log; import org.neo4j.logging.LogProvider; @@ -55,19 +55,19 @@ public class CoreStateDownloaderServiceTest private final MemberId someMember = new MemberId( UUID.randomUUID() ); private final AdvertisedSocketAddress someMemberAddress = new AdvertisedSocketAddress( "localhost", 1234 ); private final CatchupAddressProvider catchupAddressProvider = CatchupAddressProvider.fromSingleAddress( someMemberAddress ); - private Neo4jJobScheduler neo4jJobScheduler; + private CentralJobScheduler centralJobScheduler; @Before public void create() { - neo4jJobScheduler = new Neo4jJobScheduler(); - neo4jJobScheduler.init(); + centralJobScheduler = new CentralJobScheduler(); + centralJobScheduler.init(); } @After public void shutdown() { - neo4jJobScheduler.shutdown(); + centralJobScheduler.shutdown(); } @Test @@ -78,7 +78,7 @@ public void shouldRunPersistentDownloader() throws Exception final Log log = mock( Log.class ); CoreStateDownloaderService coreStateDownloaderService = - new CoreStateDownloaderService( neo4jJobScheduler, coreStateDownloader, applicationProcess, + new CoreStateDownloaderService( centralJobScheduler, coreStateDownloader, applicationProcess, logProvider( log ), new NoTimeout() ); coreStateDownloaderService.scheduleDownload( catchupAddressProvider ); waitForApplierToResume( applicationProcess ); @@ -92,7 +92,7 @@ public void shouldRunPersistentDownloader() throws Exception public void shouldOnlyScheduleOnePersistentDownloaderTaskAtTheTime() { AtomicInteger schedules = new AtomicInteger(); - CountingJobScheduler countingJobScheduler = new CountingJobScheduler( schedules, neo4jJobScheduler ); + CountingJobScheduler countingJobScheduler = new CountingJobScheduler( schedules, centralJobScheduler ); CoreStateDownloader coreStateDownloader = mock( CoreStateDownloader.class ); final CommandApplicationProcess applicationProcess = mock( CommandApplicationProcess.class ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryServiceIT.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryServiceIT.java index 3e77f37f897ec..132c79b5e0080 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryServiceIT.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/SharedDiscoveryServiceIT.java @@ -37,7 +37,7 @@ import org.neo4j.causalclustering.identity.MemberId; import org.neo4j.kernel.configuration.BoltConnector; import org.neo4j.kernel.configuration.Config; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.logging.NullLogProvider; import static java.util.concurrent.TimeUnit.MILLISECONDS; @@ -91,7 +91,7 @@ public void shouldDiscoverCompleteTargetSetWithoutDeadlocks() throws Exception private Callable createDiscoveryJob( MemberId member, DiscoveryServiceFactory disoveryServiceFactory, Set expectedTargetSet ) { - Neo4jJobScheduler jobScheduler = new Neo4jJobScheduler(); + CentralJobScheduler jobScheduler = new CentralJobScheduler(); jobScheduler.init(); HostnameResolver hostnameResolver = new NoOpHostnameResolver(); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/helper/RobustJobSchedulerWrapperTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/helper/RobustJobSchedulerWrapperTest.java index 451518c8fbd7c..5f997e1a4f71d 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/helper/RobustJobSchedulerWrapperTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/helper/RobustJobSchedulerWrapperTest.java @@ -28,7 +28,7 @@ import org.neo4j.scheduler.JobScheduler; import org.neo4j.scheduler.JobScheduler.JobHandle; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.kernel.lifecycle.LifeRule; import org.neo4j.logging.Log; @@ -44,7 +44,7 @@ public class RobustJobSchedulerWrapperTest @Rule public LifeRule schedulerLife = new LifeRule( true ); - private final JobScheduler actualScheduler = new Neo4jJobScheduler(); + private final JobScheduler actualScheduler = new CentralJobScheduler(); private final Log log = mock( Log.class ); diff --git a/enterprise/fulltext-addon/src/test/java/org/neo4j/kernel/api/impl/fulltext/FulltextUpdateApplierTest.java b/enterprise/fulltext-addon/src/test/java/org/neo4j/kernel/api/impl/fulltext/FulltextUpdateApplierTest.java index 7e1cac50fc22c..d493d91dab7f2 100644 --- a/enterprise/fulltext-addon/src/test/java/org/neo4j/kernel/api/impl/fulltext/FulltextUpdateApplierTest.java +++ b/enterprise/fulltext-addon/src/test/java/org/neo4j/kernel/api/impl/fulltext/FulltextUpdateApplierTest.java @@ -29,7 +29,7 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.internal.kernel.api.InternalIndexState; import org.neo4j.kernel.AvailabilityGuard; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.logging.Log; import org.neo4j.logging.NullLog; @@ -54,7 +54,7 @@ public void setUp() life = new LifeSupport(); log = NullLog.getInstance(); availabilityGuard = new AvailabilityGuard( Clock.systemUTC(), log ); - scheduler = life.add( new Neo4jJobScheduler() ); + scheduler = life.add( new CentralJobScheduler() ); life.start(); } diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveUpdatePullerTest.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveUpdatePullerTest.java index 66b43fdf96375..f8fbae3cf268e 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveUpdatePullerTest.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/SlaveUpdatePullerTest.java @@ -42,7 +42,7 @@ import org.neo4j.kernel.ha.com.master.Master; import org.neo4j.kernel.ha.com.slave.InvalidEpochExceptionHandler; import org.neo4j.kernel.impl.util.CountingJobScheduler; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.logging.AssertableLogProvider; import org.neo4j.scheduler.JobScheduler; import org.neo4j.test.rule.CleanupRule; @@ -76,7 +76,7 @@ public class SlaveUpdatePullerTest private final RequestContextFactory requestContextFactory = mock( RequestContextFactory.class ); private final InvalidEpochExceptionHandler invalidEpochHandler = mock( InvalidEpochExceptionHandler.class ); private final SlaveUpdatePuller.Monitor monitor = mock( SlaveUpdatePuller.Monitor.class ); - private final JobScheduler jobScheduler = new CountingJobScheduler( scheduledJobs, new Neo4jJobScheduler() ); + private final JobScheduler jobScheduler = new CountingJobScheduler( scheduledJobs, new CentralJobScheduler() ); private final SlaveUpdatePuller updatePuller = new SlaveUpdatePuller( requestContextFactory, master, lastUpdateTime, logProvider, instanceId, availabilityGuard, invalidEpochHandler, jobScheduler, monitor ); diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestMasterCommittingAtSlave.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestMasterCommittingAtSlave.java index a106e69c92c27..caabaf0914831 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestMasterCommittingAtSlave.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestMasterCommittingAtSlave.java @@ -41,7 +41,7 @@ import org.neo4j.kernel.ha.com.master.SlavePriority; import org.neo4j.kernel.ha.transaction.CommitPusher; import org.neo4j.kernel.ha.transaction.TransactionPropagator; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.logging.AssertableLogProvider; import org.neo4j.logging.AssertableLogProvider.LogMatcher; import org.neo4j.logging.NullLog; @@ -218,7 +218,7 @@ private TransactionPropagator newPropagator( int slaveCount, int replication, Sl Config config = Config.defaults( MapUtil.stringMap( HaSettings.tx_push_factor.name(), "" + replication, ClusterSettings.server_id.name(), "" + MasterServerId ) ); - Neo4jJobScheduler scheduler = cleanup.add( new Neo4jJobScheduler() ); + CentralJobScheduler scheduler = cleanup.add( new CentralJobScheduler() ); TransactionPropagator result = new TransactionPropagator( TransactionPropagator.from( config, slavePriority ), NullLog.getInstance(), () -> slaves, new CommitPusher( scheduler ) ); // Life diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplConversationStopFuzzIT.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplConversationStopFuzzIT.java index ae41132b1c76b..3cf9d37359a41 100644 --- a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplConversationStopFuzzIT.java +++ b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/com/master/MasterImplConversationStopFuzzIT.java @@ -54,7 +54,7 @@ import org.neo4j.kernel.impl.store.id.IdType; import org.neo4j.kernel.impl.transaction.TransactionRepresentation; import org.neo4j.kernel.impl.transaction.log.TransactionIdStore; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.kernel.impl.util.collection.ConcurrentAccessException; import org.neo4j.kernel.impl.util.collection.TimedRepository; import org.neo4j.kernel.lifecycle.LifeSupport; @@ -91,7 +91,7 @@ public class MasterImplConversationStopFuzzIT private final LifeSupport life = new LifeSupport(); private final ExecutorService executor = Executors.newFixedThreadPool( numberOfWorkers + 1 ); - private final JobScheduler scheduler = life.add( new Neo4jJobScheduler() ); + private final JobScheduler scheduler = life.add( new CentralJobScheduler() ); private final Config config = Config.defaults( stringMap( server_id.name(), "0", lock_read_timeout.name(), "1" ) ); private final Locks locks = new ForsetiLockManager( Config.defaults(), Clocks.systemClock(), ResourceTypes.NODE, ResourceTypes.LABEL ); diff --git a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/PageCacheWarmerTest.java b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/PageCacheWarmerTest.java index 51ab2a7488e63..5077656d71a34 100644 --- a/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/PageCacheWarmerTest.java +++ b/enterprise/kernel/src/test/java/org/neo4j/kernel/impl/pagecache/PageCacheWarmerTest.java @@ -41,7 +41,7 @@ import org.neo4j.io.pagecache.tracing.DefaultPageCacheTracer; import org.neo4j.io.pagecache.tracing.PageCacheTracer; import org.neo4j.io.pagecache.tracing.cursor.DefaultPageCursorTracerSupplier; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.scheduler.JobScheduler; import org.neo4j.test.rule.PageCacheRule; @@ -72,7 +72,7 @@ public class PageCacheWarmerTest public void setUp() throws IOException { life = new LifeSupport(); - scheduler = life.add( new Neo4jJobScheduler() ); + scheduler = life.add( new CentralJobScheduler() ); life.start(); cacheTracer = new DefaultPageCacheTracer(); cursorTracer = DefaultPageCursorTracerSupplier.INSTANCE; diff --git a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealmIT.java b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealmIT.java index c4e588f4f59fa..56d8c26a06cbc 100644 --- a/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealmIT.java +++ b/enterprise/security/src/test/java/org/neo4j/server/security/enterprise/auth/InternalFlatFileRealmIT.java @@ -37,7 +37,7 @@ import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.kernel.api.security.PasswordPolicy; import org.neo4j.kernel.configuration.Config; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; import org.neo4j.server.security.auth.AuthenticationStrategy; @@ -186,7 +186,7 @@ public void shouldEventuallyFailReloadAttempts() } } - static class TestJobScheduler extends Neo4jJobScheduler + static class TestJobScheduler extends CentralJobScheduler { Runnable scheduledRunnable; diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterBootstrapper.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterBootstrapper.java index f638c2234ca1d..fbe21c10849dc 100644 --- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterBootstrapper.java +++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/ArbiterBootstrapper.java @@ -41,7 +41,7 @@ import org.neo4j.kernel.impl.logging.LogService; import org.neo4j.kernel.impl.logging.StoreLogService; import org.neo4j.kernel.impl.util.Dependencies; -import org.neo4j.kernel.impl.util.Neo4jJobScheduler; +import org.neo4j.kernel.impl.scheduler.CentralJobScheduler; import org.neo4j.kernel.lifecycle.LifeSupport; import org.neo4j.kernel.lifecycle.LifecycleException; import org.neo4j.kernel.monitoring.Monitors; @@ -64,7 +64,7 @@ public final int start( File homeDir, Optional configFile, Map