You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2015/10/13 20:29:14 UTC
[1/2] incubator-geode git commit: removed isHostReachable from
SockCreator and its implementations.
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-397 7beba45f1 -> 4a26338b1
removed isHostReachable from SockCreator and its implementations.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f49c0d8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f49c0d8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f49c0d8a
Branch: refs/heads/feature/GEODE-397
Commit: f49c0d8a31d4de5d98af96575dddaecb2ccbd4cb
Parents: 7beba45
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Oct 13 11:25:10 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Oct 13 11:25:10 2015 -0700
----------------------------------------------------------------------
.../gemfire/internal/SocketCreator.java | 40 --------------------
.../org/jgroups/stack/SockCreatorImpl.java | 5 ---
.../gemstone/org/jgroups/util/SockCreator.java | 8 +++-
3 files changed, 6 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f49c0d8a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java
index 1469c7c..b73a986 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java
@@ -1029,46 +1029,6 @@ public class SocketCreator implements com.gemstone.org.jgroups.util.SockCreator
// }
}
-// commenting out isHostReachable since it was turned into deadcode
-// a long time ago because it could block.
-// /** has the isReachable method been looked up already? */
-// volatile boolean isReachableChecked;
-//
-// /** InetAddress.isReachable() is in v1.5 and later */
-// volatile Method isReachableMethod;
-//
-// public boolean isHostReachable(InetAddress host) {
-// boolean result = true;
-// try {
-// Method m = null;
-// if (isReachableChecked) {
-// m = isReachableMethod;
-// }
-// else {
-// // deadcoded - InetAddress.isReachable uses the ECHO port
-// // if we don't have root permission, and the ECHO port may
-// // be blocked
-// //m = InetAddress.class.getMethod("isReachable", new Class[] { int.class });
-// //isReachableMethod = m;
-// isReachableChecked = true;
-// }
-// if (m != null) {
-// result = ((Boolean)m.invoke(host, new Object[] {Integer.valueOf(250)})).booleanValue();
-// return result;
-// }
-// }
-// catch (InvocationTargetException e) {
-// }
-//// catch (NoSuchMethodException e) {
-//// }
-// catch (IllegalAccessException e) {
-// }
-// // any other bright ideas? attempts to connect a socket to a missing
-// // machine may hang, so don't try the echo port or anything requiring
-// // full Sockets
-// return result;
-// }
-
/** Will be a server socket... this one simply registers the listeners. */
public void configureServerSSLSocket( Socket socket ) throws IOException {
// rw.readLock().lockInterruptibly();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f49c0d8a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/stack/SockCreatorImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/stack/SockCreatorImpl.java b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/stack/SockCreatorImpl.java
index 946507a..27ca179 100755
--- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/stack/SockCreatorImpl.java
+++ b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/stack/SockCreatorImpl.java
@@ -32,11 +32,6 @@ public class SockCreatorImpl implements SockCreator {
}
@Override
- public boolean isHostReachable(InetAddress ipAddress) {
- return true;
- }
-
- @Override
public Socket connect(InetAddress ipAddress, int port, int i,
ConnectionWatcher watcher, boolean clientToServer) throws IOException {
Socket socket = new Socket();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f49c0d8a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/util/SockCreator.java
----------------------------------------------------------------------
diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/util/SockCreator.java b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/util/SockCreator.java
index 3ff053d..8b063f3 100755
--- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/util/SockCreator.java
+++ b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/util/SockCreator.java
@@ -4,6 +4,12 @@ import java.io.IOException;
import java.net.InetAddress;
import java.net.Socket;
+/** This interface does not define how to create socks
+ * but defines a factory for creating sockets.
+ * One of its implementations had already used
+ * the name "SocketCreator" at the time the interface
+ * was created.
+ */
public interface SockCreator {
boolean useSSL();
@@ -11,8 +17,6 @@ public interface SockCreator {
Socket connect(InetAddress ipAddress, int port, int connectTimeout,
ConnectionWatcher watcher, boolean clientToServer, int timeout, boolean useSSL) throws IOException;
- boolean isHostReachable(InetAddress ipAddress);
-
Socket connect(InetAddress ipAddress, int port, int timeout,
ConnectionWatcher watcher, boolean clientToServer
) throws IOException;
[2/2] incubator-geode git commit: removed all comments referring to
isHostReachable
Posted by ds...@apache.org.
removed all comments referring to isHostReachable
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/4a26338b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/4a26338b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/4a26338b
Branch: refs/heads/feature/GEODE-397
Commit: 4a26338b1e888a02b0208be863637737737eab2d
Parents: f49c0d8
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Oct 13 11:27:48 2015 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Oct 13 11:27:48 2015 -0700
----------------------------------------------------------------------
.../gemfire/cache/client/internal/ConnectionImpl.java | 11 -----------
.../internal/cache/tier/sockets/CacheClientUpdater.java | 5 -----
.../com/gemstone/org/jgroups/stack/GossipClient.java | 5 -----
3 files changed, 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4a26338b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
index 59c6c17..7880821 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/ConnectionImpl.java
@@ -89,11 +89,6 @@ public class ConnectionImpl implements Connection {
ServerLocation location, HandShake handShake, int socketBufferSize,
int handShakeTimeout, int readTimeout, byte communicationMode, GatewaySender sender, SocketCreator sc)
throws IOException {
-// commented out because isHostReachable always returns true
-// if (!sc
-// .isHostReachable(InetAddress.getByName(location.getHostName()))) {
-// throw new NoRouteToHostException("Server is not reachable: " + location.getHostName());
-// }
theSocket = sc.connectForClient(
location.getHostName(), location.getPort(), handShakeTimeout, socketBufferSize);
theSocket.setTcpNoDelay(true);
@@ -126,12 +121,6 @@ public class ConnectionImpl implements Connection {
try {
// if a forced-disconnect has occurred, we can't send messages to anyone
-// commented out because isHostReachable always returns true
-// SocketCreator sc = SocketCreator.getDefaultInstance();
-// if (!sc.isHostReachable(this.theSocket.getInetAddress())) {
-// return;
-// }
-
boolean sendCloseMsg = !TEST_DURABLE_CLIENT_CRASH;
if (sendCloseMsg) {
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4a26338b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
index 1e1633d..3915465 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientUpdater.java
@@ -309,11 +309,6 @@ public class CacheClientUpdater extends Thread implements ClientUpdater,
int socketBufferSize = Integer.getInteger(
"BridgeServer.SOCKET_BUFFER_SIZE", 32768).intValue();
-// commented out because isHostReachable always returns true
-// if (!socketCreator.isHostReachable(InetAddress.getByName(location.getHostName()))) {
-// throw new NoRouteToHostException("Server is not reachable: " + location.getHostName());
-// }
-
mySock = socketCreator.connectForClient(
location.getHostName(), location.getPort(), handshakeTimeout, socketBufferSize);
mySock.setTcpNoDelay(true);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4a26338b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/stack/GossipClient.java
----------------------------------------------------------------------
diff --git a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/stack/GossipClient.java b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/stack/GossipClient.java
index a6985e6..74455fa 100644
--- a/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/stack/GossipClient.java
+++ b/gemfire-jgroups/src/main/java/com/gemstone/org/jgroups/stack/GossipClient.java
@@ -283,9 +283,6 @@ public class GossipClient {
if(log.isTraceEnabled())
log.trace("REGISTER_REQ --> " + entry.getIpAddress() + ':' + entry.getPort());
//sock=new Socket(entry.getIpAddress(), entry.getPort());
- // GemStoneAddition - use SocketCreator
- // commented out because isHostReachable always returns true
- //if (JChannel.getGfFunctions().getSockCreator().isHostReachable(entry.getIpAddress()))
{
// Get GemFire version from IPAddress first
@@ -552,8 +549,6 @@ public class GossipClient {
if (log.isTraceEnabled())
log.trace("GEMFIRE_VERSION --> " + entry.getIpAddress() + ':'
+ +entry.getPort());
- // commented out because isHostReachable always returns true
- //if (JChannel.getGfFunctions().getSockCreator().isHostReachable(entry.getIpAddress()))
{
ConnectTimerTask timeoutTask = new ConnectTimerTask(); // GemStoneAddition