You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/08/31 17:16:50 UTC
[geode] branch develop updated: [GEODE-5591] If there is a
BindException we should always throw. (#2351)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new b6eb8fa [GEODE-5591] If there is a BindException we should always throw. (#2351)
b6eb8fa is described below
commit b6eb8faa855fdb44c3b30bad2ad47b3d3371413b
Author: Sean Goller <se...@goller.net>
AuthorDate: Fri Aug 31 10:16:44 2018 -0700
[GEODE-5591] If there is a BindException we should always throw. (#2351)
* Replace start() logic with something more deterministic and fix test.
* Iterate over possible ports instead of picking random ones.
* Check for an exception of the appropriate type and replace old
assertion logic.
* Refactor testing an exception was thrown
* Fix expected message to match exception.
Co-Authored-By: Patrick Rhomberg <pr...@pivotal.io>
Co-Authored-By: Sean Goller <sg...@pivotal.io>
---
.../geode/internal/cache/wan/WANTestBase.java | 14 ++----
.../cache/wan/misc/WANConfigurationJUnitTest.java | 15 ++----
.../internal/cache/wan/GatewayReceiverImpl.java | 54 +++++-----------------
3 files changed, 20 insertions(+), 63 deletions(-)
diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java
index 0b1af66..a091942 100644
--- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java
+++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java
@@ -37,6 +37,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.REMOTE_LOCATO
import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
import static org.apache.geode.test.dunit.Host.getHost;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.hamcrest.Matchers.greaterThan;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -2017,16 +2018,9 @@ public class WANTestBase extends DistributedTestCase {
fact.setManualStart(true);
fact.setBindAddress("200.112.204.10");
GatewayReceiver receiver = fact.create();
- try {
- receiver.start();
- fail("Expected GatewayReceiver Exception");
- } catch (GatewayReceiverException gRE) {
- logger.debug("Got the GatewayReceiverException", gRE);
- assertTrue(gRE.getMessage().contains("Failed to create server socket on"));
- } catch (IOException e) {
- e.printStackTrace();
- fail("Test " + test.getName() + " failed to start GatewayReceiver on port " + port);
- }
+ assertThatThrownBy(receiver::start)
+ .isInstanceOf(GatewayReceiverException.class)
+ .hasMessageContaining("No available free port found in the given range");
}
public static int createReceiverWithSSL(int locPort) {
diff --git a/geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java b/geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
index edcd55f..038b759 100644
--- a/geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
+++ b/geode-wan/src/integrationTest/java/org/apache/geode/internal/cache/wan/misc/WANConfigurationJUnitTest.java
@@ -437,25 +437,18 @@ public class WANConfigurationJUnitTest {
public void test_ValidateGatewayReceiverAttributes_WrongBindAddress() {
cache = new CacheFactory().set(MCAST_PORT, "0").create();
GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
- fact.setStartPort(50504);
+ fact.setStartPort(50505);
fact.setMaximumTimeBetweenPings(1000);
fact.setSocketBufferSize(4000);
- fact.setEndPort(70707);
+ fact.setEndPort(50505);
fact.setManualStart(true);
fact.setBindAddress("200.112.204.10");
GatewayTransportFilter myStreamFilter1 = new MyGatewayTransportFilter1();
fact.addGatewayTransportFilter(myStreamFilter1);
+
GatewayReceiver receiver = fact.create();
- try {
- receiver.start();
- fail("Expected GatewayReceiverException");
- } catch (GatewayReceiverException gRE) {
- assertTrue(gRE.getMessage().contains("Failed to create server socket on"));
- } catch (IOException e) {
- e.printStackTrace();
- fail("The test failed with IOException");
- }
+ assertThatThrownBy(() -> receiver.start()).isInstanceOf(GatewayReceiverException.class);
}
@Test
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
index 0f0fc63..cd27029 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewayReceiverImpl.java
@@ -15,8 +15,6 @@
package org.apache.geode.internal.cache.wan;
import java.io.IOException;
-import java.net.BindException;
-import java.net.SocketException;
import java.net.UnknownHostException;
import java.util.Arrays;
import java.util.List;
@@ -28,7 +26,6 @@ import org.apache.geode.cache.wan.GatewayReceiver;
import org.apache.geode.cache.wan.GatewayTransportFilter;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ResourceEvent;
-import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.cache.CacheServerImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -146,10 +143,9 @@ public class GatewayReceiverImpl implements GatewayReceiver {
logger.warn(LocalizedMessage.create(LocalizedStrings.GatewayReceiver_IS_ALREADY_RUNNING));
return;
}
- boolean started = false;
- this.port = getPortToStart();
- while (!started && this.port != -1) {
- receiver.setPort(this.port);
+
+ for (int port = this.startPort; port <= this.endPort; port++) {
+ receiver.setPort(port);
receiver.setSocketBufferSize(socketBufferSize);
receiver.setMaximumTimeBetweenPings(timeBetPings);
if (hostnameForSenders != null && !hostnameForSenders.isEmpty()) {
@@ -160,33 +156,19 @@ public class GatewayReceiverImpl implements GatewayReceiver {
((CacheServerImpl) receiver).setGatewayTransportFilter(this.filters);
try {
receiver.start();
- started = true;
- } catch (BindException be) {
- if (be.getCause() != null
- && be.getCause().getMessage().contains("assign requested address")) {
- throw new GatewayReceiverException(
- LocalizedStrings.SocketCreator_FAILED_TO_CREATE_SERVER_SOCKET_ON_0_1
- .toLocalizedString(new Object[] {bindAdd, this.port}));
- }
- // ignore as this port might have been used by other threads.
- logger.warn(LocalizedMessage.create(LocalizedStrings.GatewayReceiver_Address_Already_In_Use,
- this.port));
- this.port = getPortToStart();
- } catch (SocketException se) {
- if (se.getMessage().contains("Address already in use")) {
- logger.warn(LocalizedMessage
- .create(LocalizedStrings.GatewayReceiver_Address_Already_In_Use, this.port));
- this.port = getPortToStart();
-
- } else {
- throw se;
+ this.port = port;
+ break;
+ } catch (IOException e) {
+ if (port == this.endPort) {
+ throw new GatewayReceiverException("No available free port found in the given range (" +
+ this.startPort +
+ "-" +
+ this.endPort +
+ ")", e);
}
}
}
- if (!started) {
- throw new IllegalStateException("No available free port found in the given range.");
- }
logger
.info(LocalizedMessage.create(LocalizedStrings.GatewayReceiver_STARTED_ON_PORT, this.port));
@@ -195,18 +177,6 @@ public class GatewayReceiverImpl implements GatewayReceiver {
}
- private int getPortToStart() {
- // choose a random port from the given port range
- int rPort;
- if (this.startPort == this.endPort) {
- rPort = this.startPort;
- } else {
- rPort = AvailablePort.getRandomAvailablePortInRange(this.startPort, this.endPort,
- AvailablePort.SOCKET);
- }
- return rPort;
- }
-
public void stop() {
if (!isRunning()) {
throw new GatewayReceiverException(