Fix backup default catchup port

backup default catchup port is changed from transaction address to backup address
neo4j · Aug 15, 2018 · 8c91ec6 · 8c91ec6
1 parent 886a2e3
commit 8c91ec6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/enterprise/backup/src/main/java/org/neo4j/backup/impl/AddressResolver.java b/enterprise/backup/src/main/java/org/neo4j/backup/impl/AddressResolver.java
@@ -22,13 +22,11 @@
  */
 package org.neo4j.backup.impl;
 
-import org.neo4j.causalclustering.core.CausalClusteringSettings;
 import org.neo4j.helpers.AdvertisedSocketAddress;
 import org.neo4j.helpers.HostnamePort;
-import org.neo4j.helpers.ListenSocketAddress;
-import org.neo4j.kernel.impl.util.OptionalHostnamePort;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.enterprise.configuration.OnlineBackupSettings;
+import org.neo4j.kernel.impl.util.OptionalHostnamePort;
 
 class AddressResolver
 {
@@ -53,11 +51,11 @@ private HostnamePort readDefaultConfigAddressHA( Config config )
 
     private AdvertisedSocketAddress readDefaultConfigAddressCC( Config config )
     {
-        return advertisedFromListenAddress( config.get( CausalClusteringSettings.transaction_listen_address ) );
+        return asAdvertised( config.get( OnlineBackupSettings.online_backup_server ) );
     }
 
-    private AdvertisedSocketAddress advertisedFromListenAddress( ListenSocketAddress listenSocketAddress )
+    private AdvertisedSocketAddress asAdvertised( HostnamePort listenSocketAddress )
     {
-        return new AdvertisedSocketAddress( listenSocketAddress.getHostname(), listenSocketAddress.getPort() );
+        return new AdvertisedSocketAddress( listenSocketAddress.getHost(), listenSocketAddress.getPort() );
     }
 }
diff --git a/enterprise/backup/src/test/java/org/neo4j/backup/impl/AddressResolverTest.java b/enterprise/backup/src/test/java/org/neo4j/backup/impl/AddressResolverTest.java
@@ -25,8 +25,10 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import org.neo4j.helpers.AdvertisedSocketAddress;
 import org.neo4j.helpers.HostnamePort;
 import org.neo4j.kernel.configuration.Config;
+import org.neo4j.kernel.impl.enterprise.configuration.OnlineBackupSettings;
 import org.neo4j.kernel.impl.util.OptionalHostnamePort;
 
 import static org.junit.Assert.assertEquals;
@@ -55,7 +57,19 @@ public void noPortResolvesToDefault_ha()
         HostnamePort resolved = subject.resolveCorrectHAAddress( defaultConfig, new OptionalHostnamePort( "localhost", portIsNotSupplied, null ) );
 
         // then
-        assertEquals( resolved.getPort(), 6362 );
+        assertEquals( 6362, resolved.getPort() );
+    }
+
+    @Test
+    public void noPortResolvesToDefault_cc()
+    {
+        Config config = Config.builder()
+                .withSetting( OnlineBackupSettings.online_backup_server, "any:1234" )
+                .build();
+        AdvertisedSocketAddress resolved = subject.resolveCorrectCCAddress( config, new OptionalHostnamePort( "localhost", null, null ) );
+
+        // then
+        assertEquals( 1234, resolved.getPort() );
     }
 
     @Test