Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Resolved issue with port range not working for backup
- Loading branch information
Showing
3 changed files
with
157 additions
and
26 deletions.
There are no files selected for viewing
54 changes: 54 additions & 0 deletions
54
...rc/main/java/org/neo4j/causalclustering/core/TransactionBackupServiceAddressResolver.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * Copyright (c) 2002-2018 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.neo4j.causalclustering.core; | ||
|
|
||
| import org.neo4j.helpers.AdvertisedSocketAddress; | ||
| import org.neo4j.helpers.HostnamePort; | ||
| import org.neo4j.helpers.ListenSocketAddress; | ||
| import org.neo4j.helpers.SocketAddressParser; | ||
| import org.neo4j.kernel.configuration.Config; | ||
| import org.neo4j.kernel.impl.enterprise.configuration.OnlineBackupSettings; | ||
|
|
||
| class TransactionBackupServiceAddressResolver | ||
| { | ||
| ListenSocketAddress backupAddressForTxProtocol( Config config ) | ||
| { | ||
| // We cannot use the backup address setting directly as IPv6 isn't processed during config read | ||
| String settingName = OnlineBackupSettings.online_backup_server.name(); | ||
| HostnamePort resolvedValueFromConfig = resolved( config ); | ||
| String modifiedLiteralValueToAvoidRange = String.format( "%s:%d", resolvedValueFromConfig.getHost(), resolvedValueFromConfig.getPort() ); | ||
| String defaultHostname = resolvedValueFromConfig.getHost(); | ||
| AdvertisedSocketAddress advertisedSocketAddress = | ||
| SocketAddressParser.deriveSocketAddress( settingName, modifiedLiteralValueToAvoidRange, defaultHostname, resolvedValueFromConfig.getPort(), | ||
| AdvertisedSocketAddress::new ); | ||
| return new ListenSocketAddress( advertisedSocketAddress.getHostname(), advertisedSocketAddress.getPort() ); | ||
| } | ||
|
|
||
| private HostnamePort resolved( Config config ) | ||
| { | ||
| int defaultPort = Config.defaults().get( OnlineBackupSettings.online_backup_server ).getPort(); | ||
| HostnamePort resolved = config.get( OnlineBackupSettings.online_backup_server ); | ||
| if ( resolved.getPort() == 0 ) // Was the port not specified by user? | ||
| { | ||
| resolved = new HostnamePort( resolved.getHost(), defaultPort ); | ||
| } | ||
| return resolved; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
...g/src/test/java/org/neo4j/causalclustering/core/TransactionBackupServiceProviderTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * Copyright (c) 2002-2018 "Neo Technology," | ||
| * Network Engine for Objects in Lund AB [http://neotechnology.com] | ||
| * | ||
| * This file is part of Neo4j. | ||
| * | ||
| * Neo4j is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package org.neo4j.causalclustering.core; | ||
|
|
||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| import org.neo4j.helpers.HostnamePort; | ||
| import org.neo4j.helpers.ListenSocketAddress; | ||
| import org.neo4j.kernel.configuration.Config; | ||
| import org.neo4j.kernel.impl.enterprise.configuration.OnlineBackupSettings; | ||
|
|
||
| public class TransactionBackupServiceProviderTest | ||
| { | ||
| private static final HostnamePort DEFAULT = Config.defaults().get( OnlineBackupSettings.online_backup_server ); | ||
|
|
||
| @Test | ||
| public void backupWithRangeCanBeProcessed() | ||
| { | ||
| // given | ||
| TransactionBackupServiceAddressResolver subject = new TransactionBackupServiceAddressResolver(); | ||
|
|
||
| // and config with range | ||
| Config config = Config.defaults(); | ||
| config.augment( OnlineBackupSettings.online_backup_server, "127.0.0.1:6362-6372" ); | ||
|
|
||
| // then | ||
| Assert.assertEquals( new ListenSocketAddress( "127.0.0.1", 6362 ), subject.backupAddressForTxProtocol( config ) ); | ||
| } | ||
|
|
||
| @Test | ||
| public void backupOverrideWithoutPortGetsDefaultPort() | ||
| { | ||
| // with params | ||
| List<String> params = Arrays.asList( "127.0.0.1:", "127.0.0.1" ); | ||
| for ( String testedValue : params ) | ||
| { | ||
| // given | ||
| TransactionBackupServiceAddressResolver subject = new TransactionBackupServiceAddressResolver(); | ||
|
|
||
| // and config without a port | ||
| Config config = Config.defaults(); | ||
| config.augment( OnlineBackupSettings.online_backup_server, testedValue ); | ||
|
|
||
| // when | ||
| ListenSocketAddress resolvedAddress = subject.backupAddressForTxProtocol( config ); | ||
|
|
||
| // then | ||
| Assert.assertEquals( new ListenSocketAddress( "127.0.0.1", DEFAULT.getPort() ), resolvedAddress ); | ||
| } | ||
| } | ||
| } |