Move dbms.id_reuse_safe_zone to HaSettings

neo4j · Jul 1, 2016 · f2f9650 · f2f9650
1 parent e3fb6bc
commit f2f9650
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/HaSettings.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/HaSettings.java
@@ -22,9 +22,10 @@
 import org.neo4j.graphdb.config.Setting;
 import org.neo4j.graphdb.factory.Description;
 import org.neo4j.helpers.HostnamePort;
-import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.kernel.configuration.ConfigurationMigrator;
+import org.neo4j.kernel.configuration.Internal;
 import org.neo4j.kernel.configuration.Migrator;
+import org.neo4j.kernel.configuration.Settings;
 
 import static org.neo4j.kernel.configuration.Settings.BOOLEAN;
 import static org.neo4j.kernel.configuration.Settings.BYTES;
@@ -96,6 +97,9 @@ public class HaSettings
     @Description( "Size of batches of transactions applied on slaves when pulling from master" )
     public static final Setting<Integer> pull_apply_batch_size = setting( "ha.pull_apply_batch_size", INTEGER, "100" );
 
+    @Internal
+    public static final Setting<Long> id_reuse_safe_zone_time = setting( "unsupported.dbms.id_reuse_safe_zone", Settings.DURATION, "1h" );
+
     public enum TxPushStrategy
     {
         @Description("Round robin")

diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java
@@ -52,7 +52,6 @@
 import org.neo4j.function.Function;
 import org.neo4j.function.Supplier;
 import org.neo4j.graphdb.DependencyResolver;
-import org.neo4j.graphdb.config.Setting;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.helpers.Clock;
 import org.neo4j.helpers.HostnamePort;
@@ -67,7 +66,6 @@
 import org.neo4j.kernel.api.KernelAPI;
 import org.neo4j.kernel.api.exceptions.InvalidTransactionTypeKernelException;
 import org.neo4j.kernel.configuration.Config;
-import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.kernel.ha.BranchDetectingTxVerifier;
 import org.neo4j.kernel.ha.BranchedDataMigrator;
 import org.neo4j.kernel.ha.DelegateInvocationHandler;
@@ -160,7 +158,6 @@
 import org.neo4j.udc.UsageDataKeys;
 
 import static java.lang.reflect.Proxy.newProxyInstance;
-import static org.neo4j.kernel.configuration.Settings.setting;
 import static org.neo4j.kernel.impl.transaction.log.TransactionMetadataCache.TransactionMetadata;
 
 /**
@@ -170,9 +167,6 @@
 public class HighlyAvailableEditionModule
         extends EditionModule
 {
-    public static final Setting<Long> id_reuse_safe_zone_time =
-            setting( "dbms.id_reuse_safe_zone", Settings.DURATION, "1h" );
-
     public HighAvailabilityMemberStateMachine memberStateMachine;
     public ClusterMembers members;
 
@@ -208,7 +202,7 @@ public HighlyAvailableEditionModule( final PlatformModule platformModule )
                 serverId.toIntegerIndex(),
                 dependencies.provideDependency( TransactionIdStore.class ) ) );
 
-        final long idReuseSafeZone = config.get( id_reuse_safe_zone_time );
+        final long idReuseSafeZone = config.get( HaSettings.id_reuse_safe_zone_time );
         TransactionCommittingResponseUnpacker responseUnpacker = dependencies.satisfyDependency(
                 new TransactionCommittingResponseUnpacker( new DefaultUnpackerDependencies( dependencies,
                         idReuseSafeZone ), config.get( HaSettings.pull_apply_batch_size ) ) );

diff --git a/...a/src/test/java/org/neo4j/kernel/ha/cluster/TerminationOfSlavesDuringPullUpdatesTest.java b/...a/src/test/java/org/neo4j/kernel/ha/cluster/TerminationOfSlavesDuringPullUpdatesTest.java
@@ -55,7 +55,6 @@
 import static org.junit.Assert.fail;
 import static org.junit.runners.Parameterized.Parameters;
 import static org.neo4j.graphdb.DynamicRelationshipType.withName;
-import static org.neo4j.kernel.ha.factory.HighlyAvailableEditionModule.id_reuse_safe_zone_time;
 
 @RunWith( Parameterized.class )
 public class TerminationOfSlavesDuringPullUpdatesTest
@@ -95,7 +94,7 @@ public static Iterable<Object> data()
     public void slavesTerminateOrReadConsistentDataWhenApplyingBatchLargerThanSafeZone() throws Throwable
     {
         long safeZone = TimeUnit.MILLISECONDS.toMillis( 0 );
-        clusterRule.withSharedSetting( id_reuse_safe_zone_time, String.valueOf( safeZone ) );
+        clusterRule.withSharedSetting( HaSettings.id_reuse_safe_zone_time, String.valueOf( safeZone ) );
         // given
         final ClusterManager.ManagedCluster cluster = clusterRule.startCluster();
         HighlyAvailableGraphDatabase master = cluster.getMaster();
@@ -130,7 +129,7 @@ public void slavesTerminateOrReadConsistentDataWhenApplyingBatchLargerThanSafeZo
     public void slavesDontTerminateAndReadConsistentDataWhenApplyingBatchSmallerThanSafeZone() throws Throwable
     {
         long safeZone = TimeUnit.MINUTES.toMillis( 1 );
-        clusterRule.withSharedSetting( id_reuse_safe_zone_time, String.valueOf( safeZone ) );
+        clusterRule.withSharedSetting( HaSettings.id_reuse_safe_zone_time, String.valueOf( safeZone ) );
         // given
         final ClusterManager.ManagedCluster cluster = clusterRule.startCluster();
         HighlyAvailableGraphDatabase master = cluster.getMaster();