Support RAFT v1 and v2

neo4j · Jun 11, 2018 · eb90a36 · eb90a36
1 parent 60f9103
commit eb90a36
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/...clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java b/...clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java
@@ -138,7 +138,7 @@
 import org.neo4j.time.Clocks;
 import org.neo4j.udc.UsageData;
 
-import static java.util.Collections.singletonList;
+import static java.util.Arrays.asList;
 import static org.neo4j.causalclustering.core.CausalClusteringSettings.raft_messages_log_path;
 
 /**
@@ -270,9 +270,10 @@ public EnterpriseCoreEditionModule( final PlatformModule platformModule,
         ModifierProtocolRepository modifierProtocolRepository =
                 new ModifierProtocolRepository( Protocol.ModifierProtocols.values(), supportedModifierProtocols );
 
-        ProtocolInstallerRepository<ProtocolInstaller.Orientation.Client> protocolInstallerRepository =
+        ProtocolInstallerRepository<ProtocolInstaller.Orientation.Client> protocolInstallerRepository = new ProtocolInstallerRepository<>(
-                new ProtocolInstallerRepository<>(
+                asList( new RaftProtocolClientInstaller.Factory( clientPipelineBuilderFactory, logProvider ),
-                        singletonList( new RaftProtocolClientInstaller.Factory( clientPipelineBuilderFactory, logProvider ) ),
+                        new org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolClientInstaller.Factory( clientPipelineBuilderFactory,
+                                logProvider ) ),
                         ModifierProtocolInstaller.allClientInstallers );
 
         Duration handshakeTimeout = config.get( CausalClusteringSettings.handshake_timeout );

diff --git a/...ise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/RaftServerModule.java b/...ise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/RaftServerModule.java
@@ -59,7 +59,7 @@
 import org.neo4j.logging.LogProvider;
 import org.neo4j.scheduler.JobScheduler;
 
-import static java.util.Collections.singletonList;
+import static java.util.Arrays.asList;
 
 class RaftServerModule
 {
@@ -115,10 +115,14 @@ private void createRaftServer( CoreServerModule coreServerModule, LifecycleMessa
                 new ModifierProtocolRepository( Protocol.ModifierProtocols.values(), supportedModifierProtocols );
 
         RaftMessageNettyHandler nettyHandler = new RaftMessageNettyHandler( logProvider );
-        RaftProtocolServerInstaller.Factory raftProtocolServerInstaller =
+        RaftProtocolServerInstaller.Factory raftProtocolServerInstallerV2 =
                 new RaftProtocolServerInstaller.Factory( nettyHandler, pipelineBuilderFactory, logProvider );
+        org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstaller.Factory raftProtocolServerInstallerV1 =
+                new org.neo4j.causalclustering.core.consensus.protocol.v1.RaftProtocolServerInstaller.Factory( nettyHandler, pipelineBuilderFactory,
+                        logProvider );
         ProtocolInstallerRepository<ProtocolInstaller.Orientation.Server> protocolInstallerRepository =
-                new ProtocolInstallerRepository<>( singletonList( raftProtocolServerInstaller ), ModifierProtocolInstaller.allServerInstallers );
+                new ProtocolInstallerRepository<>( asList( raftProtocolServerInstallerV1, raftProtocolServerInstallerV2 ),
+                        ModifierProtocolInstaller.allServerInstallers );
 
         HandshakeServerInitializer handshakeServerInitializer = new HandshakeServerInitializer( applicationProtocolRepository, modifierProtocolRepository,
                 protocolInstallerRepository, pipelineBuilderFactory, logProvider );